Changeset 55cb6b in git

Timestamp:

Apr 10, 2013, 4:04:09 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

ccae2f26143f71606cceb669458d60a2c39c4654

Parents:

c60380d927be780ce0fe437b14c03e70f0df8f5984299e1e1d2b92c5e28fc52391cc529f8eb8ade7

Message:

Merge pull request #317 from mmklee/factory_flint_built

fix: include problems when compiling without NTL but with FLINT

Files:

• Singular/LIB/schubert.lib (added)
• Singular/Makefile.am (modified) (1 diff)
• Singular/cntrlc.cc (modified) (8 diffs)
• Singular/fehelp.cc (modified) (4 diffs)
• Singular/fereadl.c (modified) (5 diffs)
• Singular/iparith.cc (modified) (2 diffs)
• Singular/links/ndbm.cc (modified) (13 diffs)
• Singular/links/pipeLink.cc (modified) (4 diffs)
• Singular/links/s_buff.cc (modified) (4 diffs)
• Singular/links/semaphore.c (modified) (3 diffs)
• Singular/links/silink.cc (modified) (2 diffs)
• Singular/links/ssiLink.cc (modified) (22 diffs)
• Singular/misc_ip.cc (modified) (2 diffs)
• Singular/sdb.cc (modified) (4 diffs)
• Singular/si_signals.h (added)
• doc/changes_in_singular4.doc (added)
• factory/algext.cc (modified) (2 diffs)
• factory/algext.h (modified) (1 diff)
• factory/facMul.h (modified) (2 diffs)
• findexec/feFopen.cc (modified) (2 diffs)
• kernel/tgb.cc (modified) (4 diffs)
• libpolys/coeffs/ffields.cc (modified) (14 diffs)
• libpolys/polys/mod_raw.cc (modified) (4 diffs)

Singular/Makefile.am

@@ -147 +147 @@
    links/ssiLink.h \
    links/simpleipc.h \
+   si_signals.h \
    stype.h \
    subexpr.h \

Singular/cntrlc.cc

@@ -26 +26 @@
 #include <kernel/febase.h>
 void sig_chld_hdl(int sig); /*#include <Singular/links/ssiLink.h>*/
+//#include <Singular/feOpt.h>
+//#include <Singular/version.h>
+//#include <Singular/silink.h>
+//#include <Singular/ssiLink.h>
+#include <Singular/si_signals.h>
 
 #include "tok.h"
@@ -138 +143 @@
      fprintf(stderr, "Unable to init signal %d ... exiting...\n", sig);
   }
-#ifdef HAVE_SIGINTERRUPT
-  siginterrupt(sig, 0);
+  si_siginterrupt(sig, 0);
   /*system calls will be restarted if interrupted by  the  specified
    * signal sig.  This is the default behavior in Linux.
    */
-#endif
 #else
   struct sigaction new_action,old_action;
@@ -154 +157 @@
     new_action.sa_flags = SA_RESTART;
 
-  int r=sigaction (sig, &new_action, &old_action);
+  int r=si_sigaction (sig, &new_action, &old_action);
   si_hdl_typ retval=(si_hdl_typ)old_action.sa_handler;
   if (r == -1)
