Unix update for service control (sc).

[yaz-moved-to-github.git] / src / statserv.c

diff --git a/src/statserv.c b/src/statserv.c
index 731bce5..c5c416a 100644 (file)
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * NT threaded server code by
- *   Chas Woodfield, Fretwell Downing Informatics.
- *
- * $Id: statserv.c,v 1.50 2007-08-13 16:46:47 mike Exp $
  */
 
 /**
@@ -17,12 +12,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+
 #ifdef WIN32
 #include <process.h>
 #include <winsock.h>
 #include <direct.h>
-#include "service.h"
 #endif
+
+#include <yaz/sc.h>
+
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -404,7 +402,7 @@ static void xml_config_read(void)
                 if (!strcmp((const char *) ptr->name, "host"))
                 {
                     gfs->host = nmem_dup_xml_content(gfs_nmem,
-                                                         ptr->children);
+                                                     ptr->children);
                 }
                 else if (!strcmp((const char *) ptr->name, "config"))
                 {
@@ -631,7 +629,7 @@ static void ThreadList_Initialize()
     /* Initialize the critical Sections */
     InitializeCriticalSection(&Thread_CritSect);
 
-     /* Set the first thraed */
+    /* Set the first thraed */
     pFirstThread = NULL;
 
     /* we have been initialized */
@@ -699,7 +697,7 @@ void statserv_remove(IOCHAN pIOChannel)
 }
 
 /* WIN32 statserv_closedown */
-void statserv_closedown()
+static void statserv_closedown()
 {
     /* Shouldn't do anything if we are not initialized */
     if (bInitialized)
@@ -771,7 +769,7 @@ void statserv_closedown()
 
 void __cdecl event_loop_thread (IOCHAN iochan)
 {
-    event_loop (&iochan);
+    iochan_event_loop (&iochan);
 }
 
 /* WIN32 listener */
@@ -872,7 +870,7 @@ void statserv_remove(IOCHAN pIOChannel)
 {
 }
 
-void statserv_closedown()
+static void statserv_closedown(void)
 {
     IOCHAN p;
 
@@ -1043,7 +1041,7 @@ static void *new_session (void *vp)
         control_block.one_shot = 1;
     if (control_block.threads)
     {
-        event_loop(&new_chan);
+        iochan_event_loop(&new_chan);
     }
     else
     {
@@ -1136,7 +1134,7 @@ static int add_listener(char *where, int listen_id)
         return -1;
     }
     if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT |
-         EVENT_EXCEPT, listen_id)))
+                              EVENT_EXCEPT, listen_id)))
     {
         yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create IOCHAN-type");
         cs_close (l);
@@ -1199,7 +1197,7 @@ static void statserv_reset(void)
 {
 }
 
-int statserv_start(int argc, char **argv)
+static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
 {
     char sep;
 #ifdef WIN32
@@ -1342,8 +1340,10 @@ int statserv_start(int argc, char **argv)
 #endif
     if (pListener == NULL)
         return 1;
+    if (s)
+        yaz_sc_running(s);
     yaz_log(YLOG_DEBUG, "Entering event loop.");
-    return event_loop(&pListener);
+    return iochan_event_loop(&pListener);
 }
 
 static void option_copy(char *dst, const char *src)
@@ -1358,6 +1358,8 @@ int check_options(int argc, char **argv)
     char *arg;
 
     yaz_log_init_level(yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL)); 
+
+    yaz_log_xml_errors(0, YLOG_WARN);
     get_logbits(1); 
 
     while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:A:p:DC:f:m:r:",
@@ -1480,86 +1482,43 @@ int check_options(int argc, char **argv)
             fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
                     " -l <logfile> -u <user> -c <config> -t <minutes>"
                     " -k <kilobytes> -d <daemon> -p <pidfile> -C certfile"
-                        " -ziDST1 -m <time-format> -w <directory> <listener-addr>... ]\n", me);
+                    " -ziDST1 -m <time-format> -w <directory> <listener-addr>... ]\n", me);
             return 1;
         }
     }
     return 0;
 }
 
-#ifdef WIN32
-typedef struct _Args
-{
-    char **argv;
-    int argc;
-} Args; 
-
-static Args ArgDetails;
-
-/* name of the executable */
-#define SZAPPNAME            "server"
-
-/* list of service dependencies - "dep1\0dep2\0\0" */
-#define SZDEPENDENCIES       ""
-
-int statserv_main(int argc, char **argv,
-                  bend_initresult *(*bend_init)(bend_initrequest *r),
-                  void (*bend_close)(void *handle))
-{
-    struct statserv_options_block *cb = &control_block;
-    cb->bend_init = bend_init;
-    cb->bend_close = bend_close;
-
-    /* Lets setup the Arg structure */
-    ArgDetails.argc = argc;
-    ArgDetails.argv = argv;
-    
-    /* Now setup the service with the service controller */
-    SetupService(argc, argv, &ArgDetails, SZAPPNAME,
-                 cb->service_name, /* internal service name */
-                 cb->service_display_name, /* displayed name */
-                 SZDEPENDENCIES);
-    return 0;
-}
-
-int StartAppService(void *pHandle, int argc, char **argv)
+void statserv_sc_stop(yaz_sc_t s)
 {
-    /* Initializes the App */
-    return 1;
-}
-
-void RunAppService(void *pHandle)
-{
-    Args *pArgs = (Args *)pHandle;
-    
-    /* Starts the app running */
-    statserv_start(pArgs->argc, pArgs->argv);
-}
-
-void StopAppService(void *pHandle)
-{
-    /* Stops the app */
     statserv_closedown();
     statserv_reset();
 }
-/* WIN32 */
-#else
-/* UNIX */
+
 int statserv_main(int argc, char **argv,
                   bend_initresult *(*bend_init)(bend_initrequest *r),
                   void (*bend_close)(void *handle))
 {
     int ret;
+    struct statserv_options_block *cb = &control_block;
 
-    control_block.bend_init = bend_init;
-    control_block.bend_close = bend_close;
+    /* control block does not have service_name member on Unix */
+    yaz_sc_t s = yaz_sc_create(
+#ifdef WIN32
+        cb->service_name, cb->service_display_name
+#else
+        0, 0
+#endif
+        );
 
-    ret = statserv_start (argc, argv);
-    statserv_closedown ();
-    statserv_reset();
+    cb->bend_init = bend_init;
+    cb->bend_close = bend_close;
+
+    ret = yaz_sc_program(s, argc, argv, statserv_sc_main, statserv_sc_stop);
+    yaz_sc_destroy(&s);
     return ret;
 }
-#endif
+
 /*
  * Local variables:
  * c-basic-offset: 4