cmcode condition var handling

slaakko · Dec 17, 2020 · 901c240 · 901c240
1 parent 14d5559
commit 901c240
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 14 deletions.
diff --git a/cmajor/config/cmcode.config.json b/cmajor/config/cmcode.config.json
@@ -19,8 +19,8 @@
     , 
     "mainWindowNormalSize" : 
     {
-        "h" : 884, 
-        "w" : 1854
+        "h" : 728, 
+        "w" : 1790
     }
     , 
     "mainWindowWindowState" : 0, 

diff --git a/cmajor/projects/cm/cmcode/Main.cm b/cmajor/projects/cm/cmcode/Main.cm
@@ -370,13 +370,15 @@ namespace cmcode
             helpMenuItem->AddMenuItem(aboutMenuItem.Release());
             menuBar->AddMenuItem(helpMenuItem.Release());
 
+/*			Uncomment to enable trace menu:	
             UniquePtr<MenuItem> traceMenuItem(new MenuItem("&Trace"));
             UniquePtr<MenuItem> startStopTraceMenuItemPtr(new MenuItem("&Start"));
             startStopTraceMenuItem = startStopTraceMenuItemPtr.Get();
             startStopTraceMenuItemPtr->SetShortcut(Keys.f2);
             startStopTraceMenuItemPtr->ClickEvent().AddHandler(StartStopTraceClick);
             traceMenuItem->AddMenuItem(startStopTraceMenuItemPtr.Release());
             menuBar->AddMenuItem(traceMenuItem.Release());
+*/			
 
             UniquePtr<ToolBar> toolBarPtr(new ToolBar(30, ToolButtonToolTipColor(), Color.DefaultBitmapTransparent(), ToolBar.Style.regular,
                 Padding(4, 4, 4, 4), Padding(2, 0, 2, 0)));

diff --git a/cmajor/projects/cm/cmcode/cmcode.json b/cmajor/projects/cm/cmcode/cmcode.json
@@ -69,7 +69,7 @@
         , 
         {
             "content" : "", 
-            "fileHash" : "48CAEFA33DCBC3FF65BE6EC80701154AAC4AA261", 
+            "fileHash" : "5472A70C4AA46398772987CA21449177A6DE09F1", 
             "fileId" : "Main_140E041ED4991E376FC5CD4B0D379C6EE2DC64B2", 
             "filePath" : "C:\/work\/cmajorm\/cmajor\/projects\/cm\/cmcode\/Main.cm", 
             "info" : ""
@@ -158,7 +158,7 @@
     , 
     "info" : "", 
     "projectFilePath" : "C:\/work\/cmajorm\/cmajor\/projects\/cm\/cmcode\/cmcode.cmp", 
-    "projectHash" : "A4E768CA097EE1DECDCBB15F6BFCE56DA9F32889", 
+    "projectHash" : "BEFD1A725FD0DEB389A8980FC4F86F35790178A7", 
     "projectId" : "project_cmcode_09657C0F80D57B861C169CDD26F697CB0223E3EB", 
     "projectName" : "cmcode", 
     "target" : "winguiapp"

diff --git a/cmajor/projects/cm/cmcode/log/build-reply.json b/cmajor/projects/cm/cmcode/log/build-reply.json
@@ -9,5 +9,5 @@
     "requestErrorMessage" : "", 
     "requestValid" : true, 
     "success" : true, 
-    "time" : "16 seconds"
+    "time" : "1 second"
 }
diff --git a/cmajor/projects/cm/cmcode/log/build-request.json b/cmajor/projects/cm/cmcode/log/build-request.json
@@ -12,7 +12,7 @@
     "disableModuleCache" : false, 
     "emitIR" : false, 
     "emitOptIR" : false, 
-    "filePath" : "C:\/work\/cmajorm\/cmajor\/system\/platform\/windows\/System.cms", 
+    "filePath" : "C:\/work\/cmajorm\/cmajor\/projects\/examples\/Hello\/Hello.cmp", 
     "forceDebugInfo" : false, 
     "forceNoDebugInfo" : false, 
     "justMyCode" : false, 

