luckyimnotanigger/mkp224o
1
0
Fork 0
mirror of https://github.com/cathugger/mkp224o.git synced 2025-05-14 22:12:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

some stuff

Browse source
This commit is contained in:
cathugger 2017-10-23 06:40:34 +00:00
parent f7a87a1300
commit 8a917091d5
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
main.c
View file

@ -213,7 +213,8 @@ static void ifilter_addexpanded(
size_t i = VEC_LENGTH(ifilters); size_t i = VEC_LENGTH(ifilters);
VEC_ADDN(ifilters,cmask + 1); VEC_ADDN(ifilters,cmask + 1);
for (size_t j = 0;;++j) { for (size_t j = 0;;++j) {
VEC_BUF(ifilters,i + j).f = EXPVAL(ifltr->f,j,dmask,smask,ishift,rshift); VEC_BUF(ifilters,i + j).f =
EXPVAL(ifltr->f,j,dmask,smask,ishift,rshift);
if (j == cmask) if (j == cmask)
break; break;
} }
@ -228,7 +229,8 @@ static void ifilter_expand(IFT dmask,IFT smask,IFT cmask,int ishift,int rshift)
size_t esz = cmask + 1; // size of expanded elements size_t esz = cmask + 1; // size of expanded elements
for (size_t i = len - 1;;--i) { for (size_t i = len - 1;;--i) {
for (IFT j = 0;;++j) { for (IFT j = 0;;++j) {
VEC_BUF(ifilters,i * esz + j).f = EXPVAL(VEC_BUF(ifilters,i).f,j,dmask,smask,ishift,rshift); VEC_BUF(ifilters,i * esz + j).f =
EXPVAL(VEC_BUF(ifilters,i).f,j,dmask,smask,ishift,rshift);
if (j == cmask) if (j == cmask)
break; break;
} }
@ -573,15 +575,15 @@ static void filters_print()
#endif #endif
if (l) if (l)
fprintf(stderr,"filters:\n"); fprintf(stderr,"filters:\n");
else
fprintf(stderr, "no filters defined\n");
for (i = 0;i < l;++i) { for (i = 0;i < l;++i) {
char buf0[256],buf1[256]; char buf0[256],buf1[256];
u8 bufx[128]; u8 bufx[128];
if (i >= 20) { if (i >= 20) {
fprintf(stderr,"[another %llu filters not shown]\n",(unsigned long long)(filters_count() - 20)); size_t notshown = l - i;
fprintf(stderr,"[another %zu %s not shown]\n",
notshown,notshown == 1 ? "filter" : "filters");
break; break;
} }
@ -612,6 +614,7 @@ static void filters_print()
*a = 0; *a = 0;
fprintf(stderr,"\t%s\n",buf0); fprintf(stderr,"\t%s\n",buf0);
} }
fprintf(stderr,"totally %zu %s\n",l,l == 1 ? "filter" : "filters");
} }
// statistics, if enabled // statistics, if enabled
@ -1168,6 +1171,9 @@ int main(int argc,char **argv)
numthreads = cpucount(); numthreads = cpucount();
if (numthreads <= 0) if (numthreads <= 0)
numthreads = 1; numthreads = 1;
if (!quietflag)
fprintf(stderr,"using %d %s\n",
numthreads,numthreads == 1 ? "thread" : "threads");
} }
signal(SIGTERM,termhandler); signal(SIGTERM,termhandler);
@ -1191,7 +1197,7 @@ int main(int argc,char **argv)
#endif #endif
tret = pthread_create(&VEC_BUF(threads,i),0,fastkeygen ? dofastwork : dowork,tp); tret = pthread_create(&VEC_BUF(threads,i),0,fastkeygen ? dofastwork : dowork,tp);
if (tret) { if (tret) {
fprintf(stderr,"error while making %dth thread: %d\n",(int)i,tret); fprintf(stderr,"error while making %zuth thread: %d\n",i,tret);
exit(1); exit(1);
} }
} }
@ -1279,11 +1285,11 @@ int main(int argc,char **argv)
} }
if (!quietflag) if (!quietflag)
fprintf(stderr, "waiting for threads to finish...\n"); fprintf(stderr, "waiting for threads to finish...");
for (size_t i = 0;i < VEC_LENGTH(threads);++i) for (size_t i = 0;i < VEC_LENGTH(threads);++i)
pthread_join(VEC_BUF(threads,i),0); pthread_join(VEC_BUF(threads,i),0);
if (!quietflag) if (!quietflag)
fprintf(stderr, "done, quitting\n"); fprintf(stderr, " done.\n");
pthread_mutex_destroy(&keysgenerated_mutex); pthread_mutex_destroy(&keysgenerated_mutex);
pthread_mutex_destroy(&fout_mutex); pthread_mutex_destroy(&fout_mutex);