Fixes for XML parsing (don't merge without inspection)

.gitignore

@@ -52,3 +52,4 @@ run-all-tests.sh
 *.exe
 *.out
 *.app
+*.tmp

Build/gcc/Makefile.dependencies

@@ -37,6 +37,14 @@ CCACHE = $(shell command -v ccache)
 CC = $(CCACHE) $(MPICH_DIR)/bin/mpicc
 CXX = $(CCACHE) $(MPICH_DIR)/bin/mpicxx
 
+# If ccache is installed then use it. Even if ccache is set up for
+# g++ and gcc, it won't be for the custom install of mpi
+CCACHE_PATH := $(strip $(shell which ccachee 2> /dev/null))
+ifneq ($(CCACHE_PATH),)
+CC := $(CCACHE_PATH) $(CC)
+CXX := $(CCACHE_PATH) $(CXX)
+endif
+
 # GCC, not used for building the Orchestrator, but necessary for the
 # Mothership. Immediate-set, because it's used by the shell.
 GCC_LIB_DIR := $(ORCHESTRATOR_DEPENDENCIES_DIR)/gcc-7.3.0/lib64:/usr/lib64

Config/OrchestratorMessages.ocfg

@@ -280,6 +280,9 @@
 929(U) : "DS_integ::DS_integ: App name %s has disappeared"
 930(U) : "DS_XML::PBuild: incoming .tag field non-null"
 931(U) : "DS_XML::_EdgeI_t: pathDecode returns error code %s"
+932(U) : "File %s: Graphs element does not have `appname` attribute, and there is no GraphInstance/@id to use instead."
+933(U) : "File %s line %s: OutputPin has indexed=true, which is not supported by orchestrator"
+996(U) : "CmLoad::Cm_App: DS_XML returns %s errors"
 995(U) : "GraphI_t::GetDevice: graph instance corrupt - device %s has zero address"
 997(U) : "File %s line %s: .........."
 998(U) : "File %s line %s: Unknown XML element %s should have caught by the validator"

Config/V4Grammar3.ocfg

@@ -1,84 +1,114 @@
 <?xml version="1.0"?>
 <!-- V4 Grammar definition file, 2020-09-29. -->
-<Graphs Graphs="[1],[1]xmlns,[0..1]formatMinorVersion,[1]appname">
-  <GraphType GraphType="[1],[1]id">
-    <Properties Properties="[0..1]"><CDATA CDATA="[1]"/></Properties>
-    <MetaData MetaData="[]"/>
-    <SharedCode SharedCode="[0..1]"><CDATA CDATA="[1]"/></SharedCode>
+<Graphs Graphs="[1],[1]xmlns,[0..1]formatMinorVersion,[0..1]appname">
+  <GraphType GraphType="[1],[1]id,[0..1]xmlns">
+
+    <MetaData MetaData="[],[1](key,value)"/>
+    <Metadata Metadata="[],[1](key,value)"/>
+
+    <Properties Properties="[0..1]"><CDATA CDATA="[0..1]"/></Properties>
+
+    <SharedCode SharedCode="[0..1]"><CDATA CDATA="[0..1]"/></SharedCode>
     <MessageTypes MessageTypes="[0..1]">
-      <MessageType MessageType="[],[1]id"><CDATA CDATA="[1]"/></MessageType>
+
+      <MessageType MessageType="[],[1]id">
+        <Message Message="[0..1]">
+          <CDATA CDATA="[0..1]"/>
+        </Message>
+      </MessageType>
     </MessageTypes>
     <DeviceTypes DeviceTypes="[1]">
       <DeviceType DeviceType="[],[1]id">
-        <Properties Properties="[0..1]"><CDATA CDATA="[1]"/></Properties>
-        <State State="[0..1]"><CDATA CDATA="[1]"/></State>
-        <SharedCode SharedCode="[0..1]"><CDATA CDATA="[1]"/></SharedCode>
+
+        <Properties Properties="[0..1]"><CDATA CDATA="[0..1]"/></Properties>
+        <State State="[0..1]"><CDATA CDATA="[0..1]"/></State>
+        <SharedCode SharedCode="[0..1]"><CDATA CDATA="[0..1]"/></SharedCode>
         <SupervisorOutPin SupervisorOutPin="[0..1],[1]messageTypeId">
-          <OnSend OnSend="[1]"><CDATA CDATA="[1]"/></OnSend>
+
+          <OnSend OnSend="[1]"><CDATA CDATA="[0..1]"/></OnSend>
         </SupervisorOutPin>
+
         <SupervisorInPin SupervisorInPin="[0..1],[1]messageTypeId">
-          <OnReceive OnReceive="[1]"><CDATA CDATA="[1]"/></OnReceive>
+
+          <OnReceive OnReceive="[1]"><CDATA CDATA="[0..1]"/></OnReceive>
         </SupervisorInPin>
         <InputPin InputPin="[],[1](name,messageTypeId)">
-          <Properties Properties="[0..1]"><CDATA CDATA="[1]"/></Properties>
-          <State State="[0..1]"><CDATA CDATA="[1]"/></State>
-          <OnReceive OnReceive="[1]"><CDATA CDATA="[1]"/></OnReceive>
+
+          <Properties Properties="[0..1]"><CDATA CDATA="[0..1]"/></Properties>
+          <State State="[0..1]"><CDATA CDATA="[0..1]"/></State>
+          <OnReceive OnReceive="[1]"><CDATA CDATA="[0..1]"/></OnReceive>
         </InputPin>
-        <OutputPin OutputPin="[],[1](name,messageTypeId)">
-          <OnSend OnSend="[1]"><CDATA CDATA="[1]"/></OnSend>
+        <OutputPin OutputPin="[],[1](name,messageTypeId),[0..1](indexed)">
+
+          <OnSend OnSend="[1]"><CDATA CDATA="[0..1]"/></OnSend>
         </OutputPin>
-        <ReadyToSend ReadyToSend="[0..1]"><CDATA CDATA="[1]"/></ReadyToSend>
-        <OnInit OnInit="[0..1]"><CDATA CDATA="[1]"/></OnInit>
-        <OnHardwareIdle OnHardwareIdle="[0..1]"><CDATA CDATA="[1]"/></OnHardwareIdle>
-        <OnDeviceIdle OnDeviceIdle="[0..1]"><CDATA CDATA="[1]"/></OnDeviceIdle>
+
+        <ReadyToSend ReadyToSend="[0..1]"><CDATA CDATA="[0..1]"/></ReadyToSend>
+        <OnInit OnInit="[0..1]"><CDATA CDATA="[0..1]"/></OnInit>
+        <OnHardwareIdle OnHardwareIdle="[0..1]"><CDATA CDATA="[0..1]"/></OnHardwareIdle>
+        <OnDeviceIdle OnDeviceIdle="[0..1]"><CDATA CDATA="[0..1]"/></OnDeviceIdle>
         <MetaData MetaData="[]"/>
+        <Metadata Metadata="[]"/>
       </DeviceType>
       <ExternalType ExternalType="[],[1]id">
-        <Properties Properties="[0..1]"><CDATA CDATA="[1]"/></Properties>
+
+        <Properties Properties="[0..1]"><CDATA CDATA="[0..1]"/></Properties>
         <InputPin InputPin="[],[1](name,messageTypeId)"/>
         <OutputPin OutputPin="[],[1](name,messageTypeId)"/>
         <MetaData MetaData="[]"/>
+        <Metadata Metadata="[]"/>
       </ExternalType>
       <SupervisorType SupervisorType="[0..1],[1]id,[0..1](SupervisorInPin,SupervisorOutPin)">
-        <Properties Properties="[0..1]"><CDATA CDATA="[1]"/></Properties>
-        <State State="[0..1]"><CDATA CDATA="[1]"/></State>
-        <Code Code="[0..1]"><CDATA CDATA="[1]"/></Code>
+
+        <Properties Properties="[0..1]"><CDATA CDATA="[0..1]"/></Properties>
+        <State State="[0..1]"><CDATA CDATA="[0..1]"/></State>
+        <Code Code="[0..1]"><CDATA CDATA="[0..1]"/></Code>
         <SupervisorOutPin SupervisorOutPin="[0..1],[1]id,[1]messageTypeId">
-          <OnSend OnSend="[1]"><CDATA CDATA="[1]"/></OnSend>
+
+          <OnSend OnSend="[1]"><CDATA CDATA="[0..1]"/></OnSend>
         </SupervisorOutPin>
         <SupervisorInPin SupervisorInPin="[0..1],[1]id,[1]messageTypeId">
-          <OnReceive OnReceive="[1]"><CDATA CDATA="[1]"/></OnReceive>
+
+          <OnReceive OnReceive="[1]"><CDATA CDATA="[0..1]"/></OnReceive>
         </SupervisorInPin>
         <InputPin InputPin="[],[1](name,messageTypeId)">
-          <Properties Properties="[0..1]"><CDATA CDATA="[1]"/></Properties>
-          <State State="[0..1]"><CDATA CDATA="[1]"/></State>
-          <OnReceive OnReceive="[1]"><CDATA CDATA="[1]"/></OnReceive>
+
+          <Properties Properties="[0..1]"><CDATA CDATA="[0..1]"/></Properties>
+          <State State="[0..1]"><CDATA CDATA="[0..1]"/></State>
+          <OnReceive OnReceive="[1]"><CDATA CDATA="[0..1]"/></OnReceive>
         </InputPin>
         <OutputPin OutputPin="[],[1](name,messageTypeId)">
-          <OnSend OnSend="[1]"><CDATA CDATA="[1]"/></OnSend>
+
+          <OnSend OnSend="[1]"><CDATA CDATA="[0..1]"/></OnSend>
         </OutputPin>
-        <OnInit OnInit="[0..1]"><CDATA CDATA="[1]"/></OnInit>
-        <OnSupervisorIdle OnSupervisorIdle="[0..1]"><CDATA CDATA="[1]"/></OnSupervisorIdle>
-        <OnRTCL OnRTCL="[..1]"><CDATA CDATA="[1]"/></OnRTCL>
-        <OnStop OnStop="[..1]"><CDATA CDATA="[1]"/></OnStop>
-        <OnCTL  OnCTL="[..1]"><CDATA CDATA="[1]"/></OnCTL>
+
+        <OnInit OnInit="[0..1]"><CDATA CDATA="[0..1]"/></OnInit>
+        <OnSupervisorIdle OnSupervisorIdle="[0..1]"><CDATA CDATA="[0..1]"/></OnSupervisorIdle>
+        <OnRTCL OnRTCL="[..1]"><CDATA CDATA="[0..1]"/></OnRTCL>
+        <OnStop OnStop="[..1]"><CDATA CDATA="[0..1]"/></OnStop>
+        <OnCTL  OnCTL="[..1]"><CDATA CDATA="[0..1]"/></OnCTL>
         <MetaData MetaData="[]"/>
+        <Metadata Metadata="[]"/>
       </SupervisorType>
     </DeviceTypes>
   </GraphType>
-  <GraphInstance GraphInstance="[],[1](id,graphTypeId),[0..1](P)">
-    <MetaData MetaData="[]"/>
+  <GraphInstance GraphInstance="[],[1](id,graphTypeId),[0..1](P),[0..1]xmlns">
+    <MetaData MetaData="[],[1](key,value)"/>
+    <Metadata Metadata="[],[1](key,value)"/>
     <DeviceInstances DeviceInstances="[0..1]">
       <DevI DevI="[],[1](id,type),[0..1](P,S)">
         <MetaData MetaData="[]"/>
+        <Metadata Metadata="[]"/>
       </DevI>
       <ExtI ExtI="[],[1](id,type),[0..1]P">
         <MetaData MetaData="[]"/>
+        <Metadata Metadata="[]"/>
       </ExtI>
     </DeviceInstances>
     <EdgeInstances EdgeInstances="[0..1]">
-      <EdgeI EdgeI="[],[1]path(path),[0..1](P,S)">
+      <EdgeI EdgeI="[],[1]path(path),[0..1](P,S),[0..1](sendIndex)">
         <MetaData MetaData="[]"/>
+        <Metadata Metadata="[]"/>
       </EdgeI>
     </EdgeInstances>
   </GraphInstance>

Source/Common/CommonBase.cpp

@@ -98,15 +98,26 @@ void CommonBase::MPISpinner()
 
 int MSGBUFSIZ = 1024;                  // Individual incoming message buffer
 char * MSGBUF = new char[MSGBUFSIZ];   // Pull it off the heap
+
+const int MAX_PROBE_IDLE_BACKOFF_US=100000; // Maximum is 100,000us, i.e. 10hz
+int probe_idle_backoff_us=0;
 for (;;) {
 // See if there are any MPI packets coming down the pipe
   MPI_Status status;                   // Note the multi-threaded MPI probe
   int flag;
   MPI_Iprobe(MPI_ANY_SOURCE,MPI_ANY_TAG,MPI_COMM_WORLD,&flag,&status);
   if (flag==0) {                       // Nothing there....
-    OnIdle();                          // Guess
+    if(HaveIdleWork()){
+      OnIdle();                          // Guess
+    }else{
+      probe_idle_backoff_us=std::min<int>(MAX_PROBE_IDLE_BACKOFF_US, std::max<int>(10, (probe_idle_backoff_us*5)/4));
+      OSFixes::sleep( probe_idle_backoff_us / 1000 );
+    }
     continue;                          // And try again
   }
+
+  probe_idle_backoff_us=0;
+
   int count;
   MPI_Get_count(&status,MPI_CHAR,&count);
   if (count > MSGBUFSIZ) {             // Ensure we have the space for it
@@ -142,6 +153,13 @@ void CommonBase::OnIdle()
 
 //------------------------------------------------------------------------------
 
+bool CommonBase::HaveIdleWork()
+{
+  return true; // For compatibility with existing users of OnIdle
+}
+
+//------------------------------------------------------------------------------
+
 unsigned CommonBase::OnPmap(PMsg_p * Z)
 {
 pPmap->Register(Z);

Source/Common/CommonBase.h

@@ -31,6 +31,7 @@ virtual unsigned       Decode(PMsg_p *) = 0;
 void                   Dump(unsigned = 0,FILE * = stdout);
 unsigned               OnExit(PMsg_p *);
 virtual void           OnIdle();
+virtual bool           HaveIdleWork(); // Return false if there is something we want to do in OnIdle
 unsigned               OnPmap(PMsg_p *);
 unsigned               OnSystPingAck(PMsg_p *);
 unsigned               OnSystPingReq(PMsg_p *);

Source/LogServer/LogServer.cpp

@@ -155,14 +155,27 @@ while (recd!=0) {                      // Walk the records in the section
 
 //------------------------------------------------------------------------------
 
+// DT10 : This was previously a static within LogServer::OnIdle. A static
+// global here seems as problematic as there, so moved it out. It looked
+// like a hack anyway.
+static bool OnIdle_flag0 = false;             // All the processes registered?
+
+bool LogServer::HaveIdleWork()
+{
+  if(logfp==0) return false;
+  if((OnIdle_flag0==false)&&(pPmap->vPmap.size()>=unsigned(Usize))){
+    return true;
+  }
+  return false;
+}
+
 void LogServer::OnIdle()
 {
 if (logfp==0) return;                  // May not yet have an output channel
-static bool flag0 = false;             // All the processes registered?
-if ((flag0==false)&&(pPmap->vPmap.size()>=unsigned(Usize))) {
+if ((OnIdle_flag0==false)&&(pPmap->vPmap.size()>=unsigned(Usize))) {
   if (pPmap->vPmap.size()>unsigned(Usize))Post(113);
   pPmap->Show(logfp);
-  flag0 = true;                        // Make sure we just do this once
+  OnIdle_flag0 = true;                        // Make sure we just do this once
 }
 CommonBase::OnIdle();                  // Any base actions?
 }

Source/LogServer/LogServer.h

@@ -22,6 +22,7 @@ string              Assemble(int,vector<string> &);
 void                Dump(unsigned = 0,FILE * = stdout);
 void                InitFile();
 void                LoadMessages(string);
+bool                HaveIdleWork();
 void                OnIdle();
 unsigned            OnLoad(PMsg_p *);
 unsigned            OnLogP(PMsg_p *);

Source/OrchBase/Composer.cpp

@@ -1954,7 +1954,7 @@ void Composer::formDevTStrings(ComposerGraphI_t* builderGraphI, DevT_t* devT)
 
         formHandlerPreamble(dTypStrs);
         formDevTHandlers(dTypStrs);
-        formDevTPropsDStateD(dTypStrs);
+        formDevTPropsDStateD(builderGraphI->graphI, dTypStrs);
         formDevTInputPinHandlers(dTypStrs);
         formDevTOutputPinHandlers(dTypStrs);
 
@@ -2196,11 +2196,13 @@ void Composer::formDevTHandlers(devTypStrings_t* dTypStrs)
 /******************************************************************************
  * Form Device Type Properties and State declarations
  *****************************************************************************/
-void Composer::formDevTPropsDStateD(devTypStrings_t* dTypStrs)
+void Composer::formDevTPropsDStateD(GraphI_t *graph,  devTypStrings_t* dTypStrs)
 {
     DevT_t* devT = dTypStrs->devT;  // grab a local copy of the devtype
     std::string devTName = devT->Name();  // grab a local copy of the name
 
+    std::string graphTName=graph->pT->Name();
+
     std::stringstream vars_h("");
 
     // Write Properties declaration
@@ -2209,6 +2211,8 @@ void Composer::formDevTPropsDStateD(devTypStrings_t* dTypStrs)
         vars_h << "typedef struct " << devTName << "_properties_t \n{\n";
         vars_h << devT->pPropsD->C_src();
         vars_h << "\n} devtyp_" << devTName << "_props_t;\n\n";
+
+        vars_h << "typedef devtyp_" << devTName << "_props_t "<<graphTName<<"_"<<devTName<<"_properties_t;\n\n";
     }
 
     // Write State declaration
@@ -2217,6 +2221,8 @@ void Composer::formDevTPropsDStateD(devTypStrings_t* dTypStrs)
         vars_h << "typedef struct " << devTName << "_state_t \n{\n";
         vars_h << devT->pStateD->C_src();
         vars_h << "\n} devtyp_" << devTName << "_state_t;\n\n";
+
+        vars_h << "typedef devtyp_" << devTName << "_state_t "<<graphTName<<"_"<<devTName<<"_state_t;\n\n";
     }
 
     // Append to the strings
@@ -2400,6 +2406,7 @@ void Composer::formDevTOutputPinHandlers(devTypStrings_t* dTypStrs)
         if ((*pinO)->pMsg->pPropsD)
         {
             handlers_cpp << "   pkt_" << (*pinO)->pMsg->Name();
+
             handlers_cpp << "_pyld_t* message";
             handlers_cpp << " OS_ATTRIBUTE_UNUSED= ";
             handlers_cpp << "static_cast<pkt_";

Source/OrchBase/Composer.h

@@ -167,7 +167,7 @@ void formDevTStrings(ComposerGraphI_t*, DevT_t*);
 void populatePinTIdxMap(DevT_t*);
 void formHandlerPreamble(devTypStrings_t*);
 void formDevTHandlers(devTypStrings_t*);
-void formDevTPropsDStateD(devTypStrings_t*);
+void formDevTPropsDStateD(GraphI_t *graph,  devTypStrings_t*);
 void formDevTInputPinHandlers(devTypStrings_t* dTypStrs);
 void formDevTOutputPinHandlers(devTypStrings_t* dTypStrs);
 

Source/OrchBase/Handlers/CmCall.cpp

@@ -121,6 +121,13 @@ fflush(fp);
 
 //------------------------------------------------------------------------------
 
+bool CmCall::IsEmpty()
+{
+  return Equeue.empty();
+}
+
+//------------------------------------------------------------------------------
+
 Cli CmCall::Front()
 // Provides a valid Cm object: if there was one in the Q, it gets popped off
 // the front; otherwise an empty one is returned.

Source/OrchBase/Handlers/CmCall.h

@@ -20,6 +20,7 @@ void             CaEcho(Cli::Cl_t);
 void             CaFile(Cli::Cl_t);
 void             Dump(unsigned = 0,FILE * = stdout);
 Cli              Front();
+bool             IsEmpty();
 void             Show(FILE * = stdout);
 unsigned         operator()(Cli *);