[CRIU] Re: [PATCH] log: Don't show time stamp on pr_msg

Pavel Emelyanov xemul at parallels.com
Fri Nov 2 04:58:24 EDT 2012


On 11/02/2012 12:55 AM, Cyrill Gorcunov wrote:
> In case if the pr_err happens before pr_msg,
> the string buffer will have dangling timestamp
> prefix. Skip it here.
> 
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> ---
>  log.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/log.c b/log.c
> index 9629897..5fa1c6b 100644
> --- a/log.c
> +++ b/log.c
> @@ -182,11 +182,13 @@ void print_on_level(unsigned int loglevel, const char *format, ...)
>  
>  	if (unlikely(loglevel == LOG_MSG)) {
>  		fd = STDOUT_FILENO;
> +		off = buf_off;

Not vice-versa? I.e. in case of printing on the screen we use offset
and in case of printing in file -- no?

>  	} else {
>  		if (loglevel > current_loglevel)
>  			return;
>  		fd = current_logfd;
>  		print_ts();
> +		off = 0;
>  	}
>  
>  	va_start(params, format);
> @@ -195,7 +197,6 @@ void print_on_level(unsigned int loglevel, const char *format, ...)
>  
>  	size += buf_off;
>  
> -	off = 0;
>  	while (off < size) {
>  		ret = write(fd, buffer + off, size - off);
>  		if (ret <= 0)
> 




More information about the CRIU mailing list