WIP testing a lot of changes in order to get full support to SSW software suite for solar satellites.

src/GDLInterpreter.cpp

@@ -81,38 +81,22 @@ GDLInterpreter::GDLInterpreter()
 
 	try {      // for error handling
 
-		//optimize speed: differentiate inner loops to avoid one externally implicit comparison on controlc for each loop (if possible)
-		if (interruptEnable) { //will test for sigControlC
-		{
-			do {
-			  last = _retTree;
-			  callStack.back()->SetLineNumber(last->getLine()); // track actual line number
-			  retCode = last->Run(); // Run() sets _retTree
-			} while (_retTree != NULL && retCode == RC_OK && !(sigControlC) && (debugMode <= DEBUG_RETURN)); //loops if debug_clear or debug_return
-			if (_retTree != NULL) last = _retTree; //this is OK see https://github.com/gnudatalanguage/gdl/issues/1403#issuecomment-1326490113
-			goto afterStatement;
-		}
-		} else { //will not test for sigControlC 
-		{
-			do {
-			  last = _retTree;
-			  callStack.back()->SetLineNumber(last->getLine()); // track actual line number
-			  retCode = last->Run(); // Run() sets _retTree
-			} while (_retTree != NULL && retCode == RC_OK && (debugMode <= DEBUG_RETURN)); //loops if debug_clear or debug_return
-			if (_retTree != NULL) last = _retTree; //this is OK see https://github.com/gnudatalanguage/gdl/issues/1403#issuecomment-1326490113
+			//optimize speed: differentiate inner loops to avoid one externally implicit comparison on controlc for each loop (if possible)
+			if (interruptEnable) { //will test for sigControlC
+				do {
+					last = _retTree;
+					callStack.back()->SetLineNumber(last->getLine()); // track actual line number
+					retCode = last->Run(); // Run() sets _retTree
+				} while (_retTree != NULL && retCode == RC_OK && !(sigControlC) && (debugMode <= DEBUG_RETURN)); //loops if debug_clear or debug_return
+			} else { //will not test for sigControlC 
+				do {
+					last = _retTree;
+					callStack.back()->SetLineNumber(last->getLine()); // track actual line number
+					retCode = last->Run(); // Run() sets _retTree
+				} while (_retTree != NULL && retCode == RC_OK && (debugMode <= DEBUG_RETURN)); //loops if debug_clear or debug_return
+			}
+			if (_retTree != NULL && debugMode != DEBUG_RETURN ) last = _retTree;
 			goto afterStatement;
-		}
-		}
-		// original single loop with all checks    
-		//    {
-		//      do {
-		//	last = _retTree;
-		//	callStack.back()->SetLineNumber(last->getLine()); // track actual line number
-		//	retCode = last->Run(); // Run() sets _retTree
-		//      } while (_retTree != NULL && retCode == RC_OK && !(sigControlC && interruptEnable) && (debugMode <= DEBUG_RETURN)); //loops if debug_clear or debug_return
-		//      if (_retTree != NULL) last = _retTree; //this is OK see https://github.com/gnudatalanguage/gdl/issues/1403#issuecomment-1326490113
-		//      goto afterStatement;
-		//    }
 
 		// The following code (up to afterStatement is never executed - here only because ANTLR code needs it, although it should not (not optimized parser) 
 
@@ -358,72 +342,73 @@ GDLInterpreter::GDLInterpreter()
 		}
 		}
 
