Changeset 41162 for trunk/Ohana/src/opihi/lib.data/open_kapa.c

Timestamp:

Nov 27, 2019, 11:09:40 AM (7 years ago)

Author:

eugene

Message:

do not block on slow kapa quit; handle edge cases for splines without segfaults; add polygon and polyfill plotting styles

File:

• trunk/Ohana/src/opihi/lib.data/open_kapa.c (modified) (2 diffs)

trunk/Ohana/src/opihi/lib.data/open_kapa.c

@@ -266 +266 @@
 int close_kapa (char *name) {
 
+  struct timespec request, remain;
   int N;
 
@@ -274 +275 @@
   }
   DelKapaDevice (name);
+
+  // avoid blocking on waitpid, test every 1 msec, up to 500 msec
+  request.tv_sec = 0;
+  request.tv_nsec = 1000000;
+
+  // try to harvest the child PID
+  int waitstatus = 0;
+  int result = waitpid (-1, &waitstatus, WNOHANG);
+  for (int i = 0; (i < 500) && (result == 0); i++) {
+    nanosleep (&request, &remain);
+    result = waitpid (-1, &waitstatus, WNOHANG);
+  }
+
+  if ((result == -1) && (errno != ECHILD)) {
+    fprintf (stderr, "unexpected error from waitpid (%d): programming error\n", errno);
+  }
+  if (result == 0) {
+    fprintf (stderr, "child did not exit (close_kapa), timeout");
+  }
+
   return (TRUE);
 }