Changeset 39297

Timestamp:

Dec 28, 2015, 8:17:22 AM (11 years ago)

Author:

eugene

Message:

add verbosity and handle interrupts on uniq

File:

• trunk/Ohana/src/opihi/cmd.data/uniq.c (modified) (7 diffs)

trunk/Ohana/src/opihi/cmd.data/uniq.c

@@ -8 +8 @@
   int Nnew, i, N;
   Vector *ivec, *ovec;
+
+  int VERBOSE = FALSE;
+  if ((N = get_argument (argc, argv, "-v"))) {
+    remove_argument (N, &argc, argv);
+    VERBOSE = TRUE;
+  }
 
   Vector *cvec = NULL;
@@ -48 +54 @@
     opihi_flt *vsrc = indata;
 
-    for (i = 0; i < ivec->Nelements; Nnew++) {
+    int onePercent = ivec->Nelements / 100;
+
+    void *Signal = signal (SIGINT, handle_interrupt);
+    interrupt = FALSE;
+    for (i = 0; (i < ivec->Nelements) && !interrupt; Nnew++) {
       vtgt[Nnew] = *vsrc;
       int Ndup = 0;
@@ -56 +66 @@
         vsrc ++;
         Ndup ++;
+        if (VERBOSE && (i % onePercent == 0)) gprint (GP_ERR, ".");
       }
       if (cvec) {
@@ -61 +72 @@
       }
     }
+    signal (SIGINT, Signal);
+    if (VERBOSE) gprint (GP_ERR, "\n");
     free (indata);
   } else {
@@ -75 +88 @@
     opihi_int *vsrc = indata;
 
-    for (i = 0; i < ivec->Nelements; Nnew++) {
+    int onePercent = ivec->Nelements / 100;
+
+    void *Signal = signal (SIGINT, handle_interrupt);
+    interrupt = FALSE;
+    for (i = 0; (i < ivec->Nelements) && !interrupt; Nnew++) {
       vtgt[Nnew] = *vsrc;
       int Ndup = 0;
@@ -83 +100 @@
         vsrc ++;
         Ndup ++;
+        if (VERBOSE && (i % onePercent == 0)) gprint (GP_ERR, ".");
       }
       if (cvec) {
@@ -88 +106 @@
       }
     }
+    signal (SIGINT, Signal);
+    if (VERBOSE) gprint (GP_ERR, "\n");
     free (indata);
   }