OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Improve -pidfile option, by Anthony Liguori.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2506 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-03-19 15:58:31 +00:00
parent c35734b2a6
commit 93815bc280
1 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
vl.c
View File

@ -4387,44 +4387,24 @@ void usb_info(void)
} }
} }
/***********************************************************/ static int create_pidfile(const char *filename)
/* pid file */
static char *pid_filename;
/* Remove PID file. Called on normal exit */
static void remove_pidfile(void)
{ {
unlink (pid_filename); int fd;
} char buffer[128];
int len;
static void create_pidfile(const char *filename) fd = open(filename, O_RDWR | O_CREAT, 0600);
{ if (fd == -1)
struct stat pidstat; return -1;
FILE *f;
/* Try to write our PID to the named file */ if (lockf(fd, F_TLOCK, 0) == -1)
if (stat(filename, &pidstat) < 0) { return -1;
if (errno == ENOENT) {
if ((f = fopen (filename, "w")) == NULL) { len = snprintf(buffer, sizeof(buffer), "%ld\n", (long)getpid());
perror("Opening pidfile"); if (write(fd, buffer, len) != len)
exit(1); return -1;
}
fprintf(f, "%d\n", getpid()); return 0;
fclose(f);
pid_filename = qemu_strdup(filename);
if (!pid_filename) {
fprintf(stderr, "Could not save PID filename");
exit(1);
}
atexit(remove_pidfile);
}
} else {
fprintf(stderr, "%s already exists. Remove it and try again.\n",
filename);
exit(1);
}
} }
/***********************************************************/ /***********************************************************/
@ -6880,6 +6860,7 @@ int main(int argc, char **argv)
char usb_devices[MAX_USB_CMDLINE][128]; char usb_devices[MAX_USB_CMDLINE][128];
int usb_devices_index; int usb_devices_index;
int fds[2]; int fds[2];
const char *pid_file = NULL;
LIST_INIT (&vm_change_state_head); LIST_INIT (&vm_change_state_head);
#ifndef _WIN32 #ifndef _WIN32
@ -7285,7 +7266,7 @@ int main(int argc, char **argv)
break; break;
#endif #endif
case QEMU_OPTION_pidfile: case QEMU_OPTION_pidfile:
create_pidfile(optarg); pid_file = optarg;
break; break;
#ifdef TARGET_I386 #ifdef TARGET_I386
case QEMU_OPTION_win2k_hack: case QEMU_OPTION_win2k_hack:
@ -7371,16 +7352,19 @@ int main(int argc, char **argv)
close(fds[1]); close(fds[1]);
again: again:
len = read(fds[0], &status, 1); len = read(fds[0], &status, 1);
if (len == -1 && (errno == EINTR)) if (len == -1 && (errno == EINTR))
goto again; goto again;
if (len != 1 || status != 0) if (len != 1)
exit(1); exit(1);
else else if (status == 1) {
exit(0); fprintf(stderr, "Could not acquire pidfile\n");
exit(1);
} else
exit(0);
} else if (pid < 0) } else if (pid < 0)
exit(1); exit(1);
setsid(); setsid();
@ -7399,6 +7383,15 @@ int main(int argc, char **argv)
} }
#endif #endif
if (pid_file && create_pidfile(pid_file) != 0) {
if (daemonize) {
uint8_t status = 1;
write(fds[1], &status, 1);
} else
fprintf(stderr, "Could not acquire pid file\n");
exit(1);
}
#ifdef USE_KQEMU #ifdef USE_KQEMU
if (smp_cpus > 1) if (smp_cpus > 1)
kqemu_allowed = 0; kqemu_allowed = 0;