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

Cyrill Gorcunov gorcunov at openvz.org
Tue Nov 6 04:06:26 EST 2012


On Tue, Nov 06, 2012 at 12:55:42PM +0400, Pavel Emelyanov wrote:
> On 11/06/2012 11:24 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>
> 
> Isn't it easier to do it like
> 
> @@ -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;
>  	} 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)
> 
> ?

I already was proposing this kind of patch ;)

http://lists.openvz.org/pipermail/criu/2012-November/005479.html


More information about the CRIU mailing list