comparison regexParser/CeriumGrep.cc @ 321:a1b65d39b947

bmSearch fix
author mir3636
date Mon, 16 May 2016 17:03:17 +0900
parents a4484c02cba5
children
comparison
equal deleted inserted replaced
320:da02a7258d54 321:a1b65d39b947
22 s.tg = NULL; 22 s.tg = NULL;
23 23
24 RegexInfo ri; 24 RegexInfo ri;
25 ri.stateNumber = 1; 25 ri.stateNumber = 1;
26 ri.wordMode = true; 26 ri.wordMode = true;
27 ri.maxWordLen = 0;
27 for (int i = 1; i < argc; i++) { 28 for (int i = 1; i < argc; i++) {
28 if (strcmp(argv[i],"-regex") == 0) { 29 if (strcmp(argv[i],"-regex") == 0) {
29 ri.ptr = (unsigned char*)argv[i+1]; i++; 30 ri.ptr = (unsigned char*)argv[i+1]; i++;
30 } else if (strcmp(argv[i],"-noGeneration") == 0) { 31 } else if (strcmp(argv[i],"-noGeneration") == 0) {
31 generate = false; 32 generate = false;
66 if (generateSequentialSearch) { 67 if (generateSequentialSearch) {
67 generateSequentialSearch(tgv.tg); 68 generateSequentialSearch(tgv.tg);
68 } 69 }
69 } 70 }
70 71
72 tgv.tg->maxWordLen = ri.maxWordLen;
73
71 if (filename != NULL && !parallel) { 74 if (filename != NULL && !parallel) {
72 int fd = 0; 75 int fd = 0;
73 st_mmap_t st_mmap = createSt_mmap(filename,fd); 76 st_mmap_t st_mmap = createSt_mmap(filename,fd);
74 Buffer buff = createBuffer(st_mmap); 77 Buffer buff = createBuffer(st_mmap);
75 if (ts) threadedSearch(tgv.tg,buff); 78 if (ts) threadedSearch(tgv.tg,buff);