=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v retrieving revision 1.11 retrieving revision 1.17 diff -u -p -r1.11 -r1.17 --- OpenXM/src/OpenMath/OMproxy.java 1999/11/16 13:16:22 1.11 +++ OpenXM/src/OpenMath/OMproxy.java 2000/01/18 07:59:19 1.17 @@ -1,5 +1,5 @@ /** - * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.10 1999/11/11 20:22:19 tam Exp $ + * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.16 2000/01/13 12:35:56 tam Exp $ */ import JP.ac.kobe_u.math.tam.OpenXM.*; @@ -60,7 +60,7 @@ class OMproxy implements Runnable{ if(stack.empty()){ ox.send(new CMO_NULL()); }else{ - debug("pushing CMO: "+ stack.peek()); + debug("sending CMO: "+ stack.peek()); ox.send(stack.pop()); } } @@ -119,7 +119,6 @@ class OMproxy implements Runnable{ } { - CMO[] DataFormat = {new CMO_INT32(OpenXM.OX_DATA)}; CMO[] CMOFormat = {new CMO_INT32(CMO.CMO_NULL), new CMO_INT32(CMO.CMO_INT32), new CMO_INT32(CMO.CMO_STRING), @@ -128,10 +127,17 @@ class OMproxy implements Runnable{ 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_DMS_GENERIC)}; - CMO[] list = {new CMO_LIST(DataFormat), - new CMO_LIST(CMOFormat)}; + 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); } @@ -215,10 +221,13 @@ class OMproxy implements Runnable{ 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; } + private static native void setNoInterrupt(); + public static void main(String argv[]){ String host = "localhost"; int DataPort = 1300, ControlPort = 1200; @@ -234,6 +243,9 @@ class OMproxy implements Runnable{ }else if(argv[i].equals("-control")){ ControlPort = Integer.valueOf(argv[++i]).intValue(); }else if(argv[i].equals("-insecure")){ + }else if(argv[i].equals("-nohup")){ + System.loadLibrary("native"); + setNoInterrupt(); }else{ System.err.println("unknown option : "+ argv[i]); System.err.print(usage());