Skip to content
Snippets Groups Projects
Commit 5f766b4a authored by Mark Grondona's avatar Mark Grondona
Browse files

o Disable SIGALRM to launch threads for now. THis seems to cause

   problems for the LinuxThreads
parent 7ab2631f
No related branches found
No related tags found
No related merge requests found
......@@ -238,10 +238,16 @@ static int _check_pending_threads(thd_t *thd, int count)
time_t now = time(NULL);
for (i = 0; i < count; i++) {
if ((thd[i].state == DSH_ACTIVE)
&& ((now - thd[i].tstart) >= 2) )
verbose("sending SIGALRM to thread %d", thd[i].thread);
pthread_kill(thd[i].thread, SIGALRM);
thd_t *tp = &thd[i];
if ((tp->state == DSH_ACTIVE) && ((now - tp->tstart) >= 2) ) {
debug2("sending SIGALRM to thread %d", tp->thread);
/*
* XXX: sending sigalrm to threads *seems* to
* generate problems with the pthread_manager
* thread. Disable this signal for now
* pthread_kill(tp->thread, SIGALRM);
*/
}
}
return 0;
......@@ -305,12 +311,15 @@ static void _p_launch(slurm_msg_t *req, job_t *job)
int i;
thd_t *thd;
int rc = 0;
SigFunc *oldh;
sigset_t set;
oldh = xsignal(SIGALRM, (SigFunc *) _alrm_handler);
xsignal_save_mask(&set);
xsignal_unblock(SIGALRM);
/*
* SigFunc *oldh;
* sigset_t set;
*
* oldh = xsignal(SIGALRM, (SigFunc *) _alrm_handler);
* xsignal_save_mask(&set);
* xsignal_unblock(SIGALRM);
*/
/*
* Set job timeout to maximum launch time + current time
......@@ -346,8 +355,10 @@ static void _p_launch(slurm_msg_t *req, job_t *job)
_wait_on_active(thd, job);
pthread_mutex_unlock(&active_mutex);
xsignal_restore_mask(&set);
xsignal(SIGALRM, oldh);
/*
* xsignal_restore_mask(&set);
* xsignal(SIGALRM, oldh);
*/
xfree(thd);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment