Changeset 854

Timestamp:

10/12/08 15:05:54 (3 years ago)

Author:

walter

Message:

fold in changes

Files:

• branches/phobos-1.x/phobos/internal/aaA.d (modified) (1 diff)
• branches/phobos-1.x/phobos/std/socket.d (modified) (1 diff)

branches/phobos-1.x/phobos/internal/aaA.d

@@ -583 +583 @@
-
-        *paa.a = newb;
+        _aaBalance(paa);
-    }
-    return (*paa).a;
-    }
-
+/********************************************
+ * Balance an array.
+ */
+
+void _aaBalance(AA* paa)
+{
+    //printf("_aaBalance()\n");
+    if (paa.a)
+    {
+    aaA*[16] tmp;
+    aaA*[] array = tmp;
+
+    auto aa = paa.a;
+    foreach (j, e; aa.b)
+    {
+        /* Temporarily store contents of bucket in array[]
+         */
+        size_t k = 0;
+
+        void addToArray(aaA* e)
+        {
+        while (e)
+        {   addToArray(e.left);
+            if (k == array.length)
+            array.length = array.length * 2;
+            array[k++] = e;
+            e = e.right;
+        }
+        }
+
+        addToArray(e);
+
+        /* The contents of the bucket are now sorted into array[].
+         * Rebuild the tree.
+         */
+
+        void buildTree(aaA** p, size_t x1, size_t x2)
+        {
+        if (x1 >= x2)
+            *p = null;
+        else
+        {   auto mid = (x1 + x2) >> 1;
+            *p = array[mid];
+            buildTree(&(*p).left, x1, mid);
+            buildTree(&(*p).right, mid + 1, x2);
+        }
+        }
+
+        auto p = &aa.b[j];
+        buildTree(p, 0, k);
+    }
+    }
+}
-
-/********************************************

branches/phobos-1.x/phobos/std/socket.d

@@ -1536 +1536 @@
-    static int select(SocketSet checkRead, SocketSet checkWrite, SocketSet checkError, int microseconds)
-    {
-   
-   tv.seconds = 
-   tv.microseconds = microseconds
-   
+    
+    tv.seconds = microseconds / 1_000_00
+    tv.microseconds = microseconds % 1_000_000
+    
-    }
-