Start the library vendor executable separately

For each `loadEncryptedPackage` call create only one instance of library vendor executable.

Belonging to [master]:
  - #2505

Author: adeas31

Compiler/FFrontEnd/FBuiltin.mo

@@ -381,8 +381,8 @@ algorithm
         true = intEq(Flags.getConfigEnum(Flags.GRAMMAR), Flags.METAMODELICA);
         Error.assertionOrAddSourceMessage(System.regularFileExists(fileModelica),Error.FILE_NOT_FOUND_ERROR,{fileModelica},Absyn.dummyInfo);
         Error.assertionOrAddSourceMessage(System.regularFileExists(fileMetaModelica),Error.FILE_NOT_FOUND_ERROR,{fileMetaModelica},Absyn.dummyInfo);
-        Absyn.PROGRAM(classes=classes1,within_=Absyn.TOP()) = Parser.parsebuiltin(fileModelica,"UTF-8",acceptedGram=Flags.METAMODELICA);
-        Absyn.PROGRAM(classes=classes2,within_=Absyn.TOP()) = Parser.parsebuiltin(fileMetaModelica,"UTF-8",acceptedGram=Flags.METAMODELICA);
+        Absyn.PROGRAM(classes=classes1,within_=Absyn.TOP()) = Parser.parsebuiltin(fileModelica,"UTF-8",NONE(),acceptedGram=Flags.METAMODELICA);
+        Absyn.PROGRAM(classes=classes2,within_=Absyn.TOP()) = Parser.parsebuiltin(fileMetaModelica,"UTF-8",NONE(),acceptedGram=Flags.METAMODELICA);
         classes = listAppend(classes1,classes2);
         p = Absyn.PROGRAM(classes,Absyn.TOP());
         (p as Absyn.PROGRAM(classes=classes)) = MetaUtil.createMetaClassesInProgram(p);
@@ -395,8 +395,8 @@ algorithm
         true = intEq(Flags.getConfigEnum(Flags.GRAMMAR), Flags.PARMODELICA);
         Error.assertionOrAddSourceMessage(System.regularFileExists(fileModelica),Error.FILE_NOT_FOUND_ERROR,{fileModelica},Absyn.dummyInfo);
         Error.assertionOrAddSourceMessage(System.regularFileExists(fileParModelica),Error.FILE_NOT_FOUND_ERROR,{fileParModelica},Absyn.dummyInfo);
-        Absyn.PROGRAM(classes=classes1,within_=Absyn.TOP()) = Parser.parsebuiltin(fileModelica,"UTF-8",acceptedGram=Flags.METAMODELICA);
-        Absyn.PROGRAM(classes=classes2,within_=Absyn.TOP()) = Parser.parsebuiltin(fileParModelica,"UTF-8",acceptedGram=Flags.METAMODELICA);
+        Absyn.PROGRAM(classes=classes1,within_=Absyn.TOP()) = Parser.parsebuiltin(fileModelica,"UTF-8",NONE(),acceptedGram=Flags.METAMODELICA);
+        Absyn.PROGRAM(classes=classes2,within_=Absyn.TOP()) = Parser.parsebuiltin(fileParModelica,"UTF-8",NONE(),acceptedGram=Flags.METAMODELICA);
         classes = listAppend(classes1,classes2);
         p = Absyn.PROGRAM(classes,Absyn.TOP());
         sp = List.map(classes, SCodeUtil.translateClass);
@@ -407,7 +407,7 @@ algorithm
       equation
         true = intEq(Flags.getConfigEnum(Flags.GRAMMAR), Flags.MODELICA) or intEq(Flags.getConfigEnum(Flags.GRAMMAR), Flags.OPTIMICA);
         Error.assertionOrAddSourceMessage(System.regularFileExists(fileModelica),Error.FILE_NOT_FOUND_ERROR,{fileModelica},Absyn.dummyInfo);
-        (p as Absyn.PROGRAM(classes=classes)) = Parser.parsebuiltin(fileModelica,"UTF-8",acceptedGram=Flags.METAMODELICA);
+        (p as Absyn.PROGRAM(classes=classes)) = Parser.parsebuiltin(fileModelica,"UTF-8",NONE(),acceptedGram=Flags.METAMODELICA);
         sp = List.map(classes, SCodeUtil.translateClass);
         assocLst = getGlobalRoot(Global.builtinIndex);
         setGlobalRoot(Global.builtinIndex, (Flags.MODELICA,(p,sp))::assocLst);
