[PATCH] Improve debug output from ckpt_notify_error()

[PATCH] Improve debug output from ckpt_notify_error()

[Matt Helsley]

    Make ckpt_debug() report a more useful location than the
    line of some generic debug/error wrapper.
    
    Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

diff --git a/checkpoint/restart.c b/checkpoint/restart.c
index 3d3d4ed..febc9b7 100644
--- a/checkpoint/restart.c
+++ b/checkpoint/restart.c
@@ -485,13 +485,20 @@ static inline int is_task_active(struct ckpt_ctx *ctx, pid_t pid)
 	return get_active_pid(ctx) == pid;
 }
 
-static inline void ckpt_notify_error(struct ckpt_ctx *ctx)
+static inline void _ckpt_notify_error(struct ckpt_ctx *ctx)
 {
-	ckpt_debug("ctx with root pid %d (%p)", ctx->root_pid, ctx);
 	ckpt_set_ctx_error(ctx);
 	complete(&ctx->complete);
 }
 
+/* Need to call ckpt_debug such that it will get the correct source location */
+#define ckpt_notify_error(ctx) \
+do { \
+	ckpt_debug("ctx with root pid %d (%p)", ctx->root_pid, ctx); \
+	_ckpt_notify_error(ctx); \
+} while(0)
+
+
 int ckpt_activate_next(struct ckpt_ctx *ctx)
 {
 	struct task_struct *task;

Re: [PATCH] Improve debug output from ckpt_notify_error()

[Oren Laadan]

Matt Helsley wrote:
>     Make ckpt_debug() report a more useful location than the
>     line of some generic debug/error wrapper.
>     
>     Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

Nice, and pushed to ckpt-v17-dev.

Oren.

> 
> diff --git a/checkpoint/restart.c b/checkpoint/restart.c
> index 3d3d4ed..febc9b7 100644
> --- a/checkpoint/restart.c
> +++ b/checkpoint/restart.c
> @@ -485,13 +485,20 @@ static inline int is_task_active(struct ckpt_ctx *ctx, pid_t pid)
>  	return get_active_pid(ctx) == pid;
>  }
>  
> -static inline void ckpt_notify_error(struct ckpt_ctx *ctx)
> +static inline void _ckpt_notify_error(struct ckpt_ctx *ctx)
>  {
> -	ckpt_debug("ctx with root pid %d (%p)", ctx->root_pid, ctx);
>  	ckpt_set_ctx_error(ctx);
>  	complete(&ctx->complete);
>  }
>  
> +/* Need to call ckpt_debug such that it will get the correct source location */
> +#define ckpt_notify_error(ctx) \
> +do { \
> +	ckpt_debug("ctx with root pid %d (%p)", ctx->root_pid, ctx); \
> +	_ckpt_notify_error(ctx); \
> +} while(0)
> +
> +
>  int ckpt_activate_next(struct ckpt_ctx *ctx)
>  {
>  	struct task_struct *task;
> _______________________________________________
> Containers mailing list
> Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
> https://lists.linux-foundation.org/mailman/listinfo/containers