===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc2.c,v
retrieving revision 1.14
retrieving revision 1.25
diff -u -p -r1.14 -r1.25
--- OpenXM/src/kan96xx/plugin/oxmisc2.c	2002/11/07 13:32:06	1.14
+++ OpenXM/src/kan96xx/plugin/oxmisc2.c	2005/06/16 05:07:24	1.25
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.13 2002/02/24 10:27:20 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.24 2004/09/17 08:46:10 takayama Exp $ */
 #include <stdio.h>
 #include "ox_kan.h"
 #include "oxmisc2.h"   /* This file requires sm1 object description. */
@@ -23,7 +23,7 @@ int oxGet(oxclientp client, struct object *op,int *isO
   int ans;
   ox_stream os;
   int m;
-  struct object rob;
+  struct object rob = OINIT;
   int sss;  /* Serial number of the recieved packet. */
   *isObj = 0;
   op->tag = Snull;
@@ -140,13 +140,13 @@ int oxReq(oxclientp client,int func,struct object ob)
        ob3         ob2 */
     /*     oxtags      [[OX_DATA, [cmo numbers]],[OX_DATA_LOCAL,[opt]],...]*/
     {
-      struct object ob1;
-      struct object ob2;
-      struct object ob3;
-      struct object obm;
-      struct object smtags;
-      struct object oxtags;
-      struct object ox;
+      struct object ob1 = OINIT;
+      struct object ob2 = OINIT;
+      struct object ob3 = OINIT;
+      struct object obm = OINIT;
+      struct object smtags = OINIT;
+      struct object oxtags = OINIT;
+      struct object ox = OINIT;
       int n,i;
       struct mathCap mathcap;
 
@@ -226,6 +226,14 @@ int oxReq(oxclientp client,int func,struct object ob)
     oxReqExecuteFunction(client->datafp2,KopString(ob));
     client->dstate = DSTATE_ANY;
     break;
+  case SM_executeFunctionWithOptionalArgument:
+    if (ob.tag != Sdollar) {
+      errorOxmisc2("SM_executeFunctionWithOptionalArgument : the argument must be a string.");
+      return(-1);
+    }
+    oxReqExecuteFunctionWithOptionalArgument(client->datafp2,KopString(ob));
+    client->dstate = DSTATE_ANY;
+    break;
   case SM_popString:
     oxReqPopString(client->datafp2);
     client->dstate = DSTATE_ANY;
@@ -254,6 +262,10 @@ int oxReq(oxclientp client,int func,struct object ob)
     oxReqSingleOperand(client->datafp2,SM_dupErrors);
     client->dstate = DSTATE_ANY;
     break;
+  case SM_pushCMOtag:
+    oxReqSingleOperand(client->datafp2,SM_pushCMOtag);
+    client->dstate = DSTATE_ANY;
+    break;
   default:
     fprintf(MyErrorOut,"func=%d ",func);
     errorOxmisc2("This function is not implemented.");
@@ -265,10 +277,13 @@ int oxReq(oxclientp client,int func,struct object ob)
 
 struct object KoxCreateClient(struct object ip,
                               struct object portStream,
-                              struct object portControl)
+                              struct object portControl,struct object pass)
 {
-  struct object rob;
+  struct object rob = OINIT;
   oxclientp client;
+  char *passControl; char *passData;
+  struct object tob = OINIT;
+  passControl = NULL; passData = NULL;
   rob.tag = Snull;
   if (ip.tag != Sdollar) {
     errorOxmisc2("KoxCreateClient(): The first argument must be a hostname given by a string.");
@@ -294,7 +309,25 @@ struct object KoxCreateClient(struct object ip,
     errorOxmisc2("KoxCreateClient(): The third argument must be a port number given in an integer.");
     return(rob);
   }
-  client = oxCreateClient(KopString(ip),KopInteger(portStream),KopInteger(portControl));
+  if (pass.tag == Sarray) {
+    if (getoaSize(pass) < 2) {
+	  errorOxmisc2("KoxCreateClient(): the fourth argument --- pass must be an array of strings.");
+	  return rob;
+	}
+    tob = getoa(pass,0);
+	if (tob.tag != Sdollar) {
+	  errorOxmisc2("KoxCreateClient(): the fourth argument --- pass must be an array of strings.");
+	  return rob;
+	}
+    passControl = KopString(tob);
+    tob = getoa(pass,1);
+	if (tob.tag != Sdollar) {
+	  errorOxmisc2("KoxCreateClient(): the fourth argument --- pass must be an array of strings.");
+	  return rob;
+	}
+    passData = KopString(tob);
+  }
+  client = oxCreateClient(KopString(ip),KopInteger(portStream),KopInteger(portControl),passControl,passData);
   if (client == NULL) {
     errorOxmisc2("KoxCreateClient(): Open error.");
     return(rob);
@@ -333,7 +366,7 @@ static int isItClientObject(struct object ob)
 
 struct object KoxIsThereErrorClient(struct object ob)
 {
-  struct object rob;
+  struct object rob = OINIT;
   int ans;
   int size;
   oxclient cc;
@@ -349,7 +382,7 @@ struct object KoxIsThereErrorClient(struct object ob)
 
 int oxClientToObject(oxclientp client,struct object rob)
 {
-  struct object ob;
+  struct object ob = OINIT;
   if (client == NULL) return;
   /* rob = newObjectArray(N_OF_CLIENT_FIELDS); */
   if (rob.tag != Sarray) {
@@ -382,12 +415,13 @@ int oxClientToObject(oxclientp client,struct object ro
   }
   putoa(rob,11,KpoInteger(client->engineByteOrder));
   putoa(rob,12,KpoInteger(client->controlByteOrder));
+  putoa(rob,13,KpoInteger(client->engineID));
   return(0);
 }
 
 int oxObjectToClient(struct object ob,oxclientp cp)
 {
-  struct object ob1;
+  struct object ob1 = OINIT;
   struct object *obp;
   if (cp == NULL) {
     errorOxmisc2("oxObjectToClient(): the second argument is NULL");
@@ -438,6 +472,9 @@ int oxObjectToClient(struct object ob,oxclientp cp)
   cp->engineByteOrder = KopInteger(ob1);
   ob1 = getoa(ob,12);
   cp->controlByteOrder = KopInteger(ob1);
+
+  ob1 = getoa(ob,13);
+  cp->engineID = KopInteger(ob1);
   
 
   return(0);
@@ -449,7 +486,7 @@ struct object KoxReq(struct object client,
 {
   int ans;
   static oxclientp cc1 = NULL;
-  struct object rob;
+  struct object rob = OINIT;
   rob.tag = Snull;
   if (cc1 == NULL) {
     cc1 = (oxclientp) mymalloc(sizeof(oxclient));
@@ -480,7 +517,7 @@ struct object KoxGet(struct object client)
 {
   int ans,k;
   static oxclientp cc1 = NULL;
-  struct object rob;
+  struct object rob = OINIT;
   rob.tag = Snull;
   if (cc1 == NULL) {
     cc1 = (oxclientp) mymalloc(sizeof(oxclient));
@@ -511,7 +548,7 @@ struct object KoxGetFromControl(struct object client)
 {
   int ans;
   static oxclientp cc1 = NULL;
-  struct object rob;
+  struct object rob = OINIT;
   rob.tag = Snull;
   if (cc1 == NULL) {
     cc1 = (oxclientp) mymalloc(sizeof(oxclient));
@@ -541,12 +578,12 @@ struct object KoxMultiSelect(struct object oclients,st
   static int csize = 0;
   static oxclientp *clients = NULL;
   oxclientp cc1;
-  struct object rob;
+  struct object rob = OINIT;
   int i;
   int tt;
-  struct object ob1;
-  struct object ob2;
-  struct object ob0;
+  struct object ob1 = OINIT;
+  struct object ob2 = OINIT;
+  struct object ob0 = OINIT;
   int size;
   int ans;
   int dataready[1024];
@@ -611,7 +648,7 @@ struct object KoxWatch(struct object client,struct obj
 {
   int ans,k;
   static oxclientp cc1 = NULL;
-  struct object rob;
+  struct object rob = OINIT;
   extern int WatchStream;
   rob.tag = Snull;
   if (client.tag == Sinteger) {
@@ -644,11 +681,68 @@ struct object KoxWatch(struct object client,struct obj
   return(KpoInteger(ans));
 }
 
+struct object KoxLog(struct object client,struct object in,struct object out)
+{
+  int ans,k;
+  static oxclientp cc1 = NULL;
+  struct object rob = OINIT;
+  rob.tag = Snull;
+  if (cc1 == NULL) {
+    cc1 = (oxclientp) mymalloc(sizeof(oxclient));
+    if (cc1 == NULL) {
+      errorOxmisc2("KoxLog(): no more memory.");
+      return(rob);
+    }
+    oxInitClient(cc1);
+  }
+
+  if (oxObjectToClient(client,cc1) == -1) return(rob);
+  if (cc1 == NULL) {
+    errorOxmisc2("KoxLog(): the first argument must be a client object.");
+    return(rob);
+  }
+
+  if (in.tag != Sfile) {
+	errorOxmisc2("KoxLog(): the second argument is not a file object.");
+	return rob;
+  }
+  if (out.tag != Sfile) {
+	errorOxmisc2("KoxLog(): the third argument is not a file object.");
+	return rob;
+  }
+  k = fp2log(cc1->datafp2,in.rc.file,out.rc.file);
+  fputc(cc1->engineByteOrder,out.rc.file); /* Output engineByteOrder. */
+  /* synchronize cc1 and client. */
+  oxClientToObject(cc1,client);
+
+  return(KpoInteger(ans));
+}
+
+struct object KoxLogStop(struct object client) {
+  static oxclientp cc1 = NULL;
+  struct object rob = OINIT;
+  rob.tag = Snull;
+  if (cc1 == NULL) {
+    cc1 = (oxclientp) mymalloc(sizeof(oxclient));
+    if (cc1 == NULL) {
+      errorOxmisc2("KoxLog(): no more memory.");
+      return(rob);
+    }
+    oxInitClient(cc1);
+  }
+
+  if (oxObjectToClient(client,cc1) == -1) return(rob);
+  if (cc1 == NULL) {
+    errorOxmisc2("KoxLog(): the first argument must be a client object.");
+    return(rob);
+  }
+  return(KpoInteger(fp2stopLog(cc1->datafp2)));  
+}
     
 struct object KoxCloseClient(struct object client) {
   oxclientp cc1 = NULL;
   oxclient cc;
-  struct object rob;
+  struct object rob = OINIT;
   rob.tag = Snull;
   cc1  = &cc;
   if (oxObjectToClient(client,cc1) == -1) return(rob);
@@ -705,6 +799,7 @@ static int cmoCheck00(struct object obj,int cmo[], int
     /* typeTrans[Spoly] = CMO_DMS;  */
     typeTrans[Spoly] = CMO_DISTRIBUTED_POLYNOMIAL; 
     typeTrans[Sdouble] = CMO_64BIT_MACHINE_DOUBLE;
+	typeTrans[SrationalFunction] = CMO_RATIONAL;
     typeTrans[CLASSNAME_ERROR_PACKET]   = CMO_ERROR2;
     typeTrans[CLASSNAME_mathcap] = CMO_MATHCAP; 
     typeTrans[CLASSNAME_indeterminate] = CMO_INDETERMINATE; 
@@ -756,13 +851,13 @@ static int cmoCheck00(struct object obj,int cmo[], int
     
 int cmoCheckMathCap(struct object obj, struct object *obp)
 {
-  struct object mathcap;
-  struct object cmolist;
-  struct object mathcapMain;
-  struct object mathcapThird;
-  struct object ox;
-  struct object oxtag;
-  struct object ob0;
+  struct object mathcap = OINIT;
+  struct object cmolist = OINIT;
+  struct object mathcapMain = OINIT;
+  struct object mathcapThird = OINIT;
+  struct object ox = OINIT;
+  struct object oxtag = OINIT;
+  struct object ob0 = OINIT;
   int oxsize;
   int n;
   int i;
@@ -874,7 +969,7 @@ int cmoCheckMathCap(struct object obj, struct object *
     
              
 struct object KoxGenPortFile(void) {
-  struct object ob;
+  struct object ob = OINIT;
   ob = KpoString(oxGenPortFile());
   return(ob);
 }
@@ -884,20 +979,20 @@ void KoxRemovePortFile(void) {
 
 void oxPushMathCap(struct mathCap *mathcap)
 {
-  struct object rob;
+  struct object rob = OINIT;
   rob = newMathCap(mathcap); 
   Kpush(rob);
 }
 
 struct object KoxGenPass(void) {
-  struct object rob;
+  struct object rob = OINIT;
   rob = KpoString(oxGenPass());
   return(rob);
 }
 
 struct object KoxGetPort(struct object host)
 {
-  struct object rob;
+  struct object rob = OINIT;
   int fdStream, fdControl;
   int portStream, portControl;
   extern int OpenedSocket;
@@ -921,7 +1016,7 @@ struct object KoxGetPort(struct object host)
 }
 struct object KoxGetPort1(struct object host)
 {
-  struct object rob;
+  struct object rob = OINIT;
   int fdStream;
   int portStream;
   extern int OpenedSocket;
@@ -944,11 +1039,13 @@ struct object KoxCreateClient2(struct object peer,
                                struct object ipmask,
                                struct object pass)
 {
-  struct object rob;
+  struct object rob = OINIT;
   oxclientp client;
   int fdStream, portStream, fdControl, portControl;
   int i;
-  struct object ob1;
+  struct object ob1 = OINIT;
+  struct object opassControl = OINIT;
+  struct object opassData = OINIT;
   rob.tag = Snull;
   if (peer.tag != Sarray) {
     errorOxmisc2("KoxCreateClient2(): The first argument must be an array [fdStream, portStream, fdControl, portControl]");
@@ -972,12 +1069,22 @@ struct object KoxCreateClient2(struct object peer,
   if (ipmask.tag != Sinteger) {
     errorOxmisc2("KoxCreateClient2(): ipmask must be an integer.");
   }
-  if (pass.tag != Sdollar) {
-    errorOxmisc2("KoxCreateClient2(): pass must be a string.");
+  if (pass.tag == Sdollar) {
+    opassControl = pass; opassData = pass;
+  }else if (pass.tag == Sarray) {
+    if (getoaSize(pass) < 2) errorOxmisc2("KoxCreateClient2: #passArray < 2.");
+    opassControl = getoa(pass,0);
+    opassData = getoa(pass,1);
+  }else{
+    errorOxmisc2("KoxCreateClient2(): pass must be a string or an array.");
   }
+  if ((opassControl.tag != Sdollar) || (opassData.tag != Sdollar)) {
+    errorOxmisc2("KoxCreateClient2(): opassControl or opassData must be a string.");
+  }
 
   client = oxCreateClient2(fdStream, portStream, fdControl, portControl,
-                           KopInteger(ipmask), KopString(pass));
+                           KopInteger(ipmask),
+                           KopString(opassControl),KopString(opassData));
   if (client == NULL) {
     errorOxmisc2("KoxCreateClient2(): Open error.");
     return(rob);
@@ -1003,7 +1110,7 @@ errorOxmisc2(char *s) {
 struct object KoxPushCMD(struct object client,struct object cmd) {
   int ans;
   static oxclientp cc1 = NULL;
-  struct object rob;
+  struct object rob = OINIT;
   rob.tag = Snull;
   if (cc1 == NULL) {
     cc1 = (oxclientp) mymalloc(sizeof(oxclient));
@@ -1034,7 +1141,7 @@ struct object KoxPushCMD(struct object client,struct o
 struct object KoxPushCMO(struct object client,struct object ob) {
   int ans;
   static oxclientp cc1 = NULL;
-  struct object rob;
+  struct object rob = OINIT;
   rob.tag = Snull;
   if (cc1 == NULL) {
     cc1 = (oxclientp) mymalloc(sizeof(oxclient));
@@ -1072,11 +1179,11 @@ oxclientp oxCreateControl_RFC_101(int fdstream,int por
                                   int ipmask,char *pass);
 struct object KoxCreateControl_RFC_101(struct object peer,struct object ipmask,struct object pass) 
 {
-  struct object rob;
+  struct object rob = OINIT;
   oxclientp client;
   int fdStream, portStream;
   int i;
-  struct object ob1;
+  struct object ob1 = OINIT;
   rob.tag = Snull;
   if (peer.tag != Sarray) {
     errorOxmisc2("KoxCreateControl_RFC_101(): The first argument must be an array [fdStream, portStream]");
@@ -1187,11 +1294,11 @@ oxclientp oxCreateEngine_RFC_101(int fdstream,int port
                                  int ipmask,char *pass, int engineID);
 struct object KoxCreateEngine_RFC_101(struct object peer,struct object ipmask,struct object pass, struct object engineID) 
 {
-  struct object rob;
+  struct object rob = OINIT;
   oxclientp client;
   int fdStream, portStream;
   int i;
-  struct object ob1;
+  struct object ob1 = OINIT;
   rob.tag = Snull;
   if (peer.tag != Sarray) {
     errorOxmisc2("KoxCreateEngine_RFC_101(): The first argument must be an array [fdStream, portStream]");
@@ -1296,36 +1403,14 @@ oxclientp oxCreateEngine_RFC_101(int fdstream,int port
   client->dataport = portStream;
   client->controlport = -1;
   client->controlfd = -1;
-  client->id = engineID;
+  client->id = oxGetClientID();
+  client->engineID = engineID;
   client->type = CLIENT_SOCKET; /* socket */
   client->engineByteOrder = engineByteOrder;
   client->controlByteOrder = -1;
   return(client);
 }
 
-#define MAX_N_OF_CLIENT 1024
-static struct object OxClientList[MAX_N_OF_CLIENT];
-static int OxClientListn = 0;
-int oxGetClientID() {
-  extern struct object OxClientList[];
-  extern int OxClientListn;
-  extern struct object Nobj;
-  int i;
-  for (i=0; i<OxClientListn; i++) {
-	if ((OxClientList[i]).tag == Snull) {
-	  return i;
-	}
-  }
-  i = OxClientListn;
-  (OxClientList[i]).tag = Snull;
-  if (OxClientListn < MAX_N_OF_CLIENT-1) {
-	OxClientListn++;
-	return i;
-  }else{
-	errorOxmisc2("oxGetClientID(): the client table is full.\n");
-	return 0;
-  }
-}
 void oxClientListUpdate(struct object ob) {
   int id;
   extern struct object OxClientList[];
@@ -1347,11 +1432,26 @@ void oxClientListRemove(struct object ob) {
 	/* errorOxmisc2("oxClientListRemove(): the client table is full.\n");*/
   }
 }
+static void KoxCleanClientList() {
+  extern int OxClientListn;
+  extern struct object OxClientList[];
+  int i,j,n;
+  struct object ob = OINIT;
+  n = 0;
+  for (i=0; i<OxClientListn; i++) {
+	if ((OxClientList[i]).tag != Snull) {
+	  if (!isItClientObject(OxClientList[i])) {
+		(OxClientList[i]).tag = Snull;
+	  }
+	}
+  }
+}
 struct object KoxGetClientList() {
   extern int OxClientListn;
   extern struct object OxClientList[];
   int i,j,n;
-  struct object rob;
+  struct object rob = OINIT;
+  KoxCleanClientList();
   n = 0;
   for (i=0; i<OxClientListn; i++) {
 	if ((OxClientList[i]).tag != Snull) n++;