diff --git a/cmajor/projects/cm/service/BuildService.cm b/cmajor/projects/cm/service/BuildService.cm
@@ -309,7 +309,6 @@ namespace Cm.Service.Build
                 stopKeepAlives = false;
                 while (!stopKeepAlives)
                 {
-                    LockGuard<RecursiveMutex> lock(keepAliveMutex);
                     if (stopKeepAlivesVar.WaitFor(keepAliveMutex, StopKeepAlives, null, Duration.FromSeconds(defaultKeepAliveIntervalSeconds)))
                     {
                         return;

diff --git a/cmajor/projects/cm/service/Cm.Service.json b/cmajor/projects/cm/service/Cm.Service.json
@@ -25,15 +25,15 @@
         , 
         {
             "content" : "", 
-            "fileHash" : "62BD738F9E6DA5B2DAEE45555F0C253B340F56A3", 
+            "fileHash" : "BD4E76ADCEBF67554A22A271EA7DECC11083A001", 
             "fileId" : "BuildService_B5477952EB8D28503492FEE55BD3744BA2B5B9A6", 
             "filePath" : "C:\/work\/cmajorm\/cmajor\/projects\/cm\/service\/BuildService.cm", 
             "info" : ""
         }
         , 
         {
             "content" : "", 
-            "fileHash" : "5B815775153C8B36BED1312983D0232036CCFA12", 
+            "fileHash" : "6A5A94DCDD371136054DBDBA08FD858ABF8F5793", 
             "fileId" : "CmdbSession_8C309AA10B76AD974CFB053D9A384F996B3F6BEC", 
             "filePath" : "C:\/work\/cmajorm\/cmajor\/projects\/cm\/service\/CmdbSession.cm", 
             "info" : ""
@@ -82,7 +82,7 @@
     , 
     "info" : "", 
     "projectFilePath" : "C:\/work\/cmajorm\/cmajor\/projects\/cm\/service\/Cm.Service.cmp", 
-    "projectHash" : "523ACDA527FB09743B8EB05778AA32918BE7EDE7", 
+    "projectHash" : "C3A511E74808E8433D710B14D4990C942E19359D", 
     "projectId" : "project_Cm.Service_D219517545C924A7168FB331FCA4605ACCBEA75E", 
     "projectName" : "Cm.Service", 
     "target" : "library"

diff --git a/cmajor/projects/cm/service/CmdbSession.cm b/cmajor/projects/cm/service/CmdbSession.cm
@@ -100,7 +100,6 @@ namespace Cm.Service.Run
         }
         public CmdbSessionRequest* GetRequest()
         {
-            LockGuard<RecursiveMutex> lock(mtx);
             if (requestVar.WaitFor(mtx, RequestWaiting, null, Duration.FromMilliseconds(250)))
             {
                 requestWaiting = false;
@@ -295,7 +294,6 @@ namespace Cm.Service.Run
             request.Reset(new CmdbInputRequest(this));
             requestVar.NotifyOne();
             {
-                LockGuard<RecursiveMutex> lock(mtx);
                 replyVar.Wait(mtx, ReplyReady, null);
                 if (!reply.IsNull() && (reply.Get() is CmdbInputReply*))
                 {
@@ -339,7 +337,6 @@ namespace Cm.Service.Run
                         request.Reset(new CmdbOutputRequest(this, handle, output));
                         requestVar.NotifyOne();
                         {
-                            LockGuard<RecursiveMutex> lock(mtx);
                             replyVar.Wait(mtx, ReplyReady, null);
                         }
                         requestWaiting = false;

diff --git a/cmajor/system/System.Runtime/System.Runtime.cmproj b/cmajor/system/System.Runtime/System.Runtime.cmproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
   <CustomProjectExtensionsPath>$(LocalAppData)\CustomProjectSystems\Cmajor\</CustomProjectExtensionsPath>
-  <ProjectGuid>b8f07c18-c35c-4e5f-8bdc-11eb0ce4efc0</ProjectGuid>
+  <ProjectGuid>21efb5f7-6acf-402d-92e5-9f4593e38b15</ProjectGuid>
  </PropertyGroup>
  <PropertyGroup>
   <TargetType>library</TargetType>
@@ -13,6 +13,7 @@
   <CmCompile Include="Os.cm"/>
   <CmCompile Include="Runtime.cm"/>
   <CmCompile Include="StaticInitCriticalSection.cm"/>
+  <CmCompile Include="Tracer.cm"/>
   <CmCompile Include="Unwind.cm"/>
   <CmCompile Include="Win.cm"/>
  </ItemGroup>

diff --git a/setup/setup.ise b/setup/setup.ise