=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v retrieving revision 1.3 retrieving revision 1.19 diff -u -p -r1.3 -r1.19 --- OpenXM/src/OpenMath/OMproxy.java 1999/11/03 07:19:16 1.3 +++ OpenXM/src/OpenMath/OMproxy.java 2000/01/19 09:35:06 1.19 @@ -1,5 +1,5 @@ /** - * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.2 1999/11/02 13:09:19 tam Exp $ + * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.18 2000/01/18 12:47:03 tam Exp $ */ import JP.ac.kobe_u.math.tam.OpenXM.*; @@ -9,6 +9,8 @@ import java.io.*; class OMproxy implements Runnable{ private OpenXM ox; private Stack stack = new Stack(); + private boolean debug = true; + final int version = 199911110; public OMproxy(String host,int ControlPort,int DataPort) throws IOException{ ox = new OpenXM(this,host,ControlPort,DataPort); @@ -17,21 +19,20 @@ class OMproxy implements Runnable{ public void run(){ OM2OXM P = new OM2OXM(); + debug("OMproxy started."); try{ while(true){ - synchronized(ox){ - int ox_tag = ox.receiveOXtag(); + int ox_tag = ox.receiveOXtag(); - switch(ox_tag){ - case OpenXM.OX_COMMAND: - StackMachine(ox.receiveSM()); - break; + switch(ox_tag){ + case OpenXM.OX_COMMAND: + StackMachine(ox.receiveSM()); + break; - case OpenXM.OX_DATA: - stack.push(ox.receiveCMO()); - System.out.println("push: "+ stack.peek()); - break; - } + case OpenXM.OX_DATA: + stack.push(ox.receiveCMO()); + debug("push: "+ stack.peek()); + break; } } }catch(java.io.IOException e){ @@ -42,6 +43,7 @@ class OMproxy implements Runnable{ System.out.println("breaking..."); } + /* public void stop(){ System.out.println("OMproxy Stoping..."); synchronized(ox){ @@ -52,11 +54,13 @@ class OMproxy implements Runnable{ System.out.println("OMproxy Stopped"); } } + */ private void SM_popCMO() throws java.io.IOException{ if(stack.empty()){ ox.send(new CMO_NULL()); }else{ + debug("sending CMO: "+ stack.peek()); ox.send(stack.pop()); } } @@ -94,7 +98,57 @@ class OMproxy implements Runnable{ return; } + private void SM_mathcap() throws java.io.IOException{ + CMO[] mathcap = new CMO[3]; + + { + CMO[] list = {new CMO_INT32(version), + new CMO_STRING("Ox_system=OMproxy.class"), + new CMO_STRING("Version=0."+ version), + new CMO_STRING("HOSTTYPE=JAVA")}; + mathcap[0] = new CMO_LIST(list); + } + + { + CMO[] list = {new CMO_INT32(SM.SM_popCMO), + new CMO_INT32(SM.SM_executeFunction), + new CMO_INT32(SM.SM_mathcap), + new CMO_INT32(SM.SM_setMathCap), + new CMO_INT32(SM.SM_control_kill), + new CMO_INT32(SM.SM_control_reset_connection)}; + mathcap[1] = new CMO_LIST(list); + } + + { + CMO[] CMOFormat = {new CMO_INT32(CMO.CMO_NULL), + new CMO_INT32(CMO.CMO_INT32), + new CMO_INT32(CMO.CMO_STRING), + new CMO_INT32(CMO.CMO_LIST), + new CMO_INT32(CMO.CMO_MONOMIAL32), + new CMO_INT32(CMO.CMO_ZZ), + new CMO_INT32(CMO.CMO_QQ), + new CMO_INT32(CMO.CMO_ZERO), + new CMO_INT32(CMO.CMO_DMS_GENERIC), + new CMO_INT32(CMO.CMO_RECURSIVE_POLYNOMIAL), + new CMO_INT32(CMO.CMO_DISTRIBUTED_POLYNOMIAL), + new CMO_INT32(CMO.CMO_POLYNOMIAL_IN_ONE_VARIABLE), + new CMO_INT32(CMO.CMO_BIGFLOAT), + new CMO_INT32(CMO.CMO_INDETERMINATE), + new CMO_INT32(CMO.CMO_TREE)}; + CMO[] DataFormat1 = {new CMO_INT32(OpenXM.OX_DATA), + new CMO_LIST(CMOFormat)}; + CMO[] list = {new CMO_LIST(DataFormat1)}; + + mathcap[2] = new CMO_LIST(list); + } + + stack.push(new CMO_MATHCAP(new CMO_LIST(mathcap))); + debug("push: "+ stack.peek()); + } + private void StackMachine(SM mesg) throws java.io.IOException{ + debug("receive: "+mesg); + switch(mesg.getCode()){ case SM.SM_popCMO: SM_popCMO(); @@ -104,14 +158,25 @@ class OMproxy implements Runnable{ SM_executeFunction(); break; + case SM.SM_mathcap: + SM_mathcap(); + break; + default: System.out.println("received "+ mesg); } } private CMO CMO2OMXML(CMO obj){ - String str = OM2OXM.CMO2OM(obj); + String str; + try{ + str = OM2OXM.CMO2OM(obj); + }catch(NumberFormatException e){ + debug("CMO2OMXML occuered error in trans"); + return new CMO_ERROR2(new CMO_STRING(e.toString())); + } + return new CMO_STRING(str); } @@ -121,20 +186,32 @@ class OMproxy implements Runnable{ ByteArrayInputStream stream; CMO ret; - if(obj instanceof CMO_STRING){ - return new CMO_ERROR2(); + debug("OMXML2CMO called: "+obj); + if(!(obj instanceof CMO_STRING)){ + return new CMO_ERROR2(new CMO_STRING("It's not CMO_STRING.")); } try{ stream = new ByteArrayInputStream(((CMO_STRING)obj).getString().getBytes()); ret = trans.parse(stream); }catch(IOException e){ + debug("OMXML2CMO occuered error in trans"); return new CMO_ERROR2(new CMO_STRING(e.toString())); + }catch(NumberFormatException e){ + debug("OMXML2CMO occuered error in trans"); + return new CMO_ERROR2(new CMO_STRING(e.toString())); } + debug("push: "+ret); return ret; } + private void debug(String str){ + if(debug){ + System.out.println(str); + } + } + private static String usage(){ String ret = ""; @@ -144,6 +221,8 @@ class OMproxy implements Runnable{ ret += "\t -host hostname \t (default localhost)\n"; ret += "\t -data port \t (default 1300)\n"; ret += "\t -control port \t (default 1200)\n"; + ret += "\t -insecure \t this version ignore this option\n"; + ret += "\t -nohup \t ignore signals (required libnative.so)\n"; return ret; } @@ -162,6 +241,7 @@ class OMproxy implements Runnable{ DataPort = Integer.valueOf(argv[++i]).intValue(); }else if(argv[i].equals("-control")){ ControlPort = Integer.valueOf(argv[++i]).intValue(); + }else if(argv[i].equals("-insecure")){ }else{ System.err.println("unknown option : "+ argv[i]); System.err.print(usage());