@@ -498 +501 @@
   if (pid == 0)
   {
-    close (0); dup2 (in_fd[0],0);   /* set the stdin to the in pipe */
-    close (1); dup2 (out_fd[1],1);  /* set the stdout to the out pipe */
-    close (2); dup2 (out_fd[1],2);  /* set the stderr to the out pipe */
+    si_close (0); si_dup2 (in_fd[0],0);   /* set the stdin to the in pipe */
+    si_close (1); si_dup2 (out_fd[1],1);  /* set the stdout to the out pipe */
+    si_close (2); si_dup2 (out_fd[1],2);  /* set the stderr to the out pipe */
 
     execvp (args[0], args);      /* exec gdb */
@@ -515 +518 @@
   FD_SET (out_fd[0], &fdset);
 
-  write (in_fd[1], "backtrace\n", 10);
-  write (in_fd[1], "p si_stop_stack_trace_x = 0\n", 28);
-  write (in_fd[1], "quit\n", 5);
+  si_write (in_fd[1], "backtrace\n", 10);
+  si_write (in_fd[1], "p si_stop_stack_trace_x = 0\n", 28);
+  si_write (in_fd[1], "quit\n", 5);
 
   index = 0;
@@ -528 +531 @@
     tv.tv_usec = 0;
 
-    sel = select (FD_SETSIZE, &readset, NULL, NULL, &tv);
+    sel = si_select (FD_SETSIZE, &readset, NULL, NULL, &tv);
     if (sel == -1)
       break;
@@ -534 +537 @@
     if ((sel > 0) && (FD_ISSET (out_fd[0], &readset)))
     {
-      if (read (out_fd[0], &c, 1))
+      if (si_read (out_fd[0], &c, 1))
       {
         switch (state)
@@ -565 +568 @@
   }
 
-  close (in_fd[0]);
-  close (in_fd[1]);
-  close (out_fd[0]);
-  close (out_fd[1]);
+  si_close (in_fd[0]);
+  si_close (in_fd[1]);
+  si_close (out_fd[0]);
+  si_close (out_fd[1]);
   m2_end(0);
 }

Singular/fehelp.cc

@@ -23 +23 @@
 
 #include <findexec/omFindExec.h>
+
+#include <Singular/si_signals.h>
 
 #include "ipid.h"
@@ -510 +512 @@
         hentry->url[i] = '\0';
 
-        if (fscanf(fd, "%ld\n", &(hentry->chksum)) != 1)
+        if (si_fscanf(fd, "%ld\n", &(hentry->chksum)) != 1)
         {
           hentry->chksum = -1;
@@ -638 +640 @@
   if (fd == NULL) return 0;
   memset(index_key,0,MAX_HE_ENTRY_LENGTH);
-  while (fscanf(fd, "%[^\t]\t%*[^\n]\n", index_key) == 1)
+  while (si_fscanf(fd, "%[^\t]\t%*[^\n]\n", index_key) == 1)
   {
     if ((index_key[MAX_HE_ENTRY_LENGTH-1]!='\0'))
@@ -1220 +1222 @@
   {
     // char* dummy=fgets(buffer, BUF_LEN, index); /* */
-    (void)sscanf(buffer, "Node:%[^\177]\177%ld\n", Index, &offset);
+    (void)si_sscanf(buffer, "Node:%[^\177]\177%ld\n", Index, &offset);
     for(p=Index; *p; p++) *p = tolow(*p);/* */
     (void)strcat(Index, " ");

Singular/fereadl.c

@@ -195 +195 @@
       #endif
       /* OB: why this ? HS: char t_buf[128] does not work with glibc2 systems */
-      char *t_buf=(char *)omAlloc(128); 
+      char *t_buf=(char *)omAlloc(128);
       /*char t_buf[128];*/
       char *temp;
@@ -325 +325 @@
     /* check for CSI */
     c='\0';
-    read (STDIN_FILENO, &c, 1);
+    while((-1 == read (STDIN_FILENO, &c, 1)) && (errno == EINTR));
     if (c == '[')
     {
       /* get command character */
       c='\0';
-      read (STDIN_FILENO, &c, 1);
+      while((-1 == read (STDIN_FILENO, &c, 1)) && (errno == EINTR));
       switch (c)
       {
@@ -415 +415 @@
           tv.tv_sec = 0;
           tv.tv_usec = 0;
-          #ifdef hpux
-            sel = select (STDIN_FILENO+1, (int *)fdset.fds_bits, NULL, NULL, &tv);
-          #else
-            sel = select (STDIN_FILENO+1, &fdset, NULL, NULL, &tv);
-          #endif
+          do
+          {
+            sel = select (STDIN_FILENO+1,
+#ifdef hpux
+                          (int *)fdset.fds_bits,
+#else
+                          &fdset,
+#endif
+                          NULL, NULL, &tv);
+          } while( (sel == -1) && (errno == EINTR) );
           if (sel==0)
             fe_temp_reset();
@@ -770 +775 @@
     if (fe_rl_hdl==NULL) { return 1;}
 
-    fe_filename_completion_function= 
+    fe_filename_completion_function=
       dynl_sym(fe_rl_hdl, "filename_completion_function");
     if (fe_filename_completion_function==NULL) { res=3; break; }
@@ -825 +830 @@
 extern int history_total_bytes();
 extern int write_history (const char *);
-#endif    
+#endif
 void fe_reset_input_mode ()
 {

Singular/iparith.cc

@@ -79 +79 @@
 
 #include <polys/coeffrings.h>
+#include <Singular/si_signals.h>
 
 lists rDecompose(const ring r);
@@ -7651 +7652 @@
     if (i_s > 0)
     {
-      sleep((is - 1)/1000000 + 1);
+      si_sleep((is - 1)/1000000 + 1);
       jjSTATUS3(res, v, v->next, v->next->next);
     }

Singular/links/ndbm.cc

@@ -15 +15 @@
 
 #include "config.h"
+#include <Singular/si_signals.h>
 #include <kernel/mod2.h>
 #ifdef HAVE_DBM
@@ -86 +87 @@
   strcpy(db->dbm_pagbuf, file);
   strcat(db->dbm_pagbuf, ".pag");
-  db->dbm_pagf = open(db->dbm_pagbuf, flags, mode);
+  db->dbm_pagf = si_open(db->dbm_pagbuf, flags, mode);
   if (db->dbm_pagf < 0)
     goto bad;
   strcpy(db->dbm_pagbuf, file);
   strcat(db->dbm_pagbuf, ".dir");
-  db->dbm_dirf = open(db->dbm_pagbuf, flags, mode);
+  db->dbm_dirf = si_open(db->dbm_pagbuf, flags, mode);
   if (db->dbm_dirf < 0)
     goto bad1;
@@ -99 +100 @@
   return (db);
 bad1:
-  (void) close(db->dbm_pagf);
+  (void) si_close(db->dbm_pagf);
 bad:
   free((char *)db);
@@ -107 +108 @@
 void dbm_close(DBM *db)
 {
-  (void) close(db->dbm_dirf);
-  (void) close(db->dbm_pagf);
+  (void) si_close(db->dbm_dirf);
+  (void) si_close(db->dbm_pagf);
   free((char *)db);
 }
@@ -166 +167 @@
   db->dbm_pagbno = db->dbm_blkno;
   (void) lseek(db->dbm_pagf, db->dbm_blkno*PBLKSIZ, L_SET);
-  if (write(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
+  if (si_write(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
   {
   err:
@@ -206 +207 @@
   db->dbm_pagbno = db->dbm_blkno;
   (void) lseek(db->dbm_pagf, db->dbm_blkno*PBLKSIZ, L_SET);
-  if ( (ret=write(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ)) != PBLKSIZ)
+  if ( (ret=si_write(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ)) != PBLKSIZ)
   {
     db->dbm_flags |= _DBM_IOERR;
@@ -245 +246 @@
   db->dbm_pagbno = db->dbm_blkno;
   (void) lseek(db->dbm_pagf, db->dbm_blkno*PBLKSIZ, L_SET);
-  if (write(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
+  if (si_write(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
   {
     db->dbm_flags |= _DBM_IOERR;
@@ -251 +252 @@
   }
   (void) lseek(db->dbm_pagf, (db->dbm_blkno+db->dbm_hmask+1)*PBLKSIZ, L_SET);
-  if (write(db->dbm_pagf, ovfbuf, PBLKSIZ) != PBLKSIZ)
+  if (si_write(db->dbm_pagf, ovfbuf, PBLKSIZ) != PBLKSIZ)
   {
     db->dbm_flags |= _DBM_IOERR;
@@ -284 +285 @@
       db->dbm_pagbno = db->dbm_blkptr;
       (void) lseek(db->dbm_pagf, db->dbm_blkptr*PBLKSIZ, L_SET);
-      if (read(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
+      if (si_read(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
         memset(db->dbm_pagbuf, 0, PBLKSIZ);
 #ifdef DEBUG
@@ -323 +324 @@
     db->dbm_pagbno = db->dbm_blkno;
     (void) lseek(db->dbm_pagf, db->dbm_blkno*PBLKSIZ, L_SET);
-    if (read(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
+    if (si_read(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
       memset(db->dbm_pagbuf, 0, PBLKSIZ);
 #ifdef DEBUG
@@ -348 +349 @@
     db->dbm_dirbno = b;
     (void) lseek(db->dbm_dirf, (long)b*DBLKSIZ, L_SET);
-    if (read(db->dbm_dirf, db->dbm_dirbuf, DBLKSIZ) != DBLKSIZ)
+    if (si_read(db->dbm_dirf, db->dbm_dirbuf, DBLKSIZ) != DBLKSIZ)
       memset(db->dbm_dirbuf, 0, DBLKSIZ);
   }
@@ -369 +370 @@
     db->dbm_dirbno = b;
     (void) lseek(db->dbm_dirf, (long)b*DBLKSIZ, L_SET);
-    if (read(db->dbm_dirf, db->dbm_dirbuf, DBLKSIZ) != DBLKSIZ)
+    if (si_read(db->dbm_dirf, db->dbm_dirbuf, DBLKSIZ) != DBLKSIZ)
       memset(db->dbm_dirbuf, 0, DBLKSIZ);
   }
@@ -375 +376 @@
   db->dbm_dirbno = b;
   (void) lseek(db->dbm_dirf, (long)b*DBLKSIZ, L_SET);
-  if (write(db->dbm_dirf, db->dbm_dirbuf, DBLKSIZ) != DBLKSIZ)
+  if (si_write(db->dbm_dirf, db->dbm_dirbuf, DBLKSIZ) != DBLKSIZ)
     db->dbm_flags |= _DBM_IOERR;
 }

Singular/links/pipeLink.cc

@@ -27 +27 @@
 #include "lists.h"
 #include "pipeLink.h"
+#include <Singular/si_signals.h>
 
 typedef struct
@@ -53 +54 @@
   {
     /* close unnecessary pipe descriptors for a clean environment */
-    close(pc[1]); close(cp[0]);
+    si_close(pc[1]); si_close(cp[0]);
     /* dup pipe read/write to stdin/stdout */
-    dup2( pc[0], STDIN_FILENO );
-    dup2( cp[1], STDOUT_FILENO  );
+    si_dup2( pc[0], STDIN_FILENO );
+    si_dup2( cp[1], STDOUT_FILENO  );
     int r=system(l->name);
-    close(pc[0]);
-    close(cp[1]);
+    si_close(pc[0]);
+    si_close(cp[1]);
     exit(r);
         /* never reached*/
@@ -66 +67 @@
   {
     d->pid=pid;
-    close(pc[0]); close(cp[1]);
+    si_close(pc[0]); si_close(cp[1]);
     d->f_read=fdopen(cp[0],"r");
     d->fd_read=cp[0];
@@ -176 +177 @@
       //Print("test fd %d\n",d->fd_read);
       /* check with select: chars waiting: no -> not ready */
-      s=select(d->fd_read+1, &mask, NULL, NULL, &wt);
+      s=si_select(d->fd_read+1, &mask, NULL, NULL, &wt);
     }
     switch (s)

Singular/links/s_buff.cc

@@ -11 +11 @@
 #include <omalloc/omalloc.h>
 #include <Singular/links/s_buff.h>
+#include <Singular/si_signals.h>
 //struct s_buff_s
 //{
@@ -43 +44 @@
 {
   SSI_BLOCK_CHLD;
-  int fd=open(n,O_RDONLY);
+  int fd=si_open(n,O_RDONLY);
   SSI_UNBLOCK_CHLD;
   return s_open(fd);
@@ -54 +55 @@
     SSI_BLOCK_CHLD;
     omFreeSize(F->buff,S_BUFF_LEN);
-    int r=close(F->fd);
+    int r=si_close(F->fd);
     omFreeSize(F,sizeof(*F));
     F=NULL;
@@ -74 +75 @@
     memset(F->buff,0,S_BUFF_LEN); /*debug*/
     SSI_BLOCK_CHLD;
-    int r=read(F->fd,F->buff,S_BUFF_LEN);
+    int r=si_read(F->fd,F->buff,S_BUFF_LEN);
     SSI_UNBLOCK_CHLD;
     if (r<=0)

Singular/links/semaphore.c

@@ -7 +7 @@
 
 #include <kernel/mod2.h>
+#include <Singular/si_signals.h>
 
 #ifdef HAVE_SIMPLEIPC
@@ -66 +67 @@
 {
   if ((id<0) || (id >= SIPC_MAX_SEMAPHORES) || (semaphore[id]==NULL))  return -1;
-  sem_wait(semaphore[id]);
+  si_sem_wait(semaphore[id]);
   return 1;
 }
@@ -73 +74 @@
 {
   if ((id<0) || (id >= SIPC_MAX_SEMAPHORES) || (semaphore[id]==NULL))  return -1;
-  return !sem_trywait(semaphore[id]);
+  return !si_sem_trywait(semaphore[id]);
 }
 

Singular/links/silink.cc

@@ -31 +31 @@
 #include <Singular/links/ssiLink.h>
 #include <Singular/links/pipeLink.h>
+#include <Singular/si_signals.h>
 #include "feOpt.h"
 
@@ -159 +160 @@
   {
     struct stat buf;
-    if (lstat(l->name,&buf)==0) return "yes";
+    if (si_lstat(l->name,&buf)==0) return "yes";
     else return "no";
   }

Singular/links/ssiLink.cc

@@ -25 +25 @@
 #include "config.h"
 #include <kernel/mod2.h>
+#include <Singular/si_signals.h>
 
 #include <omalloc/omalloc.h>
@@ -198 +199 @@
       {
         mpz_t tmp;
-        mpz_init_set_si(tmp,nn);
+        mpz_init_set_si(tmp,nn);
         fputs("8 ",d->f_write);
         mpz_out_str (d->f_write,32, tmp);
         fputc(' ',d->f_write);
-        mpz_clear(tmp);
+        mpz_clear(tmp);
       }
       #endif
@@ -490 +491 @@
          mpz_init(((number_dummy)n)->z);
          mpz_init(((number_dummy)n)->n);
-         s_readmpz_base (d->f_read,((number_dummy)n)->z, 32);
-         s_readmpz_base (d->f_read,((number_dummy)n)->n, 32);
+         s_readmpz_base (d->f_read,((number_dummy)n)->z, 32);
+         s_readmpz_base (d->f_read,((number_dummy)n)->n, 32);
          ((number_dummy)n)->s=sub_type-5;
          return n;
@@ -499 +500 @@
          number n=(number)omAlloc0(sizeof(snumber_dummy));
          mpz_init(((number_dummy)n)->z);
-         s_readmpz_base (d->f_read,((number_dummy)n)->z, 32);
+         s_readmpz_base (d->f_read,((number_dummy)n)->z, 32);
          ((number_dummy)n)->s=sub_type=3; /*subtype-5*/
          return n;
@@ -832 +833 @@
           ssiToBeClosed->next=NULL;
           SSI_BLOCK_CHLD;
-          close(pc[1]); close(cp[0]);
+          si_close(pc[1]); si_close(cp[0]);
           d->f_write=fdopen(cp[1],"w");
           SSI_UNBLOCK_CHLD;
@@ -869 +870 @@
           d->pid=pid;
           SSI_BLOCK_CHLD;
-          close(pc[0]); close(cp[1]);
+          si_close(pc[0]); si_close(cp[1]);
           d->f_write=fdopen(pc[1],"w");
           SSI_UNBLOCK_CHLD;
@@ -919 +920 @@
         Print("waiting on port %d\n", portno);mflush();
         listen(sockfd,1);
-        newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
+        newsockfd = si_accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
         if(newsockfd < 0)
         {
@@ -933 +934 @@
         d->f_write = fdopen(newsockfd, "w");
         SI_LINK_SET_RW_OPEN_P(l);
-        close(sockfd);
+        si_close(sockfd);
       }
       // no ssi-Link on stdin or stdout
@@ -981 +982 @@
         char* cli_host = (char*)omAlloc(256);
         char* path = (char*)omAlloc(1024);
-        int r = sscanf(l->name,"%255[^:]:%s",cli_host,path);
+        int r = si_sscanf(l->name,"%255[^:]:%s",cli_host,path);
         if(r == 0)
         {
@@ -1008 +1009 @@
         omFree(ser_host);
         clilen = sizeof(cli_addr);
-        newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
+        newsockfd = si_accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
         if(newsockfd < 0)
         {
@@ -1022 +1023 @@
         SSI_BLOCK_CHLD;
         d->f_write = fdopen(newsockfd, "w");
-        close(sockfd);
+        si_close(sockfd);
         SSI_UNBLOCK_CHLD;
         SI_LINK_SET_RW_OPEN_P(l);
@@ -1038 +1039 @@
         struct hostent *server;
 
-        sscanf(l->name,"%255[^:]:%d",host,&portno);
+        si_sscanf(l->name,"%255[^:]:%d",host,&portno);
         //Print("connect to host %s, port %d\n",host,portno);mflush();
         if (portno!=0)
@@ -1052 +1053 @@
                 server->h_length);
           serv_addr.sin_port = htons(portno);
-          if (connect(sockfd,(sockaddr*)&serv_addr,sizeof(serv_addr)) < 0)
+          if (si_connect(sockfd,(sockaddr*)&serv_addr,sizeof(serv_addr)) < 0)
           { Werror("ERROR connecting(errno=%d)",errno); return TRUE; }
           //PrintS("connected\n");mflush();
@@ -1162 +1163 @@
       if (d->r!=NULL) rKill(d->r);
       if ((d->pid!=0)
-      && (waitpid(d->pid,NULL,WNOHANG)==0))
+      && (si_waitpid(d->pid,NULL,WNOHANG)==0))
       {
         struct timespec t;
@@ -1168 +1169 @@
         t.tv_nsec=50000000; // <=50 ms
         int r=nanosleep(&t,NULL);
-        if((r==0) && (waitpid(d->pid,NULL,WNOHANG)==0))
+        if((r==0) && (si_waitpid(d->pid,NULL,WNOHANG)==0))
         {
           kill(d->pid,15);
@@ -1174 +1175 @@
           t.tv_nsec=10000000; // <=10 ms
           r=nanosleep(&t,NULL);
-          if((r==0)&&(waitpid(d->pid,NULL,WNOHANG)==0))
+          if((r==0)&&(si_waitpid(d->pid,NULL,WNOHANG)==0))
           {
             kill(d->pid,9); // just to be sure
-            waitpid(d->pid,NULL,0);
+            si_waitpid(d->pid,NULL,0);
           }
         }
@@ -1300 +1301 @@
     case 19: res->rtyp=BIGINTMAT_CMD;
              res->data=ssiReadBigintmat(d);
-             break;
+             break;
     case 20: ssiReadBlackbox(res,l);
              break;
@@ -1498 +1499 @@
       //Print("test fd %d\n",d->fd_read);
     /* check with select: chars waiting: no -> not ready */
-      switch (select(d->fd_read+1, &mask, NULL, NULL, &wt))
+      switch (si_select(d->fd_read+1, &mask, NULL, NULL, &wt))
       {
         case 0: /* not ready */ return "not ready";
@@ -1669 +1670 @@
   #endif
   #ifdef HAVE_PSELECT
-  s = pselect(max_fd, &mask, NULL, NULL, wt_ptr, &sigmask);
+  s = si_pselect(max_fd, &mask, NULL, NULL, wt_ptr, &sigmask);
   #else
   SSI_BLOCK_CHLD;
-  s = select(max_fd, &mask, NULL, NULL, wt_ptr);
+  s = si_select(max_fd, &mask, NULL, NULL, wt_ptr);
   SSI_UNBLOCK_CHLD;
   #endif
@@ -1848 +1849 @@
   struct sockaddr_in cli_addr;
   int clilen = sizeof(cli_addr);
-  int newsockfd = accept(ssiReserved_sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
+  int newsockfd = si_accept(ssiReserved_sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
   if(newsockfd < 0)
   {
@@ -1894 +1895 @@
   {
     ssiReserved_P=0;
-    close(ssiReserved_sockfd);
+    si_close(ssiReserved_sockfd);
   }
   return l;
@@ -1919 +1920 @@
   loop
   {
-    kidpid = waitpid(-1, &status, WNOHANG);
+    kidpid = si_waitpid(-1, &status, WNOHANG);
     if (kidpid==-1)
     {

Singular/misc_ip.cc

@@ -15 +15 @@
 #include "config.h"
 #include <kernel/mod2.h>
+#include <Singular/si_signals.h>
 
 #ifdef HAVE_FACTORY
@@ -1027 +1028 @@
 int singular_fstat(int fd, struct stat *buf)
 {
-  return fstat(fd,buf);
+  return si_fstat(fd,buf);
 }
 

Singular/sdb.cc

@@ -17 +17 @@
 #include <Singular/ipid.h>
 #include <Singular/sdb.h>
+#include <Singular/si_signals.h>
 
 #ifdef HAVE_SDB
@@ -137 +138 @@
         PrintS("cannot get the procedure body\n");
         fclose(fp);
-        unlink(filename);
+        si_unlink(filename);
         omFree(filename);
         return;
@@ -149 +150 @@
     if (pid!=0)
     {
-      wait(&pid);
+      si_wait(&pid);
     }
     else if(pid==0)
@@ -189 +190 @@
     }
   }
-  unlink(filename);
+  si_unlink(filename);
   omFree(filename);
 }

factory/algext.cc

@@ -864 +864 @@
         equal= true; // modular image did not add any new information
       TIMING_START (alg_termination)
+#ifdef HAVE_NTL
 #ifdef HAVE_FLINT
       if (equal && tmp.isUnivariate() && f.isUnivariate() && g.isUnivariate()
@@ -889 +890 @@
       }
       else
+#endif
 #endif
       if(equal && fdivides( tmp, f ) && fdivides( tmp, g )) // trial division

factory/algext.h

@@ -1 @@
-#ifndef ALGEXT_H
-#define ALGEXT_H
+#ifndef CF_ALGEXT_H
+#define CF_ALGEXT_H
 
 // #include "config.h"

factory/facMul.h

@@ -18 +18 @@
 #include "fac_util.h"
 
+#ifdef HAVE_NTL
 /// multiplication of univariate polys over a finite field using NTL, if we are
 /// in GF factory's default multiplication is used.
@@ -166 +167 @@
              );
 #endif
+#endif
 
 #endif

findexec/feFopen.cc

@@ -5 +5 @@
 #include <sys/stat.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "config.h"
@@ -97 +98 @@
   {
     struct stat statbuf;
-    if ((stat(path,&statbuf)==0)
+    int res = -1;
+    do
+    {
+      res = stat(path,&statbuf);
+    } while((res < 0) and (errno == EINTR));
+    if ((res == 0)
     && (S_ISREG(statbuf.st_mode)))
       f = myfopen(path,mode);

kernel/tgb.cc

@@ -1469 +1469 @@
 
 #define ENLARGE(pointer, type) pointer=(type*) omrealloc(pointer, c->array_lengths*sizeof(type))
+
+#define ENLARGE_ALIGN(pointer, type) {if(pointer)\
+         pointer=(type*)omReallocAligned(pointer, c->array_lengths*sizeof(type));\
+         else pointer=(type*)omAllocAligned(c->array_lengths*sizeof(type));}
 //  BOOLEAN corr=lenS_correct(c->strat);
   int sugar;
@@ -1484 +1488 @@
     assume (c->array_lengths >= c->n);
     ENLARGE (c->T_deg, int);
-    ENLARGE (c->tmp_pair_lm, poly);
-    ENLARGE (c->tmp_spn, sorted_pair_node *);
-
-    ENLARGE (c->short_Exps, long);
+    ENLARGE_ALIGN (c->tmp_pair_lm, poly);
+    ENLARGE_ALIGN (c->tmp_spn, sorted_pair_node *);
+
+    ENLARGE_ALIGN (c->short_Exps, long);
     ENLARGE (c->lengths, int);
 #ifndef HAVE_BOOST
 #ifndef USE_STDVECBOOL
 
-    ENLARGE (c->states, char *);
-#endif
-#endif
-    ENLARGE (c->gcd_of_terms, poly);
+    ENLARGE_ALIGN (c->states, char *);
+#endif
+#endif
+    ENLARGE_ALIGN (c->gcd_of_terms, poly);
     //if (c->weighted_lengths!=NULL) {
-    ENLARGE (c->weighted_lengths, wlen_type);
+    ENLARGE_ALIGN (c->weighted_lengths, wlen_type);
     //}
-    //ENLARGE(c->S->m,poly);
+    //ENLARGE_ALIGN(c->S->m,poly);
   }
   pEnlargeSet (&c->S->m, c->n - 1, 1);
@@ -1550 +1554 @@
 
 #undef ENLARGE
+#undef ENLARGE_ALIGN
   if(p_GetComp (h, currRing) <= c->syz_comp)
   {
@@ -3287 +3292 @@
   h = omalloc (n * sizeof (int));
   lengths = (int *) h;
-  weighted_lengths = (wlen_type *) omalloc (n * sizeof (wlen_type));
-  gcd_of_terms = (poly *) omalloc (n * sizeof (poly));
+  weighted_lengths = (wlen_type *) omAllocAligned (n * sizeof (wlen_type));
+  gcd_of_terms = (poly *) omAlloc (n * sizeof (poly));
 
   short_Exps = (long *) omalloc (n * sizeof (long));

libpolys/coeffs/ffields.cc

@@ -22 +22 @@
 #include <string.h>
 #include <math.h>
+#include <errno.h>
 
 BOOLEAN nfGreaterZero (number k, const coeffs r);
@@ -225 +226 @@
 {
   assume(i==1);
-  
+
   if( i == 1 )
     return (number)1;
@@ -655 +656 @@
     /*this field is already set*/  return;
   int i=0;
-  
-  while ((fftable[i]!=c) && (fftable[i]!=0)) 
+
+  while ((fftable[i]!=c) && (fftable[i]!=0))
     i++;
-  
+
   if (fftable[i]==0)
   {
@@ -693 +694 @@
     }
     int q;
-    sscanf(buf,"%d %d",&r->m_nfCharP,&q);
+    int res = -1;
+    do
+    {
+      res = sscanf(buf,"%d %d",&r->m_nfCharP,&q);
+    }
+    while((res < 0) and (errno == EINTR));
+
     nfReadMipo(buf);
     r->m_nfCharQ1=r->m_nfCharQ-1;
@@ -829 +836 @@
 
   const int P = n_NumberOfParameters(r);
-  
+
   for( int i = 1; i <= P; i++ )
-    if (p[i-1] != NULL) 
+    if (p[i-1] != NULL)
       omFree( (ADDRESS)p[i-1] );
-  
-  omFreeSize((ADDRESS)p, P * sizeof(char*));  
+
+  omFreeSize((ADDRESS)p, P * sizeof(char*));
 }
 
@@ -865 +872 @@
   //r->cfRePart = ndCopy;
   //r->cfImPart = ndReturn0;
-  
+
   r->cfWriteLong = nfWriteLong;
   r->cfInit_bigint = nlModP;
@@ -884 +891 @@
   // debug stuff
   r->cfCoeffWrite=nfCoeffWrite;
-   
+
   r->cfParDeg = nfParDeg;
 
@@ -890 +897 @@
   r->cfDBTest=nfDBTest;
 #endif
-  
+
   // the variables:
   r->nNULL = (number)0;
@@ -900 +907 @@
 
   const char * name = p->GFPar_name;
-  
+
   r->m_nfCharQ = 0;
   r->m_nfCharP = p->GFChar;
@@ -913 +920 @@
   assume( pParameterNames != NULL );
   assume( pParameterNames[0] != NULL );
-  
+
   r->pParameterNames = pParameterNames;
   // NOTE: r->m_nfParameter was replaced by n_ParameterNames(r)[0]
@@ -937 +944 @@
   }
 
-  const double check= log ((double) (p->GFChar)); 
+  const double check= log ((double) (p->GFChar));
 
   if( (p->GFDegree * check) > sixteenlog2 )
@@ -950 +957 @@
 
   nfReadTable(c, r);
-  
+
   if( r->m_nfPlus1Table == NULL )
   {
@@ -958 +965 @@
     return TRUE;
   }
-  
-  
+
+
   assume (r -> m_nfCharQ > 0);
 
-  r->ch = r->m_nfCharP; 
+  r->ch = r->m_nfCharP;
   assume( r->m_nfPlus1Table != NULL );
-  
+
   return FALSE;
-  
+
 }
 
@@ -981 +988 @@
     char *s=StringEndS(); PrintS(s); omFree(s);
   }
-  else PrintS("//   minpoly        : ...\n"); 
+  else PrintS("//   minpoly        : ...\n");
 }
 

libpolys/polys/mod_raw.cc

@@ -16 +16 @@
 #include <ctype.h>
 #include <sys/stat.h>
+#include <errno.h>
 
 
@@ -39 +40 @@
 char* si_bultin_libs[]={ SI_FOREACH_BUILTIN(SI_BUILTIN_LIBSTR)  NULL };
 
-#undef SI_BUILTIN_LIBSTR 
+#undef SI_BUILTIN_LIBSTR
 
 lib_types type_of_LIB(char *newlib, char *libnamebuf)
@@ -45 +46 @@
   const unsigned char mach_o[]={0xfe,0xed,0xfa,0xce,0};
   const unsigned char mach_O[]={0xce,0xfa,0xed,0xfe,0};
-   
+
   const unsigned char mach_o64[]={0xfe,0xed,0xfa,0xcf,0};
   const unsigned char mach_O64[]={0xcf,0xfa,0xed,0xfe,0};
-   
+
   int i=0;
   while(si_bultin_libs[i]!=NULL)
@@ -62 +63 @@
   struct stat sb;
   int nbytes = 0;
-  // int ret;
+  int ret;
   lib_types LT=LT_NONE;
 
   FILE * fp = feFopen( newlib, "r", libnamebuf, FALSE );
-  /*ret =*/ (void) stat(libnamebuf, &sb);
+
+  do
+  {
+    ret = stat(libnamebuf, &sb);
+  } while((ret < 0) and (errno == EINTR));
 
   if (fp==NULL)