Changeset 7783


Ignore:
Timestamp:
02/11/19 21:30:59 (6 months ago)
Author:
alexander
Message:

Committing cleanup of startstop_unix_generic, removing copy of "restart" messages

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libsrc/util/startstop_unix_generic.c

    r7781 r7783  
    8484    ********************************/ 
    8585   int  i, j, rc, placeholder; 
    86    static int restart_counter = 0; 
    87    static int start_ew_counter = 0; 
    8886   char *runPath; 
    8987   char *logPath; 
     
    361359   ****************/ 
    362360   StartEarthworm( argv[0] ); 
    363    start_ew_counter++; 
    364    logit("et", "startstop- start_ew_counter: %d\n", start_ew_counter); 
    365361/* Watch transport rings for kill flags, status requests & restart requests 
    366362   ************************************************************************/ 
     
    403399 
    404400         if     ( msglogo.type == metaring.TypeRestart   ){ 
    405                         restart_counter++; 
    406                         logit("et", "restart_counter: %d pid: %d ringName: %s\n", restart_counter, getpid(), metaring.ringName[i]); 
    407401            ew_thread_t tid; 
    408402            if ( StartThreadWithArg( &RestartChildThread, msg, 0, &tid ) == -1 ) { 
     
    17631757int StopChild ( char *restartmsg, int *ich ) 
    17641758{ 
    1765    static int restartCounter = 0; 
    17661759   int ir, childNum; 
    17671760   int status  = 0; 
     
    17811774   #define STOPPED            3 
    17821775   #define STOP_ABORT         4 
    1783         restartCounter++; 
    17841776 
    17851777   /* Find this process id in the list of children 
     
    17941786      if( childNum==nChild ) 
    17951787      { 
    1796          //sprintf( ErrText, "Cannot restart pid=%d; it is not my child! (counter: %d)\n", 
    1797          //         procId, restartCounter); 
    1798          //ReportError( ERR_STARTCHILD, ErrText, &metaring ); 
     1788         sprintf( ErrText, "Cannot restart pid=%d; it is not my child!\n", 
     1789                  procId); 
     1790         ReportError( ERR_STARTCHILD, ErrText, &metaring ); 
    17991791         return EXIT; 
    18001792      } 
  • trunk/src/reporting/copystatus/copystatus.c

    r3837 r7783  
    5959#define MAX_SIZE 300            /* Largest message size in characters */ 
    6060 
    61 #define NUM_LOGOS_TOMONITOR 4 
     61#define NUM_LOGOS_TOMONITOR 3 
    6262 
    6363/* Things to look up in the earthworm.h tables with getutil.c functions 
     
    6969static unsigned char TypeError; 
    7070static unsigned char TypeStop; 
    71 static unsigned char TypeRestart; 
    7271 
    7372 
     
    133132      return -1; 
    134133   } 
    135    if ( GetType( "TYPE_RESTART", &TypeRestart ) != 0 ) 
    136    { 
    137       printf( "copystatus: Invalid message type <TYPE_RESTART>; exitting!\n" ); 
    138       return -1; 
    139    } 
    140134 
    141135/* Look up transport region keys earthworm.h tables 
     
    170164   getlogo[2].mod    = ModWildCard; 
    171165   getlogo[2].instid = InstWildCard; 
    172    getlogo[3].type   = TypeRestart; 
    173    getlogo[3].mod    = ModWildCard; 
    174    getlogo[3].instid = InstWildCard; 
    175166 
    176167/* Copy errors and heartbeats from inRegion to outRegion 
Note: See TracChangeset for help on using the changeset viewer.