petercorke
diff --git a/‎stl/httpd.c
Copy file name to clipboardExpand all lines: stl/httpd.c
+12 b/‎stl/httpd.c
Copy file name to clipboardExpand all lines: stl/httpd.c
+12
diff --git a/‎stl/stl.c
Copy file name to clipboardExpand all lines: stl/stl.c
+40-6 b/‎stl/stl.c
Copy file name to clipboardExpand all lines: stl/stl.c
+40-6
diff --git a/‎stl/stl.h
Copy file name to clipboardExpand all lines: stl/stl.h
+3-2 b/‎stl/stl.h
Copy file name to clipboardExpand all lines: stl/stl.h
+3-2
@@ -36,6 +36,9 @@ static char *req_method;
 
 int web_debug_flag = 1;
 
+pthread_t web_pthread = NULL;
+int page_request_once = 0;
+
 static int
 page_request (void *cls, struct MHD_Connection *connection,
                       const char *url, const char *method,
@@ -48,6 +51,11 @@ MHD_get_connection_values (connection, MHD_HEADER_KIND, print_key, NULL);
 MHD_get_connection_values (connection, MHD_GET_ARGUMENT_KIND, print_key, NULL);
      */
 
+    if (page_request_once == 0) {
+        page_request_once = 1;
+        stl_thread_add("WEB");
+    }
+    
     WEB_DEBUG("web: %s request for URL %s using %s", method, url, version);
 
     // save some of the parameters for access by MATLAB calls
@@ -205,6 +213,10 @@ web_start(int32_t port, char *callback)
 
     daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD, port, NULL, NULL,
                              &page_request, NULL, MHD_OPTION_END);
+    
+    // this starts a POSIX thread but its handle is very well buried
+    // its name will be MHD-single but this is not gettable under MacOS
+    
     if (daemon == NULL)
         stl_error("web server failed to launch: %s", strerror(errno));
 
 
@@ -113,10 +113,7 @@ stl_initialize(int argc, char **argv)
         stl_error("initialize: mutex create failed %s", strerror(status));
 
     // allocate a dummy thread list entry for the main thread
-    threadlist[0].busy = 1;
-    threadlist[0].name = "user";
-    threadlist[0].f = NULL; // no pointer to function entry
-    threadlist[0].pthread = (pthread_t)NULL; // it has no thread handle
+    stl_thread_add("user");
 }
 
 void
@@ -199,10 +196,47 @@ stl_thread_create(char *func, void *arg, char *name)
     return slot;
 }
 
+int 
+stl_thread_add(char *name)
+{
+    int slot;
+    thread *p, *tp = NULL;
+
+    // find an empty slot
+    LIST_LOCK
+        for (p=threadlist, slot=0; slot<NTHREADS; slot++, p++) {
+            if (p->busy  == 0) {
+                tp = p;
+                tp->busy++; // mark it busy
+                break;
+            }
+        }
+    LIST_UNLOCK
+    if (tp == NULL)
+        stl_error("too many threads, increase NTHREADS (currently %d)", NTHREADS);
+
+    tp->name = stl_stralloc(name);
+    tp->pthread = pthread_self();
+    tp->f = NULL;
+    
+    return slot;
+}
+        
+        
 static void
 stl_thread_wrapper( thread *tp)
 {
     STL_DEBUG("starting posix thread <%s> (0x%X)", tp->name, (uint32_t)tp->f);
+    
+    // tell kernel the thread's name 
+    // under linux can see this with ps -o cat /proc/$PID/task/$TID/comm
+    // settable for MacOS but seemingly not visible
+#ifdef __linux__ || __unix__
+    pthread_setname_np(tp->pthread, tp->name);    
+#endif
+#ifdef __APPLE__
+    pthread_setname_np(tp->name);
+#endif
 
     // invoke the user's compiled MATLAB code
     tp->f(tp->arg);
@@ -215,9 +249,9 @@ stl_thread_wrapper( thread *tp)
 char *
 stl_thread_name(int32_t slot)
 {
-    if (slot < 0)
+    if (slot < 0) 
         slot = stl_thread_self();
-
+    
     return threadlist[slot].name;
 }
 
 
@@ -2,8 +2,8 @@
 
 // function signatures
 void stl_initialize(int argc, char **argv);
-void stl_log(const char *fmt, ...);
-void stl_error(const char *fmt, ...);
+void stl_log(const char *fmt, ...)   __attribute__ ((format (printf, 1, 2)));
+void stl_error(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 void stl_debug(int32_t debug);
 void *stl_get_functionptr(char *name);
 char *stl_stralloc(char *s);
@@ -17,6 +17,7 @@ int32_t stl_thread_join(int32_t slot);
 void stl_thread_cancel(int32_t slot);
 int32_t stl_thread_self();
 char *  stl_thread_name(int32_t id);
+int stl_thread_add(char *name);
 
 // command line arguments
 int32_t stl_argc();