Show
Ignore:
Timestamp:
06/16/09 16:08:34 (4 years ago)
Author:
sson
Message:

Used PINT_sm_frame(smcb->parent_smcb, 0) to refer parent smcbs in pipeline.sm.
Removed possible double free() in io.sm.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/as-branch/src/server/pipeline.sm

    r7825 r7826  
    124124 
    125125    gossip_debug(GOSSIP_IO_DEBUG, "smcb->base_frame=%d, frame_count=%d\n", smcb->base_frame, smcb->frame_count); 
    126     gossip_debug(GOSSIP_IO_DEBUG, "smcb=%p, smcb->parent_smcb=%p\n", smcb, smcb->parent_smcb); 
    127126    s_op->u.pipeline.buffer_used = 0; 
    128127    bytes = s_op->u.pipeline.buffer_size; 
    … …  
    221220    job_id_t tmp_id; 
    222221    struct server_configuration_s *user_opts = get_server_config_struct(); 
    223     struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent; 
     222    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0); 
    224223 
    225224    if(s_op->u.pipeline.segs == 0) { 
    … …  
    310309{ 
    311310    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT); 
    312     struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent; 
     311    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0); 
    313312    js_p->error_code = 0; 
    314313    PVFS_size file_req_offset = parent_s_op->u.io.file_req_offset; 
    … …  
    366365{ 
    367366    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT); 
    368     struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent; 
     367    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0); 
    369368    PINT_sm_msgpair_state *msg_p = NULL; 
    370369    struct server_configuration_s *user_opts = get_server_config_struct(); 
    … …  
    504503{ 
    505504    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT); 
    506     struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent; 
     505    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0); 
    507506    js_p->error_code = 0; 
    508507 
    … …  
    754753{ 
    755754    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT); 
    756     struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent; 
     755    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0); 
    757756    int ret, tmp_id; 
    758757    struct server_configuration_s *user_opts = get_server_config_struct(); 
    … …  
    808807{ 
    809808    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT); 
    810     struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent; 
     809    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0); 
    811810    PINT_segpool_handle_t h = s_op->u.pipeline.seg_handle; 
    812811    js_p->error_code = 0;