Removed second pthread_create in nbio build

src/slurmd/nb_io.c

@@ -36,21 +36,22 @@
  ******************************************************************/			
 int forward_io ( task_start_t * task_start ) 
 {
-	pthread_attr_t pthread_attr ;
+	//pthread_attr_t pthread_attr ;
 
-	pthread_attr_init( & pthread_attr ) ;
+	//pthread_attr_init( & pthread_attr ) ;
 	/* set detatch state */
 	/*pthread_attr_setdetachstate ( & pthread_attr , PTHREAD_CREATE_DETACHED ) ;*/
-	if ( pthread_create ( & task_start->io_pthread_id[STDIN_FILENO] , NULL , do_nbio , task_start ) )
-	{
-		return SLURM_FAILURE ;
-	}
-	return SLURM_SUCCESS ;
+	//if ( pthread_create ( & task_start->io_pthread_id[STDIN_FILENO] , NULL , do_nbio , task_start ) )
+	//{
+	//	return SLURM_FAILURE ;
+	//}
+	//return SLURM_SUCCESS ;
+	return do_nbio ( task_start ) ;
 }
 
 int wait_on_io_threads ( task_start_t * task_start ) 
 {
-	pthread_join ( task_start->io_pthread_id[STDIN_FILENO] , NULL ) ;
+	//pthread_join ( task_start->io_pthread_id[STDIN_FILENO] , NULL ) ;
 	info ( "%i: nbio exit" , task_start -> local_task_id ) ;
 	/* thread join on stderr or stdout signifies task termination we should kill the stdin thread */
 	return SLURM_SUCCESS ;

src/slurmd/task_mgr.c

@@ -126,7 +126,6 @@ void * task_exec_thread ( void * arg )
 
 	/* create pipes to read child stdin, stdout, sterr */
 	init_parent_pipes ( task_start->pipes ) ;
-	forward_io ( arg ) ;
 
 #define FORK_ERROR -1
 #define CHILD_PROCCESS 0
@@ -205,6 +204,7 @@ void * task_exec_thread ( void * arg )
 			/* ask me how I know :) */
 			/* think once, twice, 10^100000000 times before changeing the below */
 			/*1*/setup_parent_pipes ( task_start->pipes ) ;
+			/*1.5*/forward_io ( arg ) ;
 			/*2*/waitpid ( cpid , & task_return_code , 0 ) ;
 			/*3*/wait_on_io_threads ( task_start ) ;