@@ -417,8 +417,8 @@ algorithm
         true = intEq(Flags.getConfigEnum(Flags.GRAMMAR), Flags.PDEMODELICA);
         Error.assertionOrAddSourceMessage(System.regularFileExists(fileModelica),Error.FILE_NOT_FOUND_ERROR,{fileModelica},Absyn.dummyInfo);
         Error.assertionOrAddSourceMessage(System.regularFileExists(filePDEModelica),Error.FILE_NOT_FOUND_ERROR,{filePDEModelica},Absyn.dummyInfo);
-        Absyn.PROGRAM(classes=classes1,within_=Absyn.TOP()) = Parser.parsebuiltin(fileModelica,"UTF-8",acceptedGram=Flags.METAMODELICA);
-        Absyn.PROGRAM(classes=classes2,within_=Absyn.TOP()) = Parser.parsebuiltin(filePDEModelica,"UTF-8",acceptedGram=Flags.METAMODELICA);
+        Absyn.PROGRAM(classes=classes1,within_=Absyn.TOP()) = Parser.parsebuiltin(fileModelica,"UTF-8",NONE(),acceptedGram=Flags.METAMODELICA);
+        Absyn.PROGRAM(classes=classes2,within_=Absyn.TOP()) = Parser.parsebuiltin(filePDEModelica,"UTF-8",NONE(),acceptedGram=Flags.METAMODELICA);
         classes = listAppend(classes1,classes2);
         p = Absyn.PROGRAM(classes,Absyn.TOP());
         sp = List.map(classes, SCodeUtil.translateClass);

Compiler/FrontEnd/ClassLoader.mo

@@ -711,7 +711,7 @@ algorithm
           fail();
         end if; */
       then BaseHashTable.get(filename, strategy.ht);
-    case STRATEGY_ON_DEMAND() then Parser.parse(filename, strategy.encoding);
+    case STRATEGY_ON_DEMAND() then Parser.parse(filename, strategy.encoding,NONE());
   end match;
 end getProgramFromStrategy;
 

Compiler/FrontEnd/Parser.mo

@@ -57,9 +57,10 @@ public
 function parse "Parse a mo-file"
   input String filename;
   input String encoding;
+  input Option<Integer> serverContext;
   output Absyn.Program outProgram;
 algorithm
-  outProgram := parsebuiltin(filename,encoding);
+  outProgram := parsebuiltin(filename,encoding,serverContext);
   /* Check that the program is not totally off the charts */
   _ := SCodeUtil.translateAbsyn2SCode(outProgram);
 end parse;
@@ -84,6 +85,7 @@ end parsestring;
 function parsebuiltin "Like parse, but skips the SCode check to avoid infinite loops for ModelicaBuiltin.mo."
   input String filename;
   input String encoding;
+  input Option<Integer> serverContext;
   input Integer acceptedGram=Config.acceptedGrammar();
   input Integer languageStandardInt=Flags.getConfigEnum(Flags.LANGUAGE_STANDARD);
   output Absyn.Program outProgram;
@@ -92,7 +94,7 @@ protected
   String realpath;
 algorithm
   realpath := Util.replaceWindowsBackSlashWithPathDelimiter(System.realpath(filename));
-  outProgram := ParserExt.parse(realpath, Util.testsuiteFriendly(realpath), acceptedGram, encoding, languageStandardInt, Config.getRunningTestsuite());
+  outProgram := ParserExt.parse(realpath, Util.testsuiteFriendly(realpath), acceptedGram, encoding, languageStandardInt, Config.getRunningTestsuite(), serverContext);
 end parsebuiltin;
 
 function parsestringexp "Parse a string as if it was a sequence of statements"
@@ -171,8 +173,16 @@ function parallelParseFilesWork
   input Boolean encrypted = false;
   output list<ParserResult> partialResults;
 protected
-  list<tuple<String,String>> workList = list((file,encoding) for file in filenames);
+  list<tuple<String,String,Option<Integer>>> workList;
+  Boolean success;
+  Option<Integer> decryptionServer;
 algorithm
