Changeset 1055 for proto/parabix2


Ignore:
Timestamp:
Mar 29, 2011, 11:47:37 AM (8 years ago)
Author:
lindanl
Message:

multithreads

Location:
proto/parabix2
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/Makefile

    r1051 r1055  
    2121
    2222threads:        $(PABLO_SRCFILE)
    23         python $(PABLO_COMPILER) $(PABLO_SRCFILE) -t pablo_template_multithreads.cpp -o $(OUTFILE)
     23        python $(PABLO_COMPILER) parabix2_pablo2.py -t pablo_template_multithreads.cpp -o $(OUTFILE)
    2424
    2525pablo_help:
  • proto/parabix2/pablo_template_multithreads.cpp

    r1051 r1055  
    2424#include "../lib/s2p.h"
    2525
    26 #include "TagMatcher.h"
     26#include "TagMatcher_multithreads.h"
    2727#include "LineColTracker.h"
    2828BitBlock EOF_mask = simd_const_1(1);
     
    291291};
    292292
    293 Parse_refs parse_refs;
    294 Parse_tags parse_tags;
    295 Classify_bytes_Validate_utf8 classify_bytes_Validate_utf8;
    296 Parse_CtCDPI parse_CtCDPI;
    297 Do_check_streams do_check_streams;
    298 Validate_xml_names validate_xml_names;
    299 Add_scope_streams add_scope_streams;
     293  Validate_utf8 validate_utf8;
     294  Parse_refs parse_refs;
     295  Parse_tags parse_tags;
     296  Parse_CtCDPI parse_CtCDPI;
     297  Do_check_streams do_check_streams;
     298  Classify_bytes classify_bytes;
     299  Add_scope_streams add_scope_streams;
     300  Validate_xml_names validate_xml_names;
     301
    300302
    301303int file_segs=0;
     
    371373      overlap_bytes = OVERLAP_BUFSIZE;
    372374      s2p_do_segment((BytePack *) srcptr, n->para_data.basis_bits);
    373       classify_bytes_Validate_utf8.do_segment(n->para_data.basis_bits, n->para_data.lex, n->para_data.u8);
     375      classify_bytes.do_segment(n->para_data.basis_bits, n->para_data.lex);
     376
    374377
    375378      store_release(&head1_->next_, n);
     
    382385              //do pass2
    383386
     387                  validate_utf8.do_segment(head2_->next_->para_data.basis_bits, head2_->next_->para_data.u8);
    384388                  add_scope_streams.do_segment(head2_->next_->para_data.lex, head2_->next_->para_data.scope1);
    385389                  parse_CtCDPI.do_segment(head2_->next_->para_data.ctCDPI_Callouts, head2_->next_->para_data.lex, head2_->next_->para_data.scope1, head2_->next_->para_data.check_streams);
Note: See TracChangeset for help on using the changeset viewer.