diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2013-06-29 01:16:48 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2013-06-29 01:16:48 +0000 |
| commit | a3c320fd757566a3a8dd58d054ad984fd104445c (patch) | |
| tree | 59b687b9cd6eceb0aa7636cf4a62b716bde97c4f /echld/dispatcher.c | |
| parent | 487ff8806d729467ce65f460c10341cd3136a4e7 (diff) | |
One further iteration, get things right, put placeholders for things to do.
svn path=/trunk/; revision=50227
Diffstat (limited to 'echld/dispatcher.c')
| -rw-r--r-- | echld/dispatcher.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/echld/dispatcher.c b/echld/dispatcher.c index 6357c2d49e..e300c06c1d 100644 --- a/echld/dispatcher.c +++ b/echld/dispatcher.c @@ -121,13 +121,13 @@ static long dbg_r = 0; #define DISP_DBG_INIT() do { debug_fp = stderr; DCOM(); } while(0) #define DISP_DBG_START(fname) do { debug_fp = fopen(fname,"a"); DCOM(); DISP_DBG((0,"Log Started")); } while(0) #define DISP_WRITE(FD,BA,CH,T,RH) ( dbg_r = echld_write_frame(FD,BA,CH,T,RH,NULL), DISP_DBG((1,"SND fd=%d ch=%d ty='%s' rh=%d msg='%s'",FD,CH,TY(T),RH, (dbg_r>0?"ok":strerror(errno)))), dbg_r ) -#define CHLD_SET_STATE(c,st) DISP_DBG((1,"Child[%d] State %s => %s",(c)->chld_id,ST((c)->state),ST((c)->state=(st)) )) +#define CHLD_SET_STATE(c,st) do { DISP_DBG((1,"Child[%d] State %s => %s",(c)->chld_id, ST((c)->state), ST((st)) )); (c)->state=(st); } while(0) #else #define DISP_DBG(attrs) #define DISP_DBG_INIT() #define DISP_DBG_START(fname) #define DISP_WRITE(FD,BA,CH,T,RH) echld_write_frame(FD,BA,CH,T,RH,NULL) -#define CHLD_SET_STATE(c,st) ((c)->state=(st)) +#define CHLD_SET_STATE(c,st) ((c)->state = (st)) #endif #define DISP_RESP(B,T) (DISP_WRITE( dispatcher->parent_out, (B), 0, (T), dispatcher->reqh_id)) @@ -595,11 +595,12 @@ static void detach_new_child(enc_msg_t* em, echld_chld_id_t chld_id) { c->write_fd = pipe_to_child; c->pid = pid; c->chld_id = chld_id; - c->state = CREATING; c->closing = FALSE; + CHLD_SET_STATE(c,CREATING); + DISP_DBG((4,"Child Forked pid=%d chld_id=%d from_fd=%d to_fd=%d", - pid, c->chld_id, pipe_from_child, pipe_to_child)); + pid, c->chld_id, pipe_from_child, pipe_to_child)); start_wait_time.tv_sec = (int)(start_wait_time_us / 1000000); start_wait_time.tv_usec = (int)(start_wait_time_us % 1000000); |