Changeset 142 for trunk/src/sh_pthread.c

Timestamp:

Oct 30, 2007, 12:17:00 AM (17 years ago)

Author:

rainer

Message:

Login watch runs in thread.

File:

• trunk/src/sh_pthread.c (modified) (5 diffs)

trunk/src/sh_pthread.c

@@ -40 +40 @@
 
 /* MODULES: init()
- *             -- starts thread_run() function if threaded
- *             -- fallback on internal_init if threading fails
- *             -- and returns MODULE_INACTIVE/MODULE_ACTIVE/MODULE_THREADED
- *
- *                int retval = MODULE_INACTIVE;
- *                if (0 != sh_pthread_create(thread_run, NULL))
- *                   return internal_init();
- *                return MODULE_THREADED;
- *
- *          thread_run() 
+ *
+ * #ifdef HAVE_PTHREAD
+ *  if (arg != NULL)
+ *    {
+ *      if (0 == sh_pthread_create(sh_threaded_module_run, (void *)arg))
+ *        return SH_MOD_THREAD;
+ *      else
+ *        return SH_MOD_FAILED;
+ *    }
+ * #else
+ *  return sh_utmp_init_internal();
+ * #endif
+ *
+ *
+ *          sh_threaded_module_run(module_struct) 
  *             -- calls internal init, 
  *             -- polls timer, 
@@ -131 +136 @@
 /* ---- Utility functions for modules ----
  */
-void sh_threaded_module_reconf(void *arg)
+void sh_threaded_module_cleanup(void *arg)
 {
   sh_mtype * this_module = (sh_mtype *) arg;
-  this_module->mod_reconf();
+  this_module->mod_cleanup();
   return;
 }
 
-void sh_threaded_module_run(void *arg)
+void * sh_threaded_module_run(void *arg)
 {
   sh_mtype * this_module = (sh_mtype *) arg;
@@ -153 +158 @@
       if (0 == this_module->mod_init(NULL))
         {
-          pthread_cleanup_push(sh_threaded_module_reconf, arg);
+          pthread_cleanup_push(sh_threaded_module_cleanup, arg);
 
           while (1)
@@ -159 +164 @@
               if (0 != this_module->mod_timer(time(NULL)))
                 {
-                  this_module->mod_check();
+                  /* If module has been de-activated on reconfigure,
+                   * mod_check() must return non-zero.
+                   * The mod_cleanup() routine must then enable the 
+                   * module to be re-activated eventually.
+                   */
+                  if (0 != this_module->mod_check())
+                    break;
                   pthread_testcancel();
                   retry_msleep(1,0);
@@ -171 +182 @@
   pthread_cleanup_pop(1);
 
-  return;
+  return NULL;
 }