Changeset 384

Timestamp:

07/06/08 12:49:00 (2 months ago)

Author:

FeepingCreature

Message:

• Threadpool fix and parallel foreach
  

Files:

• trunk/tools/tools/base.d (modified) (2 diffs)
• trunk/tools/tools/downloader.d (modified) (6 diffs)
• trunk/tools/tools/mersenne.d (modified) (1 diff)
• trunk/tools/tools/threadpool.d (modified) (2 diffs)
• trunk/tools/tools/threads.d (modified) (1 diff)

trunk/tools/tools/base.d

@@ -1052 +1052 @@
-
-struct _BoolSet(string OP, T...) {
-
+upleMap!(Unstatic, T)
-  int opEquals(U)(U other) {
-    bool res = other == values[0];
@@ -1115 +1115 @@
-R delegate(T) toDg(R, T...)(R function(T) fn) { return fn /fix/ stuple(); }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  string[] res;
-  while (true) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    text = text[pos2 + to.length .. $];
-  }

trunk/tools/tools/downloader.d

@@ -14 +14 @@
-  if (tld.find("%")!=-1) return false;
-  return true;
+}
+
+string toSize(int i) {
+  // example result: 24.3K
+  string sizeformat(string suffix, ulong max, ulong i) {
+    auto r = toString(cast(int) ((i * 10f) / max));
+    r = r[0 .. $-1] ~ "."~r[$-1]; // 243 -> 24.3
+    return r~suffix;
+  }
+  ulong[string] map = ["T": 1_000_000_000_000UL, "G": 1_000_000_000UL, "M": 1_000_000UL, "K": 1_000UL];
+  foreach (suffix; ["T", "G", "M", "K"]) {
+    if (i > map[suffix]) 
+      return sizeformat(suffix, map[suffix], i);
+  }
+  return Format(i, "B");
+}
+
+import tools.tests;
+unittest {
+  mustEqual("toSizeTest", toSize(123456), "123.4K");
-}
-
@@ -39 +59 @@
-    if (!entry.length) continue;
-    auto sp = entry.split("=");
-    logln(" - ", sp);
-    tags[sp[0]] = (sp.length>1)?(sp[1..$].join("=")):"";
-  }
@@ -86 +105 @@
-
-class cbs {
-
-
+
+
+
-    if (url in entries) {
-v
-
-
-floa
+i, k
+
+
+int, in
-    if (!(url in entries)) return;
-    if (entries[url].length==1) { entries.remove(url); return; }
@@ -100 +120 @@
-    entries[url].length=entries[url].length-1;
-  }}
+  void remove(string url, void delegate(float) rem) { synchronized(this) {
+    if (!(rem in redirect)) return;
+    remove(url, redirect[rem]);
+  }}
-  void add(string url, void delegate(float) n) { synchronized(this) {
+    entries[url]~= redirect[n] = n /apply/ (typeof(n) n, int at, int max) { n((at * 1f) / max); };
+  }}
+  void add(string url, void delegate(int, int) n) { synchronized(this) {
-    entries[url]~=n;
-  }}
@@ -242 +269 @@
-        if (!quiet) logln("Following redirect to ", loc);
-        if (redirect) { *redirect=loc; res=null; return true; }
-void delegate(float) dg=(float f) { download_callbacks.doCbs(param, f
+auto dg = (int at, int max) { download_callbacks.doCbs(param, at, max
-        download_callbacks.add(loc, dg);
-        scope(exit) download_callbacks.remove(loc, dg);
@@ -254 +281 @@
-    else {
-      // At this point we know the header has already been received
-((received.length-header.length)*1.0)/
+received.length-header.length, 
-    }
-    return false;

trunk/tools/tools/mersenne.d

@@ -78 +78 @@
-private TLS!(Mersenne) deflt;
-uint glob_seed = 23; 
-void seed(uint s) { auto res = new Mersenne; res.seed(s); deflt.set(res); seed = s; }
-
-int i;

trunk/tools/tools/threadpool.d

@@ -46 +46 @@
-    bool finished() { if (done) return done; synchronized(this) return done || channel.active; }
-  }
+  void mt_foreach(T)(T[] array, void delegate(int, T) dg) {
+    int left = array.length;
+    auto sync = new Object;
+    foreach (i, entry; array) addTask(stuple(i, entry) /apply/ (int i, T foo) { dg(i, foo); synchronized(sync) left--; });
+    while (left) idle();
+  }
-  Future!(T) future(T)(T delegate() dg) {
-    auto res=new Future!(T);
@@ -76 +82 @@
-  Thread mainthr=null;
-  bool idle() {
-
-
+
+
+
-      try task();
-      catch (TaskUnfinished tu) addTask(task.name, task.dg);
-      catch (Exception e) logln("Idle task failed with ", e);
-      return false;
- else return true;
+
-  }
-  this(int count) {

trunk/tools/tools/threads.d

@@ -309 +309 @@
-    sem.release;
-  }
+  bool try_get(out T t) {
+    static if (SinglePut) put_block.checkDifferent;
+    static if (SingleGet) {
+      get_block.checkSame;
+      if (sem.try_acquire) {
+        assert (mesgs.has);
+        t = mesgs.pop;
+        return true;
+      } else return false;
+    } else {
+      if (sem.try_acquire) {
+        assert (mesgs.has);
+        synchronized(this) t = mesgs.pop;
+        return true;
+      } else return false;
+    }
+  }
-  T get() {
-    static if (SinglePut) put_block.checkDifferent;