mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-02 15:59:37 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2531 from brauner/2018-08-16/minor_fixes

Browse Source 
state: s/sleep()/nanosleep()/
This commit is contained in:
Stéphane Graber
2018-08-15 20:26:08 -04:00
committed by GitHub
parent 03eda56551 746559f461
commit 1a1de30d21
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lxc/state.c
View File

@@ -100,8 +100,8 @@ static int fillwaitedstates(const char *strstates, lxc_state_t *states)
return 0; return 0;
} }
extern int lxc_wait(const char *lxcname, const char *states, int timeout, int lxc_wait(const char *lxcname, const char *states, int timeout,
const char *lxcpath) const char *lxcpath)
{ {
int state = -1; int state = -1;
lxc_state_t s[MAX_STATE] = {0}; lxc_state_t s[MAX_STATE] = {0};
@@ -110,6 +110,11 @@ extern int lxc_wait(const char *lxcname, const char *states, int timeout,
return -1; return -1;
for (;;) { for (;;) {
struct timespec onesec = {
.tv_sec = 1,
.tv_nsec = 0,
};
state = lxc_cmd_sock_get_state(lxcname, lxcpath, s, timeout); state = lxc_cmd_sock_get_state(lxcname, lxcpath, s, timeout);
if (state >= 0) if (state >= 0)
break; break;
@@ -125,7 +130,7 @@ extern int lxc_wait(const char *lxcname, const char *states, int timeout,
if (timeout == 0) if (timeout == 0)
return -1; return -1;
sleep(1); (void)nanosleep(&onesec, NULL);
} }
if (state < 0) { if (state < 0) {