=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v retrieving revision 1.13 retrieving revision 1.18 diff -u -p -r1.13 -r1.18 --- OpenXM/src/OpenMath/OMproxy.java 1999/11/17 13:23:16 1.13 +++ OpenXM/src/OpenMath/OMproxy.java 2000/01/18 12:47:03 1.18 @@ -1,5 +1,5 @@ /** - * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.12 1999/11/17 08:47:55 tam Exp $ + * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.17 2000/01/18 07:59:19 tam Exp $ */ import JP.ac.kobe_u.math.tam.OpenXM.*; @@ -113,13 +113,13 @@ class OMproxy implements Runnable{ 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[] 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), @@ -129,14 +129,16 @@ class OMproxy implements Runnable{ 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_RECURSIVE_POLYNOMIAL), new CMO_INT32(CMO.CMO_DISTRIBUTED_POLYNOMIAL), - //new CMO_INT32(CMO.CMO_POLYNOMIAL_IN_ONE_VARIABLE), + 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[] list = {new CMO_LIST(DataFormat), - new CMO_LIST(CMOFormat)}; + CMO[] DataFormat1 = {new CMO_INT32(OpenXM.OX_DATA), + new CMO_LIST(CMOFormat)}; + CMO[] list = {new CMO_LIST(DataFormat1)}; + mathcap[2] = new CMO_LIST(list); } @@ -220,10 +222,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; @@ -239,6 +244,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());