partly solve interrupt and warning

Signed-off-by: Dongcan Jiang <dongcan.jiang@gmail.com>
HenrikBengtsson · Aug 17, 2015 · 519d751 · 519d751
1 parent 24f1cbf
commit 519d751
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/rowCumMinMaxs_TYPE-template.h b/src/rowCumMinMaxs_TYPE-template.h
@@ -199,8 +199,8 @@ RETURN_TYPE METHOD_NAME_ROWS_COLS(ARGUMENTS_LIST) {
         kk++;
         kk_prev++;
 
-        // TODO: interrupt under pthread
-        // R_CHECK_USER_INTERRUPT(kk);
+        // TODO: interrupt subthreads
+        if (cores) R_CHECK_USER_INTERRUPT(kk);
       } /* for (ii ...) */
     } /* for (jj ...) */
   } else {
@@ -242,8 +242,8 @@ RETURN_TYPE METHOD_NAME_ROWS_COLS(ARGUMENTS_LIST) {
           kk++;
         }
 
-        // TODO: interrupt under pthread
-        // R_CHECK_USER_INTERRUPT(kk);
+        // TODO: interrupt subthreads
+        if (cores) R_CHECK_USER_INTERRUPT(kk);
       } /* for (ii ...) */
     } /* for (jj ...) */
   } /* if (byrow) */

diff --git a/src/rowCumprods_TYPE-template.h b/src/rowCumprods_TYPE-template.h
@@ -207,8 +207,8 @@ RETURN_TYPE METHOD_NAME_ROWS_COLS(ARGUMENTS_LIST) {
         kk++;
         kk_prev++;
 
-        // TODO: interrupt under pthread
-        // R_CHECK_USER_INTERRUPT(kk);
+        // TODO: interrupt subthreads
+        if (cores) R_CHECK_USER_INTERRUPT(kk);
       } /* for (ii ...) */
     } /* for (jj ...) */
   } else {
@@ -247,17 +247,17 @@ RETURN_TYPE METHOD_NAME_ROWS_COLS(ARGUMENTS_LIST) {
 #endif
         kk++;
 
-        // TODO: interrupt under pthread
-        // R_CHECK_USER_INTERRUPT(kk);
+        // TODO: interrupt subthreads
+        if (cores) R_CHECK_USER_INTERRUPT(kk);
       } /* for (ii ...) */
     } /* for (jj ...) */
   } /* if (byrow) */
 
 #if ANS_TYPE == 'i'
   /* Warn on integer overflow? */
   if (warn) {
-    // TODO: warning under pthread
-    warning("Integer overflow. Detected one or more elements whose absolute values were out of the range [%d,%d] that can be used to for integers. Such values are set to NA_integer_.", R_INT_MIN, R_INT_MAX);
+    // TODO: warning in subthreads
+    if (cores) warning("Integer overflow. Detected one or more elements whose absolute values were out of the range [%d,%d] that can be used to for integers. Such values are set to NA_integer_.", R_INT_MIN, R_INT_MAX);
   }
 #endif
 }

diff --git a/src/rowCumsums_TYPE-template.h b/src/rowCumsums_TYPE-template.h
@@ -209,8 +209,8 @@ RETURN_TYPE METHOD_NAME_ROWS_COLS(ARGUMENTS_LIST) {
         kk++;
         kk_prev++;
 
-        // TODO: interrupt under pthread
-        // R_CHECK_USER_INTERRUPT(kk);
+        // TODO: interrupt subthreads
+        if (cores) R_CHECK_USER_INTERRUPT(kk);
       } /* for (ii ...) */
     } /* for (jj ...) */
   } else {
@@ -251,17 +251,17 @@ RETURN_TYPE METHOD_NAME_ROWS_COLS(ARGUMENTS_LIST) {
 
         kk++;
 
-        // TODO: interrupt under pthread
-        // R_CHECK_USER_INTERRUPT(kk);
+        // TODO: interrupt subthreads
+        if (cores) R_CHECK_USER_INTERRUPT(kk);
       } /* for (ii ...) */
     } /* for (jj ...) */
   } /* if (byrow) */
 
 #if ANS_TYPE == 'i'
   /* Warn on integer overflow? */
   if (warn) {
-    // TODO: warning under pthread
-    // warning("Integer overflow. Detected one or more elements whose absolute values were out of the range [%d,%d] that can be used to for integers. Such values are set to NA_integer_.", R_INT_MIN, R_INT_MAX);
+    // TODO: warning in subthreads
+    if (cores) warning("Integer overflow. Detected one or more elements whose absolute values were out of the range [%d,%d] that can be used to for integers. Such values are set to NA_integer_.", R_INT_MIN, R_INT_MAX);
   }
 #endif
 }