IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 14, 2005, 10:33:53 AM (21 years ago)
Author:
eugene
Message:

cleanup up communications for speed

Location:
trunk/Ohana/src/opihi/pantasks
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/pantasks/CheckController.c

    r4762 r4763  
    3838  gettimeofday (&stop, (void *) NULL);
    3939  dtime = DTIME (stop, start);
    40   if (VerboseMode()) fprintf (stderr, "check stack %f\n", dtime);
     40  if (VerboseMode()) fprintf (stderr, "check exit stack %f\n", dtime);
     41  /* if (Njobs) fprintf (stderr, "check exit stack %f\n", dtime); */
    4142  gettimeofday (&start, (void *) NULL);
    4243
    … …  
    6162  gettimeofday (&stop, (void *) NULL);
    6263  dtime = DTIME (stop, start);
    63   if (VerboseMode()) fprintf (stderr, "check %d jobs %f\n", i, dtime);
     64  /* if (VerboseMode()) fprintf (stderr, "clear %d exit jobs %f\n", i, dtime); */
     65  gettimeofday (&start, (void *) NULL);
    6466
    6567  if (TestElapsedCheck()) return (TRUE);
    … …  
    8587  }
    8688
     89  gettimeofday (&stop, (void *) NULL);
     90  dtime = DTIME (stop, start);
     91  /* if (VerboseMode()) fprintf (stderr, "check crash stack %f\n", dtime); */
     92  gettimeofday (&start, (void *) NULL);
     93
    8794  p = buffer.buffer;
    8895  for (i = 0; (i < Njobs) && !TestElapsedCheck(); i++) {
    … …  
    104111  }
    105112  FreeIOBuffer (&buffer);
     113
     114  gettimeofday (&stop, (void *) NULL);
     115  dtime = DTIME (stop, start);
     116  /* if (VerboseMode()) fprintf (stderr, "clear %d crash jobs %f\n", i, dtime); */
    106117  return (TRUE);
    107118}

  • trunk/Ohana/src/opihi/pantasks/CheckJobs.c

    r4762 r4763  
    1717    switch (status) {
    1818      case JOB_PENDING:
    19         if (VerboseMode()) fprintf (stderr, "job %s (%d) pending\n", job[0].task[0].name, job[0].JobID);
     19        /* if (VerboseMode()) fprintf (stderr, "job %s (%d) pending\n", job[0].task[0].name, job[0].JobID); */
    2020        break;
    2121
    2222      case JOB_BUSY:
    23         if (VerboseMode()) fprintf (stderr, "job %s (%d) busy\n", job[0].task[0].name, job[0].JobID);
     23        /* if (VerboseMode()) fprintf (stderr, "job %s (%d) busy\n", job[0].task[0].name, job[0].JobID); */
    2424        break;
    2525

  • trunk/Ohana/src/opihi/pantasks/CheckSystem.c

    r4762 r4763  
    99  gettimeofday (&start, (void *) NULL);
    1010
    11   if (Ncheck < 5) {
     11  if (Ncheck < 20) {
    1212    CheckTasks ();
    1313    CheckJobs ();

  • trunk/Ohana/src/opihi/pantasks/ControllerOps.c

    r4762 r4763  
    2525  gettimeofday (&stop, (void *) NULL);
    2626  dtime = DTIME (stop, start);
    27   if (VerboseMode()) fprintf (stderr, "check job status %f\n", dtime);
     27  /* if (VerboseMode()) fprintf (stderr, "check job status %f\n", dtime); */
    2828
    2929  if ((job[0].state == JOB_EXIT) || (job[0].state == JOB_CRASH)) {
    … …  
    3232    gettimeofday (&stop, (void *) NULL);
    3333    dtime = DTIME (stop, start);
    34     if (VerboseMode()) fprintf (stderr, "get stdout %f\n", dtime);
    35 
     34    /* if (VerboseMode()) fprintf (stderr, "get stdout %f\n", dtime); */
     35
     36    gettimeofday (&start, (void *) NULL);
    3637    GetJobOutput ("stderr", job[0].pid, &job[0].stderr, job[0].stderr_size);
     38    gettimeofday (&stop, (void *) NULL);
     39    dtime = DTIME (stop, start);
     40    /* if (VerboseMode()) fprintf (stderr, "get stderr %f\n", dtime); */
     41
     42    gettimeofday (&start, (void *) NULL);
    3743    DeleteControllerJob (job);
     44    gettimeofday (&stop, (void *) NULL);
     45    dtime = DTIME (stop, start);
     46    /* if (VerboseMode()) fprintf (stderr, "delete job %f\n", dtime); */
    3847  } 
    3948  return (TRUE);
    … …  
    138147  if (status == -1) return (CONTROLLER_HUNG);
    139148
    140   if (VerboseMode()) fprintf (stderr, "message received (GetJobOutput : %s)\n", cmd); 
     149  /* if (VerboseMode()) fprintf (stderr, "message received (GetJobOutput : %s)\n", cmd);   */
    141150  /* drop extra bytes from pcontrol (not pclient:job) */
    142151  buffer[0].Nbuffer = Nstart + Nbytes;
    … …  
    328337  FlushIOBuffer (buffer);
    329338
    330   if (VerboseMode()) fprintf (stderr, "send: %s\n", cmd);
    331 
    332339  /* send command, is pipe still open? */
    333340  status = write_fmt (stdin_cntl, "%s\n", cmd);
    334341  if ((status == -1) && (errno == EPIPE)) {
    335     ControllerStatus = FALSE;
     342    StopController ();
    336343    if (VerboseMode()) fprintf (stderr, "controller is down\n");
    337344    return (FALSE);
    … …  
    347354  }
    348355  if (status ==  0) {
    349     ControllerStatus = FALSE;
     356    StopController ();
    350357    if (VerboseMode()) fprintf (stderr, "controller is down\n");
    351358    return (FALSE);
    352359  }
    353360  if (status == -1) {
     361    StopController ();
    354362    if (VerboseMode()) fprintf (stderr, "controller is not responding\n");
    355363    return (FALSE);
    … …  
    362370    bzero (buffer[0].buffer + buffer[0].Nbuffer, buffer[0].Nalloc - buffer[0].Nbuffer);
    363371  }
    364   if (VerboseMode()) fprintf (stderr, "message received, %d cycles\n", i);
     372  /* if (VerboseMode()) fprintf (stderr, "message received, %d cycles\n", i); */
    365373  return (TRUE);
    366374}
    … …  
    428436int QuitController () {
    429437
    430   int i, status, waitstatus, result;
     438  int status;
    431439  char cmd[128];
    432440  IOBuffer buffer;
    … …  
    436444  sprintf (cmd, "quit");
    437445  InitIOBuffer (&buffer, 0x100);
    438   status = ControllerCommand (cmd, CONTROLLER_PROMPT, &buffer);
    439   FreeIOBuffer (&buffer);
     446  status = ControllerCommand (cmd, "", &buffer);
     447  FreeIOBuffer (&buffer);
     448
     449  /* the quit command does not return a prompt, so we always
     450     get an error on the controller here */
     451  StopController ();
     452  return (TRUE);
     453}
     454
     455int StopController () {
     456
     457  int i, waitstatus, result;
     458
     459  if (!ControllerStatus) return (TRUE);
    440460
    441461  ControllerStatus = FALSE;
    … …  
    451471  FreeIOBuffer (&stdout_buffer);
    452472  FreeIOBuffer (&stderr_buffer);
    453 
    454   return (TRUE);
    455 }
     473  return (TRUE);
     474}

  • trunk/Ohana/src/opihi/pantasks/Makefile

    r4748 r4763  
    5151$(SDIR)/controller_status.$(ARCH).o \
    5252$(SDIR)/controller_output.$(ARCH).o \
     53$(SDIR)/controller_pulse.$(ARCH).o \
    5354$(SDIR)/task.$(ARCH).o \
    5455$(SDIR)/task_host.$(ARCH).o \

  • trunk/Ohana/src/opihi/pantasks/controller.c

    r4693 r4763  
    66int controller_check   PROTO((int, char **));
    77int controller_output  PROTO((int, char **));
     8int controller_pulse   PROTO((int, char **));
    89
    910static Command controller_cmds[] = {
    … …  
    1314  {"status", controller_status, "check controller status"},
    1415  {"output", controller_output, "print controller output"},
     16  {"pulse",  controller_pulse,  "set controller pulse"},
    1517};
    1618

  • trunk/Ohana/src/opihi/pantasks/controller_host.c

    r4714 r4763  
    2222  return (TRUE);
    2323}
     24
     25/* should I keep an internal host table so I can reload the
     26   hosts if the controller exits?
     27
     28   alternatively, that could be a user-level choice
     29*/

  • trunk/Ohana/src/opihi/pantasks/controller_status.c

    r4706 r4763  
    2222  InitIOBuffer (&buffer, 0x100);
    2323  status = ControllerCommand (command, CONTROLLER_PROMPT, &buffer);
    24   if (status) fwrite (buffer.buffer, 1, buffer.Nbuffer, stderr);
     24  if (status) {
     25    fwrite (buffer.buffer, 1, buffer.Nbuffer, stderr);
     26  } else {
     27    fprintf (stderr, "controller is down\n");
     28  }
    2529  FreeIOBuffer (&buffer);
    2630  return (TRUE);
    27 
    2831}

  • trunk/Ohana/src/opihi/pantasks/psched.c

    r4714 r4763  
    4141
    4242  signal (SIGINT, SIG_IGN);
     43  signal (SIGPIPE, gotsignal);
     44  signal (SIGTSTP, gotsignal);
     45  signal (SIGTTIN, gotsignal);
    4346  return;
    4447}
    … …  
    5760  return;
    5861}
     62
     63void gotsignal (int signum) {
     64  fprintf (stderr, "got signal : %d\n", signum);
     65  return;
     66}
Note: See TracChangeset for help on using the changeset viewer.