From e14bd47b0f0e31ad819c52896c8690275e245c5a Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 9 Apr 2007 19:52:00 +0000 Subject: [PATCH] made new child creation more robust git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@862 9efc2488-bf62-4759-914b-345cdb29e865 --- src/libstack/osrf_prefork.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/libstack/osrf_prefork.c b/src/libstack/osrf_prefork.c index 7d48d82..31548e9 100644 --- a/src/libstack/osrf_prefork.c +++ b/src/libstack/osrf_prefork.c @@ -426,20 +426,33 @@ void prefork_run(prefork_simple* forker) { /* if none available, add a new child if we can */ if( ! honored ) { osrfLogDebug( OSRF_LOG_MARK, "Not enough children, attempting to add..."); + if( forker->current_num_children < forker->max_children ) { osrfLogDebug( OSRF_LOG_MARK, "Launching new child with current_num = %d", forker->current_num_children ); prefork_child* new_child = launch_child( forker ); - message_prepare_xml( cur_msg ); - char* data = cur_msg->msg_xml; - if( ! data || strlen(data) < 1 ) break; - new_child->available = 0; - osrfLogDebug( OSRF_LOG_MARK, "Writing to new child fd %d : pid %d", - new_child->write_data_fd, new_child->pid ); - write( new_child->write_data_fd, data, strlen(data) + 1 ); - forker->first_child = new_child->next; - honored = 1; + if( new_child ) { + + message_prepare_xml( cur_msg ); + char* data = cur_msg->msg_xml; + + if( data ) { + int len = strlen(data); + + if( len > 0 ) { + new_child->available = 0; + osrfLogDebug( OSRF_LOG_MARK, "Writing to new child fd %d : pid %d", + new_child->write_data_fd, new_child->pid ); + + if( write( new_child->write_data_fd, data, len + 1 ) >= 0 ) { + forker->first_child = new_child->next; + honored = 1; + } + } + } + } + } } @@ -449,7 +462,6 @@ void prefork_run(prefork_simple* forker) { check_children( forker, 1 ); /* non-poll version */ /* tell the loop no to call check_children again, since we're calling it now */ no_recheck = 1; - //usleep(50000); } if( child_dead ) -- 2.11.0