Changeset 2153

Timestamp:

May 24, 2012, 5:54:15 PM (7 years ago)

Author:

ksherdy

Message:

Added buffer.hpp to pablo template.

File:

• proto/parabix2/pablo_template.cpp (modified) (8 diffs)

proto/parabix2/pablo_template.cpp

@@ -43 +43 @@
 // Buffer Management
 //////////////////////////////////////////////////////////////////////////////////////////
-#define PADDING_BLOCKS 1
-#define PADDING_SIZE (BLOCK_SIZE * PADDING_BLOCKS )
-#define SEGMENT_BLOCKS 12
-#define SEGMENT_SIZE (BLOCK_SIZE * SEGMENT_BLOCKS)
-#define BUFFER_SIZE PADDING_SIZE + SEGMENT_SIZE
+//#define PADDING_BLOCKS 1
+//#define PADDING_SIZE (BLOCK_SIZE * PADDING_BLOCKS )
+//#define SEGMENT_BLOCKS 12
+//#define SEGMENT_SIZE (BLOCK_SIZE * SEGMENT_BLOCKS)
+//#define BUFFER_SIZE PADDING_SIZE + SEGMENT_SIZE
+#include "../lib/buffer.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -109 +110 @@
 void do_process(FILE *infile, FILE *outfile) {
 
-  @decl
-
-  LineColTracker tracker;
-  TagMatcher<SEGMENT_SIZE,PADDING_SIZE> matcher;
-
-  char * source;
-  int block_base=0;
-  int buffer_base=0;
-  int buffer_pos = 0;
-  int block_pos = 0;
-  int chars_avail = 0;
-  int check_pos = 0;
-  int chars_read = 0;
-
-  //////////////////////////////////////////////////////////////////////////////////////////
-  // Buffer Management
-  //////////////////////////////////////////////////////////////////////////////////////////
-  BitBlock buf[(BUFFER_SIZE)/sizeof(BitBlock)];
-
-  char * srcbuf = ((char *) buf);
-  buffer_base = buffer_pos;
-  source = srcbuf;
-
-  chars_read = fread((void *)srcbuf, 1, SEGMENT_SIZE, infile);
-  chars_avail = chars_read;
-  if (chars_avail > SEGMENT_SIZE) chars_avail = SEGMENT_SIZE;
-
-  if(chars_read<4){
+    @decl
+
+    LineColTracker tracker;
+    TagMatcher<SEGMENT_SIZE,PADDING_SIZE> matcher;
+
+    uint8_t * src_buf;
+    int block_base=0;
+    int buffer_base=0;
+    int buffer_pos = 0;
+    int block_pos = 0;
+    int chars_avail = 0;
+    int check_pos = 0;
+    int chars_read = 0;
+
+    //////////////////////////////////////////////////////////////////////////////////////////
+    // Buffer Management
+    //////////////////////////////////////////////////////////////////////////////////////////
+    //BitBlock buf[(BUFFER_SIZE)/sizeof(BitBlock)];
+    void * temp;
+    ALLOC_STATIC_ALIGNED_BYTE_BUFFER(temp);
+    src_buf = (uint8_t *)temp;
+
+    buffer_base = buffer_pos;
+    chars_read = fread((void *)src_buf, 1, SEGMENT_SIZE, infile);
+    chars_avail = chars_read;
+    if (chars_avail > SEGMENT_SIZE) chars_avail = SEGMENT_SIZE;
+
+    //////////////////////////////////////////////////////////////////////////////////////////
+    // XML Validation / Content Model
+    //////////////////////////////////////////////////////////////////////////////////////////
+    if(chars_read<4){
     fprintf(stderr,"File is too short. Not well formed.\n");
     exit(-1);
-  }
-
-  Entity_Info * e = new Entity_Info;
-  e->AnalyzeSignature((unsigned char *)srcbuf);
-
-  if (e->code_unit_base == ASCII) {
-
-    XML_Decl_Parser<ASCII> decl_parser((unsigned char *)srcbuf);
+    }
+
+    Entity_Info * e = new Entity_Info;
+    e->AnalyzeSignature((unsigned char *)src_buf);
+
+    if (e->code_unit_base == ASCII) {
+
+    XML_Decl_Parser<ASCII> decl_parser((unsigned char *)src_buf);
 
     decl_parser.ReadXMLInfo(*e);
@@ -154 +158 @@
         exit(-1);
     }
-  }
-  else {
+    }
+    else {
         fprintf(stderr,"Sorry, this xmlwf demo does not process EBCDIC.\n");
         exit(-1);
-  }
-
-  if (e->content_start != 0) {
-        memmove(&srcbuf[0], &srcbuf[e->content_start], chars_read - e->content_start);
+    }
+
+    if (e->content_start != 0) {
+    memmove(&src_buf[0], &src_buf[e->content_start], chars_read - e->content_start);
     buffer_pos = e->content_start;
     if (chars_avail == SEGMENT_SIZE) {
-        chars_read = chars_read - e->content_start + fread(&srcbuf[chars_read-e->content_start], 1, e->content_start, infile);
-                chars_avail = chars_read;
+        chars_read = chars_read - e->content_start + fread(&src_buf[chars_read-e->content_start], 1, e->content_start, infile);
+        chars_avail = chars_read;
         if (chars_avail > SEGMENT_SIZE) chars_avail = SEGMENT_SIZE;
-        }
-        else {
-          chars_read -=e->content_start;
-          chars_avail -=e->content_start;
-        }
-  }
-
-  matcher.setSrc(srcbuf);
-
-@stream_stmts
-
-    /* Full Segments */
+    }
+    else {
+      chars_read -=e->content_start;
+      chars_avail -=e->content_start;
+    }
+    }
+
+    @stream_stmts
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////
+    // Full Segments
+    //////////////////////////////////////////////////////////////////////////////////////////
+    matcher.setSrc((char *)src_buf);
     while (chars_avail == SEGMENT_SIZE) {
       PERF_SEC_START(parser_timer);
       for (int blk = 0; blk < SEGMENT_BLOCKS; blk++) {
           block_base = blk*BLOCK_SIZE;
-          s2p_do_block((BytePack *) &srcbuf[block_base], basis_bits);
+          s2p_do_block((BytePack *) &src_buf[block_base], basis_bits);
           @block_stmts
           tracker.StoreNewlines(lex.LF);
-          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, source, buffer_base, block_base, chars_avail, tracker);
+          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, (char *)src_buf, buffer_base, block_base, chars_avail, tracker);
           matcher.store_streams(check_streams.tag_marks, check_streams.name_follows, check_streams.misc_mask, chars_avail);
           tracker.AdvanceBlock();
