[como-commits] SF.net SVN: como: [1256] src/branches/2.0/base

[<jsa...@us...>]

Revision: 1256
          http://como.svn.sourceforge.net/como/?rev=1256&view=rev
Author:   jsanjuas
Date:     2008-06-06 15:37:57 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
removing some unnecessary code or code fragmentation

Modified Paths:
--------------
    src/branches/2.0/base/como.c
    src/branches/2.0/base/supervisor.c
    src/branches/2.0/base/util-process.c

Modified: src/branches/2.0/base/como.c
===================================================================
--- src/branches/2.0/base/como.c	2008-06-06 19:46:06 UTC (rev 1255)
+++ src/branches/2.0/base/como.c	2008-06-06 22:37:57 UTC (rev 1256)
@@ -51,33 +51,6 @@
 #include "ipc.h"	// ipc_listen()
 
 
-ipc_peer_full_t *COMO_SU;
-ipc_peer_full_t *COMO_CA;
-ipc_peer_full_t *COMO_EX;
-ipc_peer_full_t *COMO_ST;
-ipc_peer_full_t *COMO_QU;
-
-
-void
-como_init(const char * program, int argc, char ** argv)
-{
-    log_set_program(program);
-    if (!isatty(fileno(stderr))) {
-	log_set_use_color(FALSE);
-    }
-    
-#if defined(linux) || defined(__APPLE__)
-    /* linux/Mac OS X does not support setproctitle. we have our own. */
-    setproctitle_init(argc, argv);
-#endif
-
-    COMO_SU = ipc_peer_new(COMO_SU_CLASS, "su", "SUPERVISOR");
-    COMO_CA = ipc_peer_new(COMO_CA_CLASS, "ca", "CAPTURE");
-    COMO_EX = ipc_peer_new(COMO_EX_CLASS, "ex", "EXPORT");
-    COMO_ST = ipc_peer_new(COMO_ST_CLASS, "st", "STORAGE");
-    COMO_QU = ipc_peer_new(COMO_QU_CLASS, "qu", "QUERY");
-}
-
 /**
  * -- safe__malloc
  *

Modified: src/branches/2.0/base/supervisor.c
===================================================================
--- src/branches/2.0/base/supervisor.c	2008-06-06 19:46:06 UTC (rev 1255)
+++ src/branches/2.0/base/supervisor.c	2008-06-06 22:37:57 UTC (rev 1256)
@@ -61,6 +61,12 @@
 int s_saved_argc;
 char **s_saved_argv;
 
+ipc_peer_full_t *COMO_SU;
+ipc_peer_full_t *COMO_CA;
+ipc_peer_full_t *COMO_EX;
+ipc_peer_full_t *COMO_ST;
+ipc_peer_full_t *COMO_QU;
+
 /*
  * -- launch_inline_query
  *
@@ -963,12 +969,25 @@
     pid_t pid;
     int i;
     
+    log_set_program("SU");
+    if (!isatty(fileno(stderr)))
+        log_set_use_color(FALSE);
+
+#if defined(linux) || defined(__APPLE__)
+    /* linux/Mac OS X does not support setproctitle. we have our own. */
+    setproctitle_init(argc, argv);
+#endif
+
+    COMO_SU = ipc_peer_new(COMO_SU_CLASS, "su", "SUPERVISOR");
+    COMO_CA = ipc_peer_new(COMO_CA_CLASS, "ca", "CAPTURE");
+    COMO_EX = ipc_peer_new(COMO_EX_CLASS, "ex", "EXPORT");
+    COMO_ST = ipc_peer_new(COMO_ST_CLASS, "st", "STORAGE");
+    COMO_QU = ipc_peer_new(COMO_QU_CLASS, "qu", "QUERY");
+
     como_su = safe_malloc(sizeof(como_su_t));
     como_su->su_pid = getpid();
     como_su->workdir = mkdtemp(strdup("/tmp/comoXXXXXX"));
     s_como_su = como_su;
-   
-    como_init("SU", argc, argv);
     
     /*
      * parse command line and configuration files

Modified: src/branches/2.0/base/util-process.c
===================================================================
--- src/branches/2.0/base/util-process.c	2008-06-06 19:46:06 UTC (rev 1255)
+++ src/branches/2.0/base/util-process.c	2008-06-06 22:37:57 UTC (rev 1256)
@@ -223,75 +223,3 @@
 }
 
 
-pid_t
-spawn_child(ipc_peer_full_t * child, const char * descr, const char * path, ...)
-{
-    pid_t pid;
-    va_list va;
-    int argc = 1;
-    const char *arg;
-    int i, p[2];
-    char c;
-    
-    va_start(va, path);
-    arg = va_arg(va, const char *);
-    while (arg != NULL) {
-        arg = va_arg(va, const char *);
-	argc++;
-    }
-    va_end(va);
-    
-    /*
-     * set a pipe which will be used to tell child it may start.
-     * this avoids a race condition when the child exists before
-     * SU has registered it.
-     */
-    pipe(p);
-
-    debug("spawn_child -- forking\n");
-    pid = fork();
-    if (pid == -1) { /* fork() failure */
-	warn("fork() failed: %s\n", strerror(errno));
-        close(p[0]);
-        close(p[1]);
-	return -1;
-    }
-    else if (pid == 0) { /* child process */
-	char * argv[argc + 1];
-
-        close(p[1]);
-
-        debug("child: waiting for start signal\n");
-        como_read(p[0], &c, 1);
-        close(p[0]);
-        debug("child: starting\n");
-
-        argv[0] = (char *)path;
-	i = 1;
-	va_start(va, path);
-	while (i < argc) {
-	    argv[i] = va_arg(va, char *);
-	    i++;
-	}
-	va_end(va);
-	argv[i] = NULL;
-	
-	i = execv(path, argv);
-	assert(i == -1);
-	error("Can't execute %s at %s: %s\n", descr, path, strerror(errno));
-    }
-
-    close(p[0]);
-
-    i = s_children;
-    s_child_info[i].who = child;
-    s_child_info[i].pid = pid;
-    s_children++;
-
-    como_write(p[1], &c, 1); /* child registered, may start */
-    close(p[1]);
-
-    return pid;
-}
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.