Mercurial > hg > Applications > Grep

annotate regexParser/threadedSearch.cc @ 321:a1b65d39b947

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bmSearch fix
author mir3636
date Mon, 16 May 2016 17:03:17 +0900
parents da02a7258d54
children 62f4628d2c0d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
1 #include <stdio.h>
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
2 #include <stdlib.h>
318
c9458ffecb87 word mode in tSearch
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 308
diff changeset
3 #include <string.h>
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
4
246
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 245
diff changeset
5 #include "regexParser.h"
308
1188debbef10 separate CharClass
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 299
diff changeset
6 #include "CharClass.h"
258
29e467a491ba remove error and add threadedSearch.h
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 257
diff changeset
7 #include "threadedSearch.h"
246
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 245
diff changeset
8 #include "subsetConstruction.h"
321
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
9 #include "bmSearch.h"
246
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 245
diff changeset
10
320
mir3636
parents: 319
diff changeset
11 #define max(a,b)((a)>(b)?a:b)
mir3636
parents: 319
diff changeset
12 #define min(a,b)((a)<(b)?a:b)
mir3636
parents: 319
diff changeset
13
mir3636
parents: 319
diff changeset
14 TStatePtr nextTState(BitVector bi,TransitionGeneratorPtr tg);
mir3636
parents: 319
diff changeset
15
272
5aa9d01926f1 Cerium version no compile errors
kono
parents: 270
diff changeset
16 static
264
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
17 TSValue stateNothing(TSValue tsv) {
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
18 return tsv;
245
d34de5edaa96 add threadedSearch.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
19 }
d34de5edaa96 add threadedSearch.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
20
272
5aa9d01926f1 Cerium version no compile errors
kono
parents: 270
diff changeset
21 static
264
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
22 TSValue stateSkip(TSValue tsv) {
292
868f01f1ba8e maximum match
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 288
diff changeset
23 if (tsv.matchEnd) {
868f01f1ba8e maximum match
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 288
diff changeset
24 fwrite(tsv.matchBegin,tsv.matchEnd-tsv.matchBegin,1,stdout);
868f01f1ba8e maximum match
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 288
diff changeset
25 puts("");
868f01f1ba8e maximum match
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 288
diff changeset
26 tsv.matchEnd = NULL;
868f01f1ba8e maximum match
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 288
diff changeset
27 }
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
28 tsv.matchBegin = tsv.buff.buffptr; // next char may be matchBegin
319
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
29 // if possible use bmsearch
321
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
30 if (!tsv.current || !tsv.current->ccv[0].w.bm ) return tsv;
319
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
31 while (tsv.buff.buffptr < tsv.buff.buffend) {
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
32 long skip = tsv.tg->maxWordLen;
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
33 for (int k = 0; k < tsv.current->ccvSize; k++) {
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
34 CCVPtr ccv = &tsv.current->ccv[k];
321
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
35 if (ccv->w.bm) {
320
mir3636
parents: 319
diff changeset
36 int i = ccv->w.length - 1;
mir3636
parents: 319
diff changeset
37 while (tsv.buff.buffptr[i] == ccv->w.word[i]) {
319
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
38 if (i == 0) {
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
39 if (ccv->tState) {
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
40 tsv.current = ccv->tState;
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
41 } else {
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
42 tsv.current = nextTState(ccv->state,tsv.tg);
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
43 ccv->tState = tsv.current;
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
44 }
321
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
45 tsv.matchBegin = tsv.buff.buffptr;
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
46 tsv.buff.buffptr += ccv->w.length;
319
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
47 return tsv;
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
48 }
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
49 --i;
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
50 }
320
mir3636
parents: 319
diff changeset
51 skip = min(skip,max(ccv->w.bm->skip_table[tsv.buff.buffptr[i]],ccv->w.length - i));
319
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
52 }
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
53 }
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
54 tsv.buff.buffptr += skip;
7b8234c090f7 bmSearch
mir3636
parents: 318
diff changeset
55 }
321
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
56 tsv.matchBegin = tsv.buff.buffptr;
264
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
57 return tsv;
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
58 }
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
59
272
5aa9d01926f1 Cerium version no compile errors
kono
parents: 270
diff changeset
60 static
264
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
61 TSValue stateMatch(TSValue tsv) {
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
62 tsv.matchEnd = tsv.buff.buffptr; // next char of the match
264
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
63 return tsv;
257
ebb429c2b6a7 fix allocate state in generateTransition
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 254
diff changeset
64 }
ebb429c2b6a7 fix allocate state in generateTransition
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 254
diff changeset
65
266
e51cac73e42a CeriumGrep start
masa
parents: 264
diff changeset
66 TStatePtr generateTState(StatePtr state, TransitionGeneratorPtr tg) {
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
67 TStatePtr tState = NEW(TState);
264
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
68 tState->state = state;
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
69 int ccvSize = 0;
251
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 248
diff changeset
70 CharClassWalkerPtr ccw = createCharClassWalker(state->cc);
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
71 while (hasNext(ccw)) {
263
292753bb31e4 fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 262
diff changeset
72 getNext(ccw);
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
73 ccvSize++;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
74 }
263
292753bb31e4 fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 262
diff changeset
75 tState->ccvSize = ccvSize;
292
868f01f1ba8e maximum match
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 288
diff changeset
76 if (state->accept) {
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
77 tState->stateMatch = tg->stateMatch;
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
78 tState->stateSkip = tg->stateSkip;
275
8879eb8c64a8 remove segmentation fault
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 272
diff changeset
79 } else {
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
80 tState->stateMatch = tg->stateNothing;
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
81 tState->stateSkip = tg->stateSkip;
275
8879eb8c64a8 remove segmentation fault
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 272
diff changeset
82 }
277
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
83 if (ccvSize == 0) {
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
84 tState->ccv = NULL;
285
3ea12df96bcf add *tsvp
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 283
diff changeset
85 state->tState = tState;
277
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
86 return tState;
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
87 } else tState->ccv = (ccv*)malloc(sizeof(ccv)*ccvSize);
251
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 248
diff changeset
88 ccw = createCharClassWalker(state->cc);
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
89 int i = 0;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
90 while (hasNext(ccw)) {
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
91 CharClassPtr cc = getNext(ccw);
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
92 unsigned long begin = cc->cond.range.begin;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
93 unsigned long end = cc->cond.range.end;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
94 struct ccv *ccv = &tState->ccv[i++];
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
95 ccv->begin = begin;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
96 ccv->end = end;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
97 ccv->tState = NULL;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
98 ccv->state = cc->nextState;
248
2b1fbfb92d54 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 247
diff changeset
99 ccv->w = cc->cond.w;
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
100 }
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
101 free(ccw);
283
fbdb94df9eac TState atomic update
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 282
diff changeset
102 state->tState = tState;
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
103 return tState;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
104 }
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
105
277
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
106 TStatePtr nextTState(BitVector bi,TransitionGeneratorPtr tg) {
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
107 // create tSearch in next state.
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
108 StatePtr state = tg->stateArray[bi.bitContainer];
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
109 if (state == NULL) {
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
110 // on the fly subset construction.
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
111 state = createState(tg,bi);
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
112 determinize(state,tg);
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
113 tg->stateArray[bi.bitContainer] = state;
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
114 }
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
115 if (state->tState == NULL) {
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
116 generateTState(state,tg);
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
117 }
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
118 return state->tState;
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
119 }
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
120
293
948428caf616 NFA maximum match worked
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 292
diff changeset
121 #define DEBUG 0
948428caf616 NFA maximum match worked
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 292
diff changeset
122
281
b74e3b4b11d7 parallel search done
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 278
diff changeset
123 TSValue tSearch(TSValue tsv) {
293
948428caf616 NFA maximum match worked
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 292
diff changeset
124 #if DEBUG
948428caf616 NFA maximum match worked
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 292
diff changeset
125 TSValuePtr tsvp = &tsv; // make tsv visible in lldb
948428caf616 NFA maximum match worked
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 292
diff changeset
126 #endif
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
127 next: while (tsv.buff.buffptr < tsv.buff.buffend) {
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
128 tsv = tsv.current->stateMatch(tsv);
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
129 if (tsv.current->ccvSize==0) {
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
130 // matched start again
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
131 tsv.current = tsv.tg->stateStart->tState;
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
132 }
247
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 246
diff changeset
133 unsigned char c = *tsv.buff.buffptr++;
282
87a801c14117 fix match condition (parallel search doesn't work)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 281
diff changeset
134 // printState(tsv.current->state);
245
d34de5edaa96 add threadedSearch.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
135 for (int i = 0; i < tsv.current->ccvSize; i++) {
248
2b1fbfb92d54 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 247
diff changeset
136 CCVPtr ccv = &tsv.current->ccv[i];
257
ebb429c2b6a7 fix allocate state in generateTransition
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 254
diff changeset
137 if (c<ccv->begin) {
299
bdfe0a32c48f grepWalk
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 298
diff changeset
138 tsv.current = tsv.tg->stateStart->tState;
264
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
139 tsv = tsv.current->stateSkip(tsv);
257
ebb429c2b6a7 fix allocate state in generateTransition
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 254
diff changeset
140 goto next;
ebb429c2b6a7 fix allocate state in generateTransition
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 254
diff changeset
141 } else if (c<=ccv->end) {
248
2b1fbfb92d54 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 247
diff changeset
142 // range matched.
251
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 248
diff changeset
143 if (ccv->w.word) {
318
c9458ffecb87 word mode in tSearch
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 308
diff changeset
144 WordPtr w;
c9458ffecb87 word mode in tSearch
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 308
diff changeset
145 for (w = &ccv->w;w;w = w->next) {
c9458ffecb87 word mode in tSearch
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 308
diff changeset
146 // match the word.
c9458ffecb87 word mode in tSearch
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 308
diff changeset
147 if (strncmp((const char *)w->word,(const char *)tsv.buff.buffptr-1,w->length)==0) break;
c9458ffecb87 word mode in tSearch
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 308
diff changeset
148 }
c9458ffecb87 word mode in tSearch
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 308
diff changeset
149 if (!w) continue; // if (not match) continue;
c9458ffecb87 word mode in tSearch
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 308
diff changeset
150 tsv.buff.buffptr += w->length - 1;
248
2b1fbfb92d54 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 247
diff changeset
151 }
277
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
152 if (ccv->tState) {
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
153 tsv.current = ccv->tState;
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
154 } else {
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
155 tsv.current = nextTState(ccv->state,tsv.tg);
7b4bcc7b5ae6 nextTState implemented
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 275
diff changeset
156 ccv->tState = tsv.current;
245
d34de5edaa96 add threadedSearch.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
157 }
d34de5edaa96 add threadedSearch.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
158 goto next;
d34de5edaa96 add threadedSearch.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
159 }
d34de5edaa96 add threadedSearch.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
160 }
299
bdfe0a32c48f grepWalk
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 298
diff changeset
161 tsv.current = tsv.tg->stateStart->tState;
264
ef95a7f1bc03 implement tSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 263
diff changeset
162 tsv = tsv.current->stateSkip(tsv);
245
d34de5edaa96 add threadedSearch.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
163 }
293
948428caf616 NFA maximum match worked
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 292
diff changeset
164 #if DEBUG
285
3ea12df96bcf add *tsvp
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 283
diff changeset
165 *tsvp = tsv;
3ea12df96bcf add *tsvp
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 283
diff changeset
166 return *tsvp;
293
948428caf616 NFA maximum match worked
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 292
diff changeset
167 #else
948428caf616 NFA maximum match worked
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 292
diff changeset
168 return tsv;
948428caf616 NFA maximum match worked
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 292
diff changeset
169 #endif
245
d34de5edaa96 add threadedSearch.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
170 }
262
157f6886ba55 write driver of threadedSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 260
diff changeset
171
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
172 TSValue
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
173 createTSValue(TransitionGeneratorPtr tg, Buffer buff) {
262
157f6886ba55 write driver of threadedSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 260
diff changeset
174 TSValue tsv;
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
175 if (!tg) {
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
176 tg = createTransitionGenerator();
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
177 }
262
157f6886ba55 write driver of threadedSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 260
diff changeset
178 tsv.buff = buff;
157f6886ba55 write driver of threadedSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 260
diff changeset
179 tsv.tg = tg;
292
868f01f1ba8e maximum match
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 288
diff changeset
180 tsv.blk = NULL;
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
181 tsv.matchBegin = buff.buffptr;
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
182 tsv.matchEnd = NULL;
266
e51cac73e42a CeriumGrep start
masa
parents: 264
diff changeset
183 tsv.tg->stateSkip = stateSkip;
e51cac73e42a CeriumGrep start
masa
parents: 264
diff changeset
184 tsv.tg->stateMatch = stateMatch;
e51cac73e42a CeriumGrep start
masa
parents: 264
diff changeset
185 tsv.tg->stateNothing = stateNothing;
321
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
186 tsv.current = NULL;
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
187 return tsv;
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
188 }
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
189
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
190
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
191 void threadedSearch(TransitionGeneratorPtr tg, Buffer buff) {
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
192 TSValue tsv = createTSValue(tg,buff);
321
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
193 generateTState(tg->stateList,tg);
288
f2491681914e special state for start search
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 286
diff changeset
194 tg->stateStart = NEW(State);
f2491681914e special state for start search
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 286
diff changeset
195 *tg->stateStart = *tg->stateList;
f2491681914e special state for start search
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 286
diff changeset
196 tg->stateStart->accept = false; // Start state never accept
321
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
197 StatePtr state = tg->stateStart;
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
198 checkBMSearch(state->cc);
a1b65d39b947 bmSearch fix
mir3636
parents: 320
diff changeset
199 tsv.current = generateTState(tg->stateStart,tg);
263
292753bb31e4 fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 262
diff changeset
200 tSearch(tsv);
262
157f6886ba55 write driver of threadedSearch
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 260
diff changeset
201 }
298
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
202
63213964502a refactoring ....
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 293
diff changeset
203 /* end */