External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc: don't build pidfile string multiple times

Browse Source 
Build the pidfile string once when starting a guest and then
use the same string thereafter. This will benefit following
patches which need the pidfile string in more situations.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2015-01-16 11:54:30 +00:00
parent b3e4401dc6
commit a5979e3374
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lxc/lxc_process.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2014 Red Hat, Inc. * Copyright (C) 2010-2015 Red Hat, Inc.
* Copyright IBM Corp. 2008 * Copyright IBM Corp. 2008
* *
* lxc_process.c: LXC process lifecycle management * lxc_process.c: LXC process lifecycle management
@ -1013,6 +1013,7 @@ int virLXCProcessStart(virConnectPtr conn,
virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver);
virCgroupPtr selfcgroup; virCgroupPtr selfcgroup;
int status; int status;
char *pidfile = NULL;
if (virCgroupNewSelf(&selfcgroup) < 0) if (virCgroupNewSelf(&selfcgroup) < 0)
return -1; return -1;
@ -1063,7 +1064,10 @@ int virLXCProcessStart(virConnectPtr conn,
if (virAsprintf(&logfile, "%s/%s.log", if (virAsprintf(&logfile, "%s/%s.log",
cfg->logDir, vm->def->name) < 0) cfg->logDir, vm->def->name) < 0)
return -1; goto cleanup;
if (!(pidfile = virPidFileBuildPath(cfg->stateDir, vm->def->name)))
goto cleanup;
if (!(caps = virLXCDriverGetCapabilities(driver, false))) if (!(caps = virLXCDriverGetCapabilities(driver, false)))
goto cleanup; goto cleanup;
@ -1261,14 +1265,14 @@ int virLXCProcessStart(virConnectPtr conn,
} }
/* And get its pid */ /* And get its pid */
if ((r = virPidFileRead(cfg->stateDir, vm->def->name, &vm->pid)) < 0) { if ((r = virPidFileReadPath(pidfile, &vm->pid)) < 0) {
if (virLXCProcessReadLogOutput(vm, logfile, pos, ebuf, sizeof(ebuf)) > 0) if (virLXCProcessReadLogOutput(vm, logfile, pos, ebuf, sizeof(ebuf)) > 0)
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("guest failed to start: %s"), ebuf); _("guest failed to start: %s"), ebuf);
else else
virReportSystemError(-r, virReportSystemError(-r,
_("Failed to read pid file %s/%s.pid"), _("Failed to read pid file %s"),
cfg->stateDir, vm->def->name); pidfile);
goto cleanup; goto cleanup;
} }
@ -1387,6 +1391,7 @@ int virLXCProcessStart(virConnectPtr conn,
VIR_FREE(ttyFDs); VIR_FREE(ttyFDs);
VIR_FORCE_CLOSE(handshakefds[0]); VIR_FORCE_CLOSE(handshakefds[0]);
VIR_FORCE_CLOSE(handshakefds[1]); VIR_FORCE_CLOSE(handshakefds[1]);
VIR_FREE(pidfile);
VIR_FREE(logfile); VIR_FREE(logfile);
virObjectUnref(cfg); virObjectUnref(cfg);
virObjectUnref(caps); virObjectUnref(caps);