Add a wq_for to xls, and print wq_stats in xls and xdu

67827161 · Silas Boyd-Wickizer · 9a9ea644 · 67827161 · 67827161 · 67827161
--- a/bin/xdu.cc
+++ b/bin/xdu.cc
@@ -73,5 +73,6 @@ main(int ac, char **av)
 {
  initwq();
  printf("%ld\n", du(open(".", 0)));
+  wq_dump();
  return 0;
 }
--- a/bin/xls.cc
+++ b/bin/xls.cc
@@ -6,6 +6,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include "user/dirit.hh"
+#include "wq.hh"
 #define ST_SIZE(st)  (st).st_size
 #define ST_TYPE(st)  (ST_ISDIR(st) ? 1 : ST_ISREG(st) ? 2 : 3)
 #define ST_INO(st)   (st).st_ino
@@ -46,25 +47,29 @@ ls(const char *path)
    close(fd);
    return;
  }
  if (ST_ISREG(st)) {
    printf("%u %10lu %10lu %s\n", ST_TYPE(st), ST_INO(st), ST_SIZE(st), path);
+    close(fd);
  } else if (ST_ISDIR(st)) {
    dirit di(fd);
-    for (; !di.end(); ++di) {
+    wq_for<dirit>(di,
-      const char *name = di.copy_value();
+                  [](dirit &i)->bool { return !i.end(); },
+                  [&fd](const char *name)->void
+    {
+      struct stat st;
      if (xfstatat(fd, name, &st) < 0){
        printf("ls: cannot stat %s\n", name);
        free((void*)name);
-        continue;
+        return;
      }
      printf("%u %10lu %10lu %s\n", ST_TYPE(st), ST_INO(st), ST_SIZE(st), name);
      free((void*)name);
-    }
+    });
+  } else {
+    close(fd);
  }
-  close(fd);
 }
 int
@@ -72,11 +77,16 @@ main(int argc, char *argv[])
 {
  int i;
-  if(argc < 2){
+  initwq();
+  if(argc < 2) {
    ls(".");
-    return 0;
+  } else {
+    // XXX(sbw) wq_for
+    for (i=1; i<argc; i++)
+      ls(argv[i]);
  }
-  for(i=1; i<argc; i++)
-    ls(argv[i]);
+  wq_dump();
  return 0;
 }
--- a/include/wq.hh
+++ b/include/wq.hh
@@ -7,6 +7,7 @@ class work;
 int             wq_trywork(void);
 int             wq_push(work *w);
 void            initwq(void);
+void            wq_dump(void);
 struct work {
  virtual void run() = 0;