[rkward-cvs] SF.net SVN: rkward: [2348] trunk/rkward/rkward/rbackend

[tfry at users.sourceforge.net]

Revision: 2348
          http://rkward.svn.sourceforge.net/rkward/?rev=2348&view=rev
Author:   tfry
Date:     2008-01-28 15:59:59 -0800 (Mon, 28 Jan 2008)

Log Message:
-----------
Check for interrupts explicitely while processing events

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rembedinternal.cpp
    trunk/rkward/rkward/rbackend/rthread.cpp

Modified: trunk/rkward/rkward/rbackend/rembedinternal.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rembedinternal.cpp	2008-01-25 00:58:07 UTC (rev 2347)
+++ trunk/rkward/rkward/rbackend/rembedinternal.cpp	2008-01-28 23:59:59 UTC (rev 2348)
@@ -433,9 +433,9 @@
 // we stop processing, if there are more than 10 events
 	for (;;) {
 		fd_set *what;
-		what = R_checkActivity(R_wait_usec > 0 ? R_wait_usec : 50, 1);
+		what = R_checkActivityEx(R_wait_usec > 0 ? R_wait_usec : 50, 1, Rf_onintr);
+		if (what == NULL) break;
 		R_runHandlers(R_InputHandlers, what);
-		if (what == NULL) break;
 	}
 #else
 /* what we do here is walk the list of objects, that have told R, they're listening for events.

Modified: trunk/rkward/rkward/rbackend/rthread.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rthread.cpp	2008-01-25 00:58:07 UTC (rev 2347)
+++ trunk/rkward/rkward/rbackend/rthread.cpp	2008-01-28 23:59:59 UTC (rev 2348)
@@ -175,7 +175,6 @@
 		RCommandStackModel::getModel ()->itemChange (command);
 
 		MUTEX_UNLOCK;
-	
 		if (ctype & RCommand::GetStringVector) {
 			command->datatype = RData::StringVector;
 			command->data = getCommandAsStringVector (ccommand, &(command->length), &error);
@@ -191,7 +190,6 @@
 		} else {
 			runCommandInternal (ccommand, &error, ctype & RCommand::User);
 		}
-
 		MUTEX_LOCK;
 
 		#ifdef RKWARD_DEBUG


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.