+  if encrypted then
+    (success, decryptionServer) := ParserExt.startDecryptionServer();
+    workList := list((file,encoding,decryptionServer) for file in filenames);
+  else
+    workList := list((file,encoding,NONE()) for file in filenames);
+  end if;
   if Config.getRunningTestsuite() or Config.noProc()==1 or numThreads == 1 or listLength(filenames)<2 or encrypted then
     partialResults := list(loadFileThread(t) for t in workList);
   else
@@ -183,14 +193,15 @@ algorithm
 end parallelParseFilesWork;
 
 function loadFileThread
-  input tuple<String,String> inFileEncoding;
+  input tuple<String,String,Option<Integer>> inFileEncoding;
   output ParserResult result;
 algorithm
   result := matchcontinue inFileEncoding
     local
       String filename,encoding;
-    case (filename,encoding) then PARSERRESULT(filename,SOME(Parser.parse(filename, encoding)));
-    case (filename,_) then PARSERRESULT(filename,NONE());
+      Option<Integer> decryptionServer;
+    case (filename,encoding,decryptionServer) then PARSERRESULT(filename,SOME(Parser.parse(filename, encoding, decryptionServer)));
+    case (filename,_,_) then PARSERRESULT(filename,NONE());
   end matchcontinue;
   if ErrorExt.getNumMessages() > 0 then
     ErrorExt.moveMessagesToParentThread();

Compiler/FrontEnd/ParserExt.mo

@@ -49,9 +49,10 @@ public function parse "Parse a mo-file"
   input String encoding;
   input Integer languageStandardInt;
   input Boolean runningTestsuite;
+  input Option<Integer> serverContext;
   output Absyn.Program outProgram;
 
-  external "C" outProgram=ParserExt_parse(filename, infoFilename, acceptedGram, languageStandardInt, encoding, runningTestsuite) annotation(Library = {"omparse","omantlr3","omcruntime"});
+  external "C" outProgram=ParserExt_parse(filename, infoFilename, acceptedGram, languageStandardInt, encoding, runningTestsuite, serverContext) annotation(Library = {"omparse","omantlr3","omcruntime"});
 end parse;
 
 public function parseexp "Parse a mos-file"
@@ -105,5 +106,12 @@ public function stringCref
   external "C" cref=ParserExt_stringCref(str, infoFilename, acceptedGram, languageStandardInt, runningTestsuite) annotation(Library = {"omparse","omantlr3","omcruntime"});
 end stringCref;
 
+public function startDecryptionServer "Starts the decryption server executable"
+  output Boolean success;
+  output Option<Integer> outDecryptionServer "Stores a pointer. If it is declared as Integer, it is truncated to 32-bit.";
+
+  external "C" success=ParserExt_startDecryptionServer(outDecryptionServer) annotation(Library = {"omparse","omantlr3","omcruntime"});
+end startDecryptionServer;
+
 annotation(__OpenModelica_Interface="frontend");
 end ParserExt;

Compiler/Main/Main.mo

@@ -349,7 +349,7 @@ algorithm
     // A .mo-file.
     case true
       equation
-        pnew = Parser.parse(inLib, "UTF-8");
+        pnew = Parser.parse(inLib, "UTF-8", NONE());
         p = SymbolTable.getAbsyn();
         pnew = Interactive.mergeProgram(pnew, p);
         SymbolTable.setAbsyn(pnew);

Compiler/Script/CevalScript.mo

@@ -319,7 +319,7 @@ algorithm
     (outProgram,true) := loadModel((Absyn.IDENT(cname),{prio},true)::{}, mp, p, true, true, checkUses, true, filename == "package.moc");
     return;
   end if;
-  outProgram := Parser.parse(name,encoding);
+  outProgram := Parser.parse(name,encoding,NONE());
   ClassLoader.checkOnLoadMessage(outProgram);
   outProgram := checkUsesAndUpdateProgram(outProgram, p, checkUses, Settings.getModelicaPath(Config.getRunningTestsuite()));
 end loadFile;
@@ -3011,7 +3011,7 @@ protected function reloadClass
 protected
   Absyn.Program p,newp;
 algorithm
