Changeset 1328 for XIOS/dev/branch_openmp/src/parse_expr/yacc_parser.yacc

Timestamp:

11/15/17 12:14:34 (7 years ago)

Author:

yushan

Message:

dev_omp

File:

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

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

@@ -15 +15 @@
 }
 
-  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)
-  
+  IFilterExprNode* parsed;
+  std::string globalInputText;
+  size_t globalReadOffset = 0;
+
   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_ptr).length()-globalReadOffset;
+    size_t bytesRemaining = globalInputText.length()-globalReadOffset;
     size_t i;
     if (numBytesToRead > bytesRemaining) numBytesToRead = bytesRemaining;
-    for (i = 0; i < numBytesToRead; i++) buffer[i] = (*globalInputText_ptr).c_str()[globalReadOffset + i];
+    for (i = 0; i < numBytesToRead; i++) buffer[i] = globalInputText.c_str()[globalReadOffset + i];
     *numBytesRead = numBytesToRead;
     globalReadOffset += numBytesToRead;
@@ -148 +145 @@
   IFilterExprNode* parseExpr(const string& strExpr)
   {
-    #pragma omp critical (_parser)
-    {
-      if(globalInputText_ptr == 0) globalInputText_ptr = new std::string;
-      (*globalInputText_ptr).assign (strExpr);
-      globalReadOffset = 0;
-      yyparse();
-    }
+    globalInputText = strExpr;
+    globalReadOffset = 0;
+    yyparse();
     return parsed;
   }