d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the WITH_SORT_THREADS build.

Browse Source 
PR:		201664
MFC after:	1 week
This commit is contained in:
markj 2018-02-07 20:36:37 +00:00
parent 4c5d3fb6f7
commit fe0ada269c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
usr.bin/sort/radixsort.c
View File

@ -129,6 +129,14 @@ have_sort_left(void)
#endif /* SORT_THREADS */
static void
_push_ls(struct level_stack *ls)
{
ls->next = g_ls;
g_ls = ls;
}
/*
* Push sort level to the stack
*/
@ -141,22 +149,14 @@ push_ls(struct sort_level *sl)
new_ls->sl = sl;
#if defined(SORT_THREADS)
if (nthreads > 1)
if (nthreads > 1) {
pthread_mutex_lock(&g_ls_mutex);
#endif
new_ls->next = g_ls;
g_ls = new_ls;
#if defined(SORT_THREADS)
if (nthreads > 1)
_push_ls(new_ls);
pthread_cond_signal(&g_ls_cond);
#endif
#if defined(SORT_THREADS)
if (nthreads > 1)
pthread_mutex_unlock(&g_ls_mutex);
} else
#endif
_push_ls(new_ls);
}
/*