Changeset 6611 for pymolproxy/branches/1.0

Timestamp:

Nov 11, 2016, 2:18:27 AM (8 years ago)

Author:

ldelgass

Message:

merge r6610 from pymolproxy trunk (debug prints)

Location:

pymolproxy/branches/1.0

Files:

• . (modified) (1 prop)
• aclocal.m4 (modified) (1 prop)
• cf (modified) (1 prop)
• configure.ac (modified) (1 prop)
• pymolproxy.c (modified) (6 diffs)

pymolproxy/branches/1.0/pymolproxy.c

@@ -2103 +2103 @@
     struct timeval end;
 
-#if DEBUG
     DEBUG("Entering InitProxy");
-#endif
+
     /* Create two pipes for communication with the external application. One
      * each for the applications's: stdin and stdout.  */
@@ -2165 +2164 @@
     stats.pid = child;
 
-#if DEBUG
     DEBUG("Started %s DISPLAY=%s", argv[0], getenv("DISPLAY"));
-#endif
+
     /* close opposite end of pipe, these now belong to the child process  */
     close(sin[0]);
@@ -2192 +2190 @@
 
         for (cp = cmdProcs; cp->name != NULL; cp++) {
-#if DEBUG
             DEBUG("Adding command %s", cp->name);
-#endif
             Tcl_CreateCommand(interp, cp->name, cp->proc, p, NULL);
         }
@@ -2209 +2205 @@
     int result, status;
 
-#if DEBUG
     DEBUG("Enter FreeProxy");
-#endif
+
     close(p->cout);
     close(p->sout);
@@ -2220 +2215 @@
     ServerStats(0);
 
-#if DEBUG
     DEBUG("Waiting for pymol server to exit");
-#endif
     alarm(5);
     if (waitpid(p->pid, &result, 0) < 0) {
         ERROR("error waiting on pymol server to exit: %s", strerror(errno));
     }
-#if DEBUG
+
     DEBUG("attempting to signal (SIGTERM) pymol server.");
-#endif
     kill(-p->pid, SIGTERM); /* Kill process group */
     alarm(5);
 
-#if DEBUG
     DEBUG("Waiting for pymol server to exit after SIGTERM");
-#endif
     if (waitpid(p->pid, &result, 0) < 0) {
         if (errno != ECHILD) {
@@ -2244 +2234 @@
     status = -1;
     while ((status == -1) && (errno == EINTR)) {
-#if DEBUG
         DEBUG("Attempting to signal (SIGKILL) pymol server.");
-#endif
         kill(-p->pid, SIGKILL); /* Kill process group */
         alarm(10);
-#if DEBUG
+
         DEBUG("Waiting for pymol server to exit after SIGKILL");
-#endif
         status = waitpid(p->pid, &result, 0);
         alarm(0);