tyler.durden/pixiewps
1
0
Fork 0
mirror of https://github.com/wiire-a/pixiewps.git synced 2025-07-28 16:24:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

add workaround for mingw toolchains with broken pthread_attr_t support

Browse Source 
toolchains from https://sourceforge.net/projects/mingw-w64/ don't
define PTHREAD_STACK_MIN, and when using pthread_attr_t fail due to
internal bugs in their atomics implementation:

   __buildlogicali(_InterlockedAnd, __LONG32, and)
   mingw32/include/psdk_inc/intrin-impl.h:977:1:
   error: static declaration of '_InterlockedAnd' follows non-static declaration

OTOH, they implement pthread support without the need of external DLL's,
so using them might be preferable.
This commit is contained in:
rofl0r 2017-10-22 12:35:34 +01:00
parent 537dd74029
commit 147a615891
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pixiewps.c
View File

@ -124,10 +124,25 @@ static void *crack_thread(void *arg) {
return 0; return 0;
} }
#ifndef PTHREAD_STACK_MIN
static void setup_thread(int i) {
pthread_create(&job_control.crack_jobs[i].thr, 0, crack_thread, &job_control.crack_jobs[i]);
}
#else
static size_t getminstacksize(size_t minimum) { static size_t getminstacksize(size_t minimum) {
return (minimum < PTHREAD_STACK_MIN) ? PTHREAD_STACK_MIN : minimum; return (minimum < PTHREAD_STACK_MIN) ? PTHREAD_STACK_MIN : minimum;
} }
static void setup_thread(int i) {
size_t stacksize = getminstacksize(64*1024);
pthread_attr_t attr;
int attr_ok = pthread_attr_init(&attr) == 0 ;
if(attr_ok) pthread_attr_setstacksize(&attr, stacksize);
pthread_create(&job_control.crack_jobs[i].thr, &attr, crack_thread, &job_control.crack_jobs[i]);
if(attr_ok) pthread_attr_destroy(&attr);
}
#endif
static void init_crack_jobs(struct global *wps) { static void init_crack_jobs(struct global *wps) {
job_control.jobs = wps->jobs; job_control.jobs = wps->jobs;
job_control.end = wps->end; job_control.end = wps->end;
@ -145,15 +160,10 @@ static void init_crack_jobs(struct global *wps) {
job_control.randr_enonce[i] |= wps->e_nonce[j++]; job_control.randr_enonce[i] |= wps->e_nonce[j++];
} }
job_control.crack_jobs = malloc(wps->jobs * sizeof (struct job_control)); job_control.crack_jobs = malloc(wps->jobs * sizeof (struct job_control));
size_t stacksize = getminstacksize(64*1024);
time_t curr = wps->start; time_t curr = wps->start;
for(i = 0; i < wps->jobs; i++) { for(i = 0; i < wps->jobs; i++) {
job_control.crack_jobs[i].start = curr; job_control.crack_jobs[i].start = curr;
pthread_attr_t attr; setup_thread(i);
int attr_ok = pthread_attr_init(&attr) == 0 ;
if(attr_ok) pthread_attr_setstacksize(&attr, stacksize);
pthread_create(&job_control.crack_jobs[i].thr, &attr, crack_thread, &job_control.crack_jobs[i]);
if(attr_ok) pthread_attr_destroy(&attr);
curr -= SECS_PER_JOB_BLOCK; curr -= SECS_PER_JOB_BLOCK;
} }
} }