Changeset cfe30a in git


Ignore:
Timestamp:
Nov 28, 2013, 9:09:44 AM (9 years ago)
Author:
Andreas Steenpass <steenpass@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '5bec8f88c9ee2573d328cf7c3aff2bcb301d2395')
Children:
c42a9f75e7b92be96e4b082346d946500227e213
Parents:
a529d3d05ff37e5533db2031b45d5fe7c6cad6a8
git-author:
Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-28 09:09:44+01:00
git-committer:
Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-28 09:12:55+01:00
Message:
chg: do another waitpid() after nanosleep() succeeded
(cherry picked from commit 9d9a7faa6bb7522c1db8caabc4c47c0aa0840caf)

Signed-off-by: Andreas Steenpass <steenpass@mathematik.uni-kl.de>
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/links/ssiLink.cc

    ra529d3d rcfe30a  
    11421142        struct timespec rem;
    11431143        int r;
    1144         int wait=0;
    11451144        do
    11461145        {
     
    11481147          t = rem;
    11491148        } while ((r < 0) && (errno == EINTR)
    1150             && ((wait = si_waitpid(d->pid,NULL,WNOHANG)) == 0));
    1151         if ((r == 0) && (wait == 0))
     1149            && (si_waitpid(d->pid,NULL,WNOHANG) == 0));
     1150        if ((r == 0) && (si_waitpid(d->pid,NULL,WNOHANG) == 0))
    11521151        {
    11531152          kill(d->pid,15);
     
    11591158            t = rem;
    11601159          } while ((r < 0) && (errno == EINTR)
    1161               && ((wait = si_waitpid(d->pid,NULL,WNOHANG)) == 0));
    1162           if ((r == 0) && (wait == 0))
     1160              && (si_waitpid(d->pid,NULL,WNOHANG) == 0));
     1161          if ((r == 0) && (si_waitpid(d->pid,NULL,WNOHANG) == 0))
    11631162          {
    11641163            kill(d->pid,9); // just to be sure
Note: See TracChangeset for help on using the changeset viewer.