Changeset 6610


Ignore:
Timestamp:
Nov 11, 2016 2:12:24 AM (6 years ago)
Author:
ldelgass
Message:

Enable debug traces hidden by bad define check

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pymolproxy/trunk/pymolproxy.c

    r6604 r6610  
    21032103    struct timeval end;
    21042104
    2105 #if DEBUG
    21062105    DEBUG("Entering InitProxy");
    2107 #endif
     2106
    21082107    /* Create two pipes for communication with the external application. One
    21092108     * each for the applications's: stdin and stdout.  */
     
    21652164    stats.pid = child;
    21662165
    2167 #if DEBUG
    21682166    DEBUG("Started %s DISPLAY=%s", argv[0], getenv("DISPLAY"));
    2169 #endif
     2167
    21702168    /* close opposite end of pipe, these now belong to the child process  */
    21712169    close(sin[0]);
     
    21922190
    21932191        for (cp = cmdProcs; cp->name != NULL; cp++) {
    2194 #if DEBUG
    21952192            DEBUG("Adding command %s", cp->name);
    2196 #endif
    21972193            Tcl_CreateCommand(interp, cp->name, cp->proc, p, NULL);
    21982194        }
     
    22092205    int result, status;
    22102206
    2211 #if DEBUG
    22122207    DEBUG("Enter FreeProxy");
    2213 #endif
     2208
    22142209    close(p->cout);
    22152210    close(p->sout);
     
    22202215    ServerStats(0);
    22212216
    2222 #if DEBUG
    22232217    DEBUG("Waiting for pymol server to exit");
    2224 #endif
    22252218    alarm(5);
    22262219    if (waitpid(p->pid, &result, 0) < 0) {
    22272220        ERROR("error waiting on pymol server to exit: %s", strerror(errno));
    22282221    }
    2229 #if DEBUG
     2222
    22302223    DEBUG("attempting to signal (SIGTERM) pymol server.");
    2231 #endif
    22322224    kill(-p->pid, SIGTERM); /* Kill process group */
    22332225    alarm(5);
    22342226
    2235 #if DEBUG
    22362227    DEBUG("Waiting for pymol server to exit after SIGTERM");
    2237 #endif
    22382228    if (waitpid(p->pid, &result, 0) < 0) {
    22392229        if (errno != ECHILD) {
     
    22442234    status = -1;
    22452235    while ((status == -1) && (errno == EINTR)) {
    2246 #if DEBUG
    22472236        DEBUG("Attempting to signal (SIGKILL) pymol server.");
    2248 #endif
    22492237        kill(-p->pid, SIGKILL); /* Kill process group */
    22502238        alarm(10);
    2251 #if DEBUG
     2239
    22522240        DEBUG("Waiting for pymol server to exit after SIGKILL");
    2253 #endif
    22542241        status = waitpid(p->pid, &result, 0);
    22552242        alarm(0);
Note: See TracChangeset for help on using the changeset viewer.