-----Original Message-----
From: Osier Yang [mailto:jyang@redhat.com]
Sent: Monday, November 25, 2013 1:13 PM
To: Chen Hanxiao
Cc: libvir-list(a)redhat.com
Subject: Re: [libvirt] [PATCH]lxc: don't do duplicate work when getting
pagesize
On 18/11/13 16:03, Chen Hanxiao wrote:
> From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com>
>
> Don't do duplicate work when getting pagesize.
> With some debug logs added.
>
> Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com>
> ---
> src/lxc/lxc_container.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
> index 255c711..e85d01c 100644
> --- a/src/lxc/lxc_container.c
> +++ b/src/lxc/lxc_container.c
> @@ -144,6 +144,7 @@ int lxcContainerHasReboot(void)
> int cmd, v;
> int status;
> char *tmp;
> + int stacksize = getpagesize() * 4;
>
> if (virFileReadAll("/proc/sys/kernel/ctrl-alt-del", 10, &buf)
< 0)
> return -1;
> @@ -160,10 +161,12 @@ int lxcContainerHasReboot(void)
> VIR_FREE(buf);
> cmd = v ? LINUX_REBOOT_CMD_CAD_ON :
LINUX_REBOOT_CMD_CAD_OFF;
>
> - if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0)
> + if (VIR_ALLOC_N(stack, stacksize) < 0) {
> + VIR_DEBUG("Unable to allocate stack");
virAllocN already reports the out-of-memory error, why do we
need a debug log?
I've already see it. I just want it to look alike the same scenario in
lxcContainerAvailable
Maybe we should also delete that code in lxcContainerAvailable.
Osier