Changeset 1134 for XIOS/dev/branch_yushan_merged/src/parse_expr/yacc_parser.yacc

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/parse_expr/yacc_parser.yacc (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/src/parse_expr/yacc_parser.yacc

@@ -15 +15 @@
 }
 
-  IFilterExprNode* parsed;
-  std::string globalInputText;
-  size_t globalReadOffset = 0;
-
+  static IFilterExprNode* parsed;
+  static std::string globalInputText;
+  static std::string *globalInputText_ptr = 0;
+  static size_t globalReadOffset = 0;
+  #pragma omp threadprivate(parsed, globalInputText_ptr, globalReadOffset)
+  
   int readInputForLexer(char* buffer, size_t* numBytesRead, size_t maxBytesToRead)
   {
+    if(globalInputText_ptr == 0) globalInputText_ptr = new std::string;
     size_t numBytesToRead = maxBytesToRead;
-    size_t bytesRemaining = globalInputText.length()-globalReadOffset;
+    size_t bytesRemaining = (*globalInputText_ptr).length()-globalReadOffset;
     size_t i;
     if (numBytesToRead > bytesRemaining) numBytesToRead = bytesRemaining;
-    for (i = 0; i < numBytesToRead; i++) buffer[i] = globalInputText.c_str()[globalReadOffset + i];
+    for (i = 0; i < numBytesToRead; i++) buffer[i] = (*globalInputText_ptr).c_str()[globalReadOffset + i];
     *numBytesRead = numBytesToRead;
     globalReadOffset += numBytesToRead;
@@ -145 +148 @@
   IFilterExprNode* parseExpr(const string& strExpr)
   {
-    globalInputText = strExpr;
-    globalReadOffset = 0;
-    yyparse();
+    #pragma omp critical (_parser)
+    {
+      if(globalInputText_ptr == 0) globalInputText_ptr = new std::string;
+      (*globalInputText_ptr).assign (strExpr);
+      globalReadOffset = 0;
+      yyparse();
+    }
     return parsed;
   }