PSI UPDATE

r2720 | ffr | 2008-10-13 15:40:07 +1100 (Mon, 13 Oct 2008) | 2 lines

ofac.c

@@ -56,6 +56,7 @@
 #include "servlog.h"
 #include "nserver.h"
 #include "status.h"
+#include "statusfile.h"
 #include "configfu.h"
 #include "devexec.h"
 #include "mumo.h"
@@ -122,6 +123,12 @@
 #include "multicounter.h"
 #include "sicspoll.h"
 #include "statemon.h"
+#include "asyncqueue.h"
+#include "asyncprotocol.h"
+#include "sicsobj.h"
+#include "hdbqueue.h"
+#include "genericcontroller.h"
+#include "proxy.h"
 /*----------------------- Server options creation -------------------------*/
   static int IFServerOption(SConnection *pCon, SicsInterp *pSics, void *pData,
                      int argc, char *argv[])
@@ -227,8 +234,6 @@
      AddCommand(pInter,"status",  UserStatus,NULL,NULL);
      AddCommand(pInter,"ResetServer",ResetStatus,NULL,NULL);
      AddCommand(pInter,"Dir",ListObjects,NULL,NULL);    
-     AddCommand(pInter,"Backup",BackupStatus,NULL,NULL);
-     AddCommand(pInter,"Restore",RestoreStatus,NULL,NULL);
      AddCommand(pInter,"SetInt", SetSICSInterrupt,NULL,NULL);
      AddCommand(pInter,"GetInt",GetSICSInterrupt,NULL,NULL);
      AddCommand(pInter,"SICSType",SICSType,NULL,NULL);
@@ -243,6 +248,7 @@
      AddCommand(pInter,"commandlog",CommandLog,CommandLogClose,NULL);
      AddCommand(pInter,"udpquieck",QuieckAction,KillQuieck,NULL);
      AddCommand(pInter,"alias",MakeAlias,NULL,NULL);
+     AddCommand(pInter,"findalias",LocateAliasAction,NULL,NULL);
      AddCommand(pInter,"sicscron",MakeCron,NULL,NULL);
      AddCommand(pInter,"dolater",MakeCron,NULL,NULL);
      AddCommand(pInter,"sicsdatafactory",SICSDataFactory,NULL,NULL);
@@ -250,6 +256,7 @@
      AddCommand(pInter,"help",SicsHelp,KillHelp,NULL);
      AddCommand(pInter,"sicslist",SicsList,NULL,NULL);
      AddCommand(pInter,"InstallHdb",InstallSICSHipadaba,NULL,NULL);
+     MakeProtocol(pInter);
 
      /* commands to do with the executor. Only StopExe carries the
         DeleteFunction in order to avoid double deletion. All the
@@ -277,7 +284,6 @@
     AddCommand(pInter,"MakeCounter",MakeCounter,NULL,NULL);
     AddCommand(pInter,"MakeO2T",CreateO2T,NULL,NULL);
     AddCommand(pInter,"SicsAlias",SicsAlias,NULL,NULL); 
-    AddCommand(pInter,"SicsAlias",DefineAlias,NULL,NULL);
     AddCommand(pInter,"DefineAlias",DefineAlias,NULL,NULL); /* M.Z. */
     AddCommand(pInter,"MakeHM",MakeHistMemory,NULL,NULL);
     AddCommand(pInter,"VelocitySelector",VelSelFactory,NULL,NULL);
@@ -326,8 +332,6 @@
 	       McStasReaderFactory,NULL,NULL);
     AddCommand(pInter,"MakeMcStasController",
 	       McStasControllerFactory,NULL,NULL);
-     AddCommand(pInter,"InstallProtocolHandler",
-	       InstallProtocol,NULL,NULL);
      AddCommand(pInter,"InstallSinfox",
            InstallSinfox,NULL,NULL);
      AddCommand(pInter,"MakeCone",
@@ -338,6 +342,14 @@
            InstallSICSPoll,NULL,NULL);
      AddCommand(pInter,"MakeStateMon",
            StateMonFactory,NULL,NULL);
+     AddCommand(pInter,"MakeAsyncProtocol",AsyncProtocolFactory,NULL,NULL);
+     AddCommand(pInter,"MakeAsyncQueue",AsyncQueueFactory,NULL,NULL);
+     AddCommand(pInter,"MakeSicsObj",InstallSICSOBJ,NULL,NULL);
+     AddCommand(pInter,"DynSicsObj",InstallSICSOBJ,NULL,NULL);
+/*     AddCommand(pInter,"MakeHdbQueue",MakeHDBQueue,NULL,NULL); */
+     AddCommand(pInter,"MakeGenController",GenControllerFactory,NULL,NULL);
+     AddCommand(pInter,"genconfigure",GenControllerConfigure,NULL,NULL);
+     AddCommand(pInter,"MakeProxy",ProxyFactory,NULL,NULL);
 
     /*
       install site specific commands
@@ -403,11 +415,16 @@
     RemoveCommand(pSics,"MakeTasUB");
     RemoveCommand(pSics,"MakeTasScan");
     RemoveCommand(pSics,"MakemcStasReader");
-    RemoveCommand(pSics,"InstallProtocolHandler");
     RemoveCommand(pSics,"InstallSinfox");
     RemoveCommand(pSics,"MakeCone"); 
     RemoveCommand(pSics,"MakeMultiCounter"); 
     RemoveCommand(pSics,"MakeStateMon"); 
+    RemoveCommand(pSics,"MakeAsyncQueue"); 
+    RemoveCommand(pSics,"MakeAsyncProtocol"); 
+    RemoveCommand(pSics,"MakeSicsObject"); 
+    RemoveCommand(pSics,"MakeGenController"); 
+    RemoveCommand(pSics,"genconfigure"); 
+    RemoveCommand(pSics,"MakeProxy"); 
     /*
       remove site specific installation commands
     */
@@ -423,10 +440,17 @@
 
 /*  insert here initialization routines ... */
 
-    INIT(SiteInit); /* site specific initializations */
     INIT(StatisticsInit);
+    INIT(InitializerInit);
+    INIT(SaveHdbInit); /* must be after InitializerInit */
+    INIT(SctInit);
+    INIT(SctDriveInit);
+    INIT(LogReaderInit);
+    INIT(LogSetupInit);
+    INIT(StatusFileInit);
 
-  }
+    INIT(SiteInit); /* site specific initializations */
+ }
 /*--------------------------------------------------------------------------*/
   int InitObjectCommands(pServer pServ, char *file)
   {
@@ -449,6 +473,7 @@
      }
      MakeExeManager(pCon,pSics,NULL,1, NULL);
      InitIniCommands(pSics,pServ->pTasker);
+     InstallBckRestore(pCon,pSics);
      
      pCon->iFiles = 0;