@@ -195 +201 @@
 
       int bytes_left = chars_read - chars_avail;
-      memmove(srcbuf, &srcbuf[SEGMENT_SIZE], bytes_left);
-      chars_read = fread(&srcbuf[bytes_left], 1, SEGMENT_SIZE - bytes_left, infile) + bytes_left;
+      memmove(src_buf, &src_buf[SEGMENT_SIZE], bytes_left);
+      chars_read = fread(&src_buf[bytes_left], 1, SEGMENT_SIZE - bytes_left, infile) + bytes_left;
       chars_avail = chars_read;
       if (chars_avail > SEGMENT_SIZE) chars_avail = SEGMENT_SIZE;
@@ -203 +209 @@
     }
 
-    /* Final Partial Segment */
+    //////////////////////////////////////////////////////////////////////////////////////////
+    // Final Partial Segment
+    //////////////////////////////////////////////////////////////////////////////////////////
     PERF_SEC_START(parser_timer);
 
@@ -211 +219 @@
     /* Full Blocks */
     while (remaining >= BLOCK_SIZE) {
-          block_base = block_pos;
-          s2p_do_block((BytePack *) &srcbuf[block_pos], basis_bits);
+          block_base = block_pos;
+          s2p_do_block((BytePack *) &src_buf[block_pos], basis_bits);
           @block_stmts
           tracker.StoreNewlines(lex.LF);
-          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, source, buffer_base, block_base, chars_avail, tracker);
+          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, (char *)src_buf, buffer_base, block_base, chars_avail, tracker);
           matcher.store_streams(check_streams.tag_marks, check_streams.name_follows, check_streams.misc_mask, chars_avail);
           tracker.AdvanceBlock();
@@ -226 +234 @@
     if (remaining > 0 || @any_carry) {
           EOF_mask = bitblock::srl(simd<1>::constant<1>(), convert(BLOCK_SIZE-remaining));
-          s2p_do_final_block((BytePack *) &srcbuf[block_pos], basis_bits, EOF_mask);
+          s2p_do_final_block((BytePack *) &src_buf[block_pos], basis_bits, EOF_mask);
           @final_block_stmts
           tracker.StoreNewlines(lex.LF);
-          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, source, buffer_base, block_base, chars_avail, tracker);
+          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, (char *)src_buf, buffer_base, block_base, chars_avail, tracker);
           matcher.store_streams(check_streams.tag_marks, check_streams.name_follows, check_streams.misc_mask, chars_avail);
           tracker.AdvanceBlock();
@@ -240 +248 @@
     matcher.StreamScan(chars_avail);
     matcher.Advance_buffer();
-
 
     PERF_SEC_END(parser_timer, chars_avail);