-  newp := Parser.parse(filename,encoding); /* Don't use the classloader since that can pull in entire directory structures. We only want to reload one single file. */
+  newp := Parser.parse(filename,encoding,NONE()); /* Don't use the classloader since that can pull in entire directory structures. We only want to reload one single file. */
   newp := Interactive.updateProgram(newp, SymbolTable.getAbsyn());
   SymbolTable.setAbsyn(newp);
 end reloadClass;

Compiler/Script/Interactive.mo

@@ -17247,7 +17247,7 @@ algorithm
     topClassNamesQualified := {};
     return;
   end if;
-  parsed := Parser.parse(fileName,encoding);
+  parsed := Parser.parse(fileName,encoding,NONE());
   parsed := MetaUtil.createMetaClassesInProgram(parsed);
   topClassNamesQualified := getTopQualifiedClassnames(parsed);
   if updateProgram then

Parser/Parser_omc.c

@@ -36,15 +36,15 @@
 #include "meta_modelica.h"
 #include "parse.c"
 
-void* ParserExt_parse(const char* filename, const char* infoname, int acceptedGrammar, int langStd, const char* encoding, int runningTestsuite)
+void* ParserExt_parse(const char* filename, const char* infoname, int acceptedGrammar, int langStd, const char* encoding, int runningTestsuite, void* serverContext)
 {
   int flags = PARSE_MODELICA;
   if(acceptedGrammar == 2) flags |= PARSE_META_MODELICA;
   else if(acceptedGrammar == 3) flags |= PARSE_PARMODELICA;
   else if(acceptedGrammar == 4) flags |= PARSE_OPTIMICA;
   else if(acceptedGrammar == 5) flags |= PARSE_PDEMODELICA;
 
-  void *res = parseFile(filename, infoname, flags, encoding, langStd, runningTestsuite);
+  void *res = parseFile(filename, infoname, flags, encoding, langStd, runningTestsuite, serverContext);
   if (res == NULL)
     MMC_THROW();
   // printAny(res);
@@ -59,7 +59,7 @@ void* ParserExt_parseexp(const char* filename, const char* infoname, int accepte
   else if(acceptedGrammar == 4) flags |= PARSE_OPTIMICA;
   else if(acceptedGrammar == 5) flags |= PARSE_PDEMODELICA;
 
-  void *res = parseFile(filename, infoname, flags, "UTF-8", langStd, runningTestsuite);
+  void *res = parseFile(filename, infoname, flags, "UTF-8", langStd, runningTestsuite, 0);
   if (res == NULL)
     MMC_THROW();
   return res;
@@ -128,3 +128,8 @@ void* ParserExt_stringCref(const char* data, const char* filename, int acceptedG
     MMC_THROW();
   }
 }
+
+int ParserExt_startDecryptionServer(void** decryptionServer)
+{
+  return startDecryptionServer(decryptionServer);
+}

Parser/parse.c

@@ -396,7 +396,7 @@ static void* parseString(const char* data, const char* interactiveFilename, int
 #include "../../OMEncryption/Parser/parseEncryption.c"
 #endif
 
-static void* parseFile(const char* fileName, const char* infoName, int flags, const char *encoding, int langStd, int runningTestsuite)
+static void* parseFile(const char* fileName, const char* infoName, int flags, const char *encoding, int langStd, int runningTestsuite, void *decryptionServer)
 {
   bool debug         = false; //check_debug_flag("parsedebug");
 
@@ -422,7 +422,7 @@ static void* parseFile(const char* fileName, const char* infoName, int flags, co
 
 #ifdef OMENCRYPTION
   if (len > 3 && 0==strcmp(fileName+len-4,".moc")) {
-    return parseEncryptedFile(fileName, members.filename_C, langStd, runningTestsuite);
+    return parseEncryptedFile(fileName, members.filename_C, langStd, runningTestsuite, decryptionServer);
   }
 #else
   if (len > 3 && 0==strcmp(fileName+len-4,".moc")) {
@@ -453,3 +453,13 @@ static void* parseFile(const char* fileName, const char* infoName, int flags, co
   }
   return parseStream(input, langStd, runningTestsuite);
 }
+
+int startDecryptionServer(void** decryptionServer)
+{
+  *decryptionServer = mmc_mk_some(0);
+#ifdef OMENCRYPTION
+  return startDecryptionServerImpl(decryptionServer);
+#else
+  return 0;
+#endif
+}