Changeset 9aa61a in git


Ignore:
Timestamp:
Nov 20, 2013, 4:35:05 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
e4014563a82388c4b39dfa37db24cbe159b24a35
Parents:
3fd3f31590cf8b9f431551f3e01e9e7d80ab6bcf826567790c0f123d4a6b80c695492b5fe1b8cfe1
Message:
Merge pull request #427 from steenpass/sigkill_sw

chg: adjust timeouts in ssiClose()
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/links/ssiLink.cc

    r3fd3f3 r9aa61a  
    11391139        struct timespec t;
    11401140        t.tv_sec=0;
    1141         t.tv_nsec=50000000; // <=50 ms
     1141        t.tv_nsec=100000000; // <=100 ms
    11421142        int r=si_nanosleep(&t,NULL);
    11431143        if((r==0) && (si_waitpid(d->pid,NULL,WNOHANG)==0))
    11441144        {
    11451145          kill(d->pid,15);
    1146           t.tv_sec=0;
    1147           t.tv_nsec=10000000; // <=10 ms
     1146          t.tv_sec=5; // <=5s
     1147          t.tv_nsec=0;
    11481148          r=si_nanosleep(&t,NULL);
    11491149          if((r==0)&&(si_waitpid(d->pid,NULL,WNOHANG)==0))
Note: See TracChangeset for help on using the changeset viewer.