Changeset fec3bde in git

Timestamp:

Mar 17, 2011, 1:41:54 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2815e8ac192a591e3d2618c320e12f21d3e7a2cd

Parents:

fbb23ba606a10b85b9967f56b46d70c6ed807282

Message:

check for pselect and alternative to pselect

git-svn-id: file:///usr/local/Singular/svn/trunk@14006 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/configure (modified) (1 diff)
• Singular/configure.in (modified) (1 diff)
• Singular/mod2.h.in (modified) (1 diff)
• Singular/ssiLink.cc (modified) (4 diffs)
• kernel/mod2.h.in (modified) (3 diffs)

Singular/configure

@@ -4022 +4022 @@
 fi
 for ac_func in gettimeofday atexit bcopy getcwd getwd vsnprintf readlink \
- sleep usleep getpwnam popen setenv siginterrupt sysconf
+ sleep usleep getpwnam popen setenv siginterrupt sysconf pselect
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

Singular/configure.in

@@ -826 +826 @@
 AC_SEARCH_LIBS(setenv, bsd)
 AC_CHECK_FUNCS(gettimeofday atexit bcopy getcwd getwd vsnprintf readlink \
- sleep usleep getpwnam popen setenv siginterrupt sysconf)
+ sleep usleep getpwnam popen setenv siginterrupt sysconf pselect)
 
 

Singular/mod2.h.in

@@ -108 +108 @@
 /* Define if you have siginterrupt (BSD4.3) */
 #undef HAVE_SIGINTERRUPT
+/* Define if you have pselect */
+#undef HAVE_PSELECT
 /* define for boost includes and lib */
 //////////////////////// #undef HAVE_BOOST_DYNAMIC_BITSET_HPP

Singular/ssiLink.cc

@@ -1220 +1220 @@
 
   /* timeout */
+  #ifdef HAVE_PSELECT
   struct timespec wt;
+  struct timespec *wt_ptr=&wt;
+  #else
+  struct timeval wt;
+  struct timeval *wt_ptr=&wt;
+  #endif
   int startingtime = getRTimer()/TIMER_RESOLUTION;  // in seconds
-  struct timespec *wt_ptr=&wt;
   if (timeout== -1)
   {
@@ -1230 +1235 @@
   {
     wt.tv_sec  = timeout / 1000000;
+  #ifdef HAVE_PSELECT
     wt.tv_nsec = 1000 * (timeout % 1000000);
+  #else
+    wt.tv_usec = timeout % 1000000;
+  #endif
   }
 
@@ -1304 +1313 @@
 
   /* check with select: chars waiting: no -> not ready */
+  #ifdef HAVE_PSELECT
   s = pselect(max_fd, &mask, NULL, NULL, wt_ptr, &sigmask);
+  #else
+   sigset_t origsigmask;
+
+   sigprocmask(SIG_SETMASK, &sigmask, &origsigmask);
+   s = select(max_fd, &mask, NULL, NULL, wt_ptr);
+   sigprocmask(SIG_SETMASK, &origsigmask, NULL);
+   #endif
+
   if (s==-1)
   { 
@@ -1374 +1392 @@
                timeout - 1000000*(getRTimer()/TIMER_RESOLUTION - startingtime));
           wt.tv_sec  = timeout / 1000000;
+          #ifdef HAVE_PSELECT
           wt.tv_nsec = 1000 * (timeout % 1000000);
+          #else
+          wt.tv_usec = (timeout % 1000000);
+          #endif
         }
         goto do_select;

kernel/mod2.h.in

@@ -108 +108 @@
 /* Define if you have siginterrupt (BSD4.3) */
 #undef HAVE_SIGINTERRUPT
+/* Define if you have pselect */
+#undef HAVE_PSELECT
 /* define for boost includes and lib */
 //////////////////////// #undef HAVE_BOOST_DYNAMIC_BITSET_HPP
@@ -160 +162 @@
 /* CPU type: x86_64: */
 #undef SI_CPU_X86_64
+/* whether development version of python is available */
+#undef HAVE_PYTHON
+/* whether static development version of python is available */
+#undef HAVE_STATIC_PYTHON
+/* whether python should be embedded */
+#undef EMBED_PYTHON
 
 /*******************************************************************
@@ -611 +619 @@
 #endif
 
+#define STRINGIFY(name) #name
+#define EXPANDED_STRINGIFY(name) STRINGIFY(name)
+
 #endif /* MOD2_H  */