===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox.c,v
retrieving revision 1.25
retrieving revision 1.30
diff -u -p -r1.25 -r1.30
--- OpenXM_contrib2/asir2000/io/ox.c	2004/08/28 12:50:30	1.25
+++ OpenXM_contrib2/asir2000/io/ox.c	2013/06/13 18:40:31	1.30
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.24 2003/12/11 05:48:04 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.29 2010/04/23 04:44:52 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -91,6 +91,8 @@ static struct mathcap *remote_mc;
 static int remote_mc_len;
 
 void mclist_to_mc(LIST mclist,struct mathcap *mc);
+Obj asir_pop_one();
+void asir_push_one(Obj);
 
 #if defined(VISUAL)
 /* XXX : mainly used in engine2000/io.c, but declared here */
@@ -145,7 +147,7 @@ static int ox_asir_available_sm[] = {
 	SM_executeStringByLocalParserInBatchMode,
 	SM_executeFunction, SM_shutdown, SM_pops,
 	SM_mathcap, SM_setMathcap, SM_nop,
-	SM_beginBlock, SM_endBlock,
+	SM_beginBlock, SM_endBlock,  SM_executeFunctionSync,
 	SM_set_rank_102, SM_tcp_accept_102, SM_tcp_connect_102, SM_reset_102,
 	SM_bcast_102, SM_reduce_102,
 	0
@@ -404,10 +406,12 @@ void end_critical() {
 	}
 }
 
-extern FUNC registered_handler;
+extern NODE user_int_handler;
 
 void ox_usr1_handler(int sig)
 {
+	NODE t;
+
 #if !defined(VISUAL)
 	signal(SIGUSR1,ox_usr1_handler);
 #endif
@@ -416,10 +420,11 @@ void ox_usr1_handler(int sig)
 		ox_usr1_sent = 1;
 	} else {
 		ox_flushing = 1;
-		if ( registered_handler ) {
+		if ( user_int_handler ) {
 			fprintf(stderr,
-				"usr1 : calling the registered exception handler...");
-			bevalf(registered_handler,0);
+				"usr1 : calling the registered exception handlers...");
+			for ( t = user_int_handler; t; t = NEXT(t) )
+				bevalf((FUNC)BDY(t),0);
 			fprintf(stderr, "done.\n");
 		}
 		ox_resetenv("usr1 : return to toplevel by SIGUSR1");
@@ -459,6 +464,11 @@ void wait_for_data(int s)
 {
 	return;
 }
+
+void wait_for_data_102(int rank)
+{
+	return;
+}
 #else
 int ox_data_is_available(int s)
 {
@@ -511,7 +521,7 @@ void ox_send_data(int s,pointer p)
 	ERR err;
 
 	if ( ox_check && !ox_check_cmo(s,(Obj)p) ) {
-		create_error(&err,ox_serial,"ox_send_data : Mathcap violation");
+		create_error(&err,ox_serial,"ox_send_data : Mathcap violation",0);
 		p = (pointer)err;
 	}
 	begin_critical();