-		afterStatement:
-		// tested a possible optimization:  make CtrlCHandler produce a DEBUG_STOP, and do not test sigControlC here at all.
-		// Apparently does not perform noticeably better and has adverse effects. Forget it.
-		if (interruptEnable && sigControlC) {
-		DebugMsg(last, "Interrupted at: ");
-		sigControlC = false;
-		retCode = NewInterpreterInstance(last->getLine()); //-1);
-			} else if (interruptEnable && _retTree == NULL && (debugMode == DEBUG_RETURN || debugMode == DEBUG_OUT)) {
-		if (debugMode == DEBUG_RETURN) {
-			if (callStack.back()->GetProName() == MyProName) {
-			  DebugMsg(last, "Return encountered: ");
-			  debugMode = DEBUG_CLEAR;
-			  return NewInterpreterInstance(last->getLine()); //-1);
-			}
-		} else { //DEBUG_OUT --> just do an additional .step if we are at MyProName
-			 if (callStack.back()->GetProName() == MyProName) {
-			  debugMode = DEBUG_STEP;
-			  stepCount=1;
-			  return retCode; //continue 
-			}
-		} 
-		} else if (debugMode != DEBUG_CLEAR) {
-		if (debugMode == DEBUG_STOP) {
-			DebugMsg(last, "Stop encountered: ");
-			if (!interruptEnable) debugMode = DEBUG_PROCESS_STOP;
-		} else if (debugMode == DEBUG_STOP_SILENT) {
-			if (!interruptEnable) debugMode = DEBUG_PROCESS_STOP;
-		}
-
-		if (debugMode == DEBUG_STEP) {
-			if (stepCount == 1) {
-			  stepCount = 0;
-			  DebugMsg(last, "Stepped to: ");
-
-			  debugMode = DEBUG_CLEAR;
-
-			  retCode = NewInterpreterInstance(last->getLine()); //-1);
-			} else {
-			  --stepCount;
+				afterStatement:
+				// tested a possible optimization:  make CtrlCHandler produce a DEBUG_STOP, and do not test sigControlC here at all.
+				// Apparently does not perform noticeably better and has adverse effects. Forget it.
+				if (interruptEnable && sigControlC) {
+					DebugMsg(last, "Interrupted at: ");
+					sigControlC = false;
+					retCode = NewInterpreterInstance(last->getLine()); //-1);
+				} else if (interruptEnable && _retTree == NULL && (debugMode == DEBUG_RETURN || debugMode == DEBUG_OUT)) {
+					if (debugMode == DEBUG_RETURN) {
+						if (callStack.back()->GetProName() == MyProName) {
+							DebugMsg(last, "Return encountered: ");
+							debugMode = DEBUG_STOP_SILENT;
+							return retCode;	
+						}
+					} else { //DEBUG_OUT --> just do an additional .step if we are at MyProName
+						if (callStack.back()->GetProName() == MyProName) {
+							debugMode = DEBUG_STEP;
+							stepCount=1;
+							return retCode; //continue 
+						}
+					} 
+				} else if (debugMode != DEBUG_CLEAR) {
+					if (debugMode == DEBUG_STOP) {
+					DebugMsg(last, "Stop encountered: ");
+					if (!interruptEnable) debugMode = DEBUG_PROCESS_STOP;
+				} else if (debugMode == DEBUG_STOP_SILENT) {
+					if (!interruptEnable) debugMode = DEBUG_PROCESS_STOP;
+				}
+				if (debugMode == DEBUG_STEP) {
+					if (stepCount == 1) {
+						stepCount = 0;
+						DebugMsg(last, "Stepped to: ");
+						debugMode = DEBUG_CLEAR;
+						retCode = NewInterpreterInstance(last->getLine()); //-1);
+					} else {
+						--stepCount;
 		#ifdef GDL_DEBUG
-			  std::cout << "stepCount-- = " << stepCount << std::endl;
+						std::cout << "stepCount-- = " << stepCount << std::endl;
 		#endif
-			}
-		} else if (debugMode == DEBUG_STEPOVER) {
-			if (callStack.back()->GetProName() == MyProName) { //we count only in current level
-			  if (stepCount == 1) {
-			    stepCount = 0;
-			    DebugMsg(last, "Stepped to: ");
-
-			    debugMode = DEBUG_CLEAR;
-			    MyProName="";
-			    retCode = NewInterpreterInstance(last->getLine()); //-1);
-			  } else {
-			    --stepCount;
+					}
+				} else if (debugMode == DEBUG_STEPOVER) {
+					if (callStack.back()->GetProName() == MyProName) { //we count only in current level
+						if (stepCount == 1) {
+							stepCount = 0;
+							DebugMsg(last, "Stepped to: ");
+							debugMode = DEBUG_CLEAR;
+							MyProName="";
+							retCode = NewInterpreterInstance(last->getLine()); //-1);
+						} else {
+							--stepCount;
 		#ifdef GDL_DEBUG
-			    std::cout << "stepCount-- = " << stepCount << std::endl;
+							std::cout << "stepCount-- = " << stepCount << std::endl;
 		#endif
-			  }
-			}
-		} else if (interruptEnable) {
-			if (debugMode == DEBUG_PROCESS_STOP) DebugMsg(last, "Stepped to: ");
-			debugMode = DEBUG_CLEAR;
-			retCode = NewInterpreterInstance(last->getLine()); //-1);
-		} else {
-			retCode = RC_ABORT;
-		}
+						}
+					}
+				} else if (interruptEnable) {
+					if (debugMode == DEBUG_PROCESS_STOP) DebugMsg(last, "Stepped to: ");
+					debugMode = DEBUG_CLEAR;
+					retCode = NewInterpreterInstance(last->getLine()); //-1);
+				} else {
+					if (debugMode == DEBUG_PROCESS_STOP) {
+						debugMode = DEBUG_CLEAR;
+						retCode = NewInterpreterInstance(last->getLine());
+					} else {
+						retCode = RC_ABORT;
+					}
+				}
 		}
 		return retCode;
 

src/basic_pro_jmg.cpp

@@ -21,7 +21,7 @@
 #include <string>
 #include <fstream>
 #include <limits>
-#include "gdleventhandler.hpp"
+#include "gdleventhandler.hpp" //for gdlwait_responsive
 #include "dinterpreter.hpp"
 #include "basic_pro_jmg.hpp"
 
@@ -483,6 +483,76 @@ namespace lib {
     DllContainer::clear();
   }
 
+  //idem WAIT_PRO, but needed in idlneturl as we wait while some widgets events must happen.
+  //should NEVER be used elsewhere (the idlneturl.pro procedure should disappear in favor of a pure C/C++ use of the CURL library)
+  //The real WAIT blocks absolutely anything --- as it should.
+  void gdlwait_responsive(EnvT* e) {
+    e->NParam(1); //, "WAIT");
+
+    DDouble waittime;
+    e->AssureDoubleScalarPar(0, waittime);
+
+    if (waittime < 0)
+      throw GDLException(e->CallingNode(),
+        "WAIT: Argument must be non-negative"
+        + e->GetParString(0));
+
+#ifdef _WIN32
+    LARGE_INTEGER Frequency;
+    LARGE_INTEGER BeginTime;
+    LARGE_INTEGER Endtime;
+    LARGE_INTEGER elapsed;
+    LARGE_INTEGER waittime_us;
+    waittime_us.QuadPart = waittime * 1e6;
+
+    QueryPerformanceFrequency(&Frequency);
+    QueryPerformanceCounter(&BeginTime);
+
+    while (1) {
+      QueryPerformanceCounter(&Endtime);
+      elapsed.QuadPart = (Endtime.QuadPart - BeginTime.QuadPart) / (Frequency.QuadPart / 1000000);
+      if (elapsed.QuadPart >= waittime_us.QuadPart) break;
+      else if (elapsed.QuadPart > 100) Sleep(80);
+    }
+#else
+    int old_version = 0;
+
+    if (waittime <= 0.005) old_version = 1;
+
+    // AC 2010-09-16
+    // this version is OK and very accurate for small durations
+    // but used 100% of one CPU :((
+    if (old_version == 1) {
+      struct timeval tval;
+      struct timezone tzone;
+
+      // derivated from the current version of SYSTIME()
+      gettimeofday(&tval, &tzone);
+      double t_start = tval.tv_sec + tval.tv_usec / 1e+6; // time in UTC seconds
+      double t_current = 0.0;
+
+      double diff = 0.0;
+      while (diff < waittime) {
+
+        gettimeofday(&tval, &tzone);
+        t_current = tval.tv_sec + tval.tv_usec / 1e+6;
+        diff = t_current - t_start;
+      }
+    }
+
+    // AC 2010-09-16 this version should used much less CPU !
+    if (old_version == 0) {
+      //cout << floor(waittime) << " " <<  waittime-floor(waittime) << endl;
+      struct timespec tv;
+      tv.tv_sec = floor(waittime);
+      tv.tv_nsec = (waittime - floor(waittime))*1e9;
+      int retval;
+      retval = nanosleep(&tv, NULL);
+    }
+#endif
+   GDLEventHandler(); //this is probably not OK, but is at the moment needed to permit delivery of callback functions in idlneturl__define.pro where a waiting loop uses teh WAIT command.  
+  }
+
   void wait_pro( EnvT* e) 
   { 
     e->NParam( 1);//, "WAIT");
@@ -548,7 +618,6 @@ namespace lib {
       retval=nanosleep(&tv,NULL);
     }
 #endif
-    GDLEventHandler(); //this is probably not OK, but is at the moment needed to permit delivery of callback functions in idlneturl__define.pro where a waiting loop uses teh WAIT command.
   }
 
 

src/basic_pro_jmg.hpp

@@ -35,6 +35,7 @@ namespace lib {
   void unlinksymbol( EnvT* e );
   void ResetDLLs( void );
   void wait_pro( EnvT* e);
+  void gdlwait_responsive( EnvT* e);
 
   void kwtest( EnvT* e);
 

src/devicewx.hpp

@@ -231,9 +231,8 @@ if(hide) {
         return gcFunction;
     }
 
-    DLongGDL* GetScreenSize(char* disp) {
-        DLongGDL* res;
-        res = new DLongGDL(2, BaseGDL::NOZERO);
+    DIntGDL* GetScreenSize(char* disp) {
+        DIntGDL* res = new DIntGDL(2, BaseGDL::NOZERO);
         (*res)[0] = wxSystemSettings::GetMetric(wxSYS_SCREEN_X);
         (*res)[1] = wxSystemSettings::GetMetric(wxSYS_SCREEN_Y);
         return res;

src/devicex.hpp

@@ -182,10 +182,9 @@ class DeviceX : public GraphicsMultiDevice {
     return gcFunction;
   }
 
-    DLongGDL* GetScreenSize(char* disp) { 
+    DIntGDL* GetScreenSize(char* disp) { 
       Display* display = XOpenDisplay(disp);
       int screen_num, screen_width, screen_height;
-      DLongGDL* res;
 
       if (display == NULL) {
          screen_width = 0;
@@ -196,7 +195,7 @@ class DeviceX : public GraphicsMultiDevice {
          screen_height = DisplayHeight(display, screen_num);
          XCloseDisplay(display);
       }
-      res = new DLongGDL(2, BaseGDL::NOZERO);
+      DIntGDL* res = new DIntGDL(2, BaseGDL::NOZERO);
       (*res)[0]= screen_width;
       (*res)[1]= screen_height;
       return res;

src/devicez.hpp

@@ -220,7 +220,7 @@ class DeviceZ: public GraphicsDevice
       memBuffer[i] = bColor;
   }
 
-  DLong GetPixelDepth() { return 24;}  
+  DInt GetPixelDepth() { return 24;}  
 
   bool SetPixelDepth(DInt value) {
    static int displayed=0;

src/dpro.hpp

@@ -318,7 +318,7 @@ class DLibFunRetNewTP: public DLibFun
   bool RetConstant() { return this->retConstant;}
 };
 // direct call functions must have:
-// ony one parameter, no keywords
+// only one parameter, no keywords
 // these functions are called "direct", no environment is created
 class DLibFunDirect: public DLibFunRetNew
 {