Attachment 13414 Details for Bug 12928 – Patches for v4-7-test

[patch] Patches for v4-7-test

tmp47.diff.txt (text/plain), 10.99 KB, created by Stefan Metzmacher on 2017-07-22 22:35:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2017-07-22 22:35:01 UTC

Size: 10.99 KB

patch

obsolete

>From 4aeae6f461c7e8dd0adbf6e748730e451ec7b9e4 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 20 Jul 2017 14:16:44 +0200
>Subject: [PATCH 1/3] tevent: avoid calling talloc_get_name(NULL) in
> tevent_req_default_print()
>
>We have the same information available under req->internal.private_type.
>
>This way it's possible to call tevent_req_print() after
>tevent_req_received() was called.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit 21b56ffd983cc0b982bea55866bfa84c79133503)
>---
> lib/tevent/tevent_req.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
>index 22f7a4f..155746e 100644
>--- a/lib/tevent/tevent_req.c
>+++ b/lib/tevent/tevent_req.c
>@@ -36,7 +36,7 @@ char *tevent_req_default_print(struct tevent_req *req, TALLOC_CTX *mem_ctx)
> 			       req->internal.state,
> 			       (unsigned long long)req->internal.error,
> 			       (unsigned long long)req->internal.error,
>-			       talloc_get_name(req->data),
>+			       req->internal.private_type,
> 			       req->data,
> 			       req->internal.timer,
> 			       req->internal.finish_location
>-- 
>1.9.1
>
>
>From 5e1aefca0ed0f9060fc412012568b2bec39ae036 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 20 Jul 2017 14:20:03 +0200
>Subject: [PATCH 2/3] tevent: handle passing req = NULL to tevent_req_print()
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit ca3e98488a45aa143e4ba454b4ba8763f09a6f50)
>---
> lib/tevent/tevent_req.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
>index 155746e..15754d3 100644
>--- a/lib/tevent/tevent_req.c
>+++ b/lib/tevent/tevent_req.c
>@@ -45,6 +45,10 @@ char *tevent_req_default_print(struct tevent_req *req, TALLOC_CTX *mem_ctx)
> 
> char *tevent_req_print(TALLOC_CTX *mem_ctx, struct tevent_req *req)
> {
>+	if (req == NULL) {
>+		return talloc_strdup(mem_ctx, "tevent_req[NULL]");
>+	}
>+
> 	if (!req->private_print) {
> 		return tevent_req_default_print(req, mem_ctx);
> 	}
>-- 
>1.9.1
>
>
>From aefd9d7e3f01f3ddbbed8e103145c831a4693248 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 21 Jul 2017 14:34:59 +0200
>Subject: [PATCH 3/3] tevent: version 0.9.33
>
>* make tevent_req_print() more robust against crashes
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit 7ad3a99d462e4a43c9f64b0877111d5e58f56e6e)
>---
> lib/tevent/ABI/tevent-0.9.33.sigs | 99 +++++++++++++++++++++++++++++++++++++++
> lib/tevent/wscript                |  2 +-
> 2 files changed, 100 insertions(+), 1 deletion(-)
> create mode 100644 lib/tevent/ABI/tevent-0.9.33.sigs
>
>diff --git a/lib/tevent/ABI/tevent-0.9.33.sigs b/lib/tevent/ABI/tevent-0.9.33.sigs
>new file mode 100644
>index 0000000..7a6a236
>--- /dev/null
>+++ b/lib/tevent/ABI/tevent-0.9.33.sigs
>@@ -0,0 +1,99 @@
>+_tevent_add_fd: struct tevent_fd *(struct tevent_context *, TALLOC_CTX *, int, uint16_t, tevent_fd_handler_t, void *, const char *, const char *)
>+_tevent_add_signal: struct tevent_signal *(struct tevent_context *, TALLOC_CTX *, int, int, tevent_signal_handler_t, void *, const char *, const char *)
>+_tevent_add_timer: struct tevent_timer *(struct tevent_context *, TALLOC_CTX *, struct timeval, tevent_timer_handler_t, void *, const char *, const char *)
>+_tevent_create_immediate: struct tevent_immediate *(TALLOC_CTX *, const char *)
>+_tevent_loop_once: int (struct tevent_context *, const char *)
>+_tevent_loop_until: int (struct tevent_context *, bool (*)(void *), void *, const char *)
>+_tevent_loop_wait: int (struct tevent_context *, const char *)
>+_tevent_queue_create: struct tevent_queue *(TALLOC_CTX *, const char *, const char *)
>+_tevent_req_callback_data: void *(struct tevent_req *)
>+_tevent_req_cancel: bool (struct tevent_req *, const char *)
>+_tevent_req_create: struct tevent_req *(TALLOC_CTX *, void *, size_t, const char *, const char *)
>+_tevent_req_data: void *(struct tevent_req *)
>+_tevent_req_done: void (struct tevent_req *, const char *)
>+_tevent_req_error: bool (struct tevent_req *, uint64_t, const char *)
>+_tevent_req_nomem: bool (const void *, struct tevent_req *, const char *)
>+_tevent_req_notify_callback: void (struct tevent_req *, const char *)
>+_tevent_req_oom: void (struct tevent_req *, const char *)
>+_tevent_schedule_immediate: void (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *)
>+_tevent_threaded_schedule_immediate: void (struct tevent_threaded_context *, struct tevent_immediate *, tevent_immediate_handler_t, void *, const char *, const char *)
>+tevent_backend_list: const char **(TALLOC_CTX *)
>+tevent_cleanup_pending_signal_handlers: void (struct tevent_signal *)
>+tevent_common_add_fd: struct tevent_fd *(struct tevent_context *, TALLOC_CTX *, int, uint16_t, tevent_fd_handler_t, void *, const char *, const char *)
>+tevent_common_add_signal: struct tevent_signal *(struct tevent_context *, TALLOC_CTX *, int, int, tevent_signal_handler_t, void *, const char *, const char *)
>+tevent_common_add_timer: struct tevent_timer *(struct tevent_context *, TALLOC_CTX *, struct timeval, tevent_timer_handler_t, void *, const char *, const char *)
>+tevent_common_add_timer_v2: struct tevent_timer *(struct tevent_context *, TALLOC_CTX *, struct timeval, tevent_timer_handler_t, void *, const char *, const char *)
>+tevent_common_check_signal: int (struct tevent_context *)
>+tevent_common_context_destructor: int (struct tevent_context *)
>+tevent_common_fd_destructor: int (struct tevent_fd *)
>+tevent_common_fd_get_flags: uint16_t (struct tevent_fd *)
>+tevent_common_fd_set_close_fn: void (struct tevent_fd *, tevent_fd_close_fn_t)
>+tevent_common_fd_set_flags: void (struct tevent_fd *, uint16_t)
>+tevent_common_have_events: bool (struct tevent_context *)
>+tevent_common_loop_immediate: bool (struct tevent_context *)
>+tevent_common_loop_timer_delay: struct timeval (struct tevent_context *)
>+tevent_common_loop_wait: int (struct tevent_context *, const char *)
>+tevent_common_schedule_immediate: void (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *)
>+tevent_common_threaded_activate_immediate: void (struct tevent_context *)
>+tevent_common_wakeup: int (struct tevent_context *)
>+tevent_common_wakeup_fd: int (int)
>+tevent_common_wakeup_init: int (struct tevent_context *)
>+tevent_context_init: struct tevent_context *(TALLOC_CTX *)
>+tevent_context_init_byname: struct tevent_context *(TALLOC_CTX *, const char *)
>+tevent_context_init_ops: struct tevent_context *(TALLOC_CTX *, const struct tevent_ops *, void *)
>+tevent_debug: void (struct tevent_context *, enum tevent_debug_level, const char *, ...)
>+tevent_fd_get_flags: uint16_t (struct tevent_fd *)
>+tevent_fd_set_auto_close: void (struct tevent_fd *)
>+tevent_fd_set_close_fn: void (struct tevent_fd *, tevent_fd_close_fn_t)
>+tevent_fd_set_flags: void (struct tevent_fd *, uint16_t)
>+tevent_get_trace_callback: void (struct tevent_context *, tevent_trace_callback_t *, void *)
>+tevent_loop_allow_nesting: void (struct tevent_context *)
>+tevent_loop_set_nesting_hook: void (struct tevent_context *, tevent_nesting_hook, void *)
>+tevent_num_signals: size_t (void)
>+tevent_queue_add: bool (struct tevent_queue *, struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *)
>+tevent_queue_add_entry: struct tevent_queue_entry *(struct tevent_queue *, struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *)
>+tevent_queue_add_optimize_empty: struct tevent_queue_entry *(struct tevent_queue *, struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *)
>+tevent_queue_length: size_t (struct tevent_queue *)
>+tevent_queue_running: bool (struct tevent_queue *)
>+tevent_queue_start: void (struct tevent_queue *)
>+tevent_queue_stop: void (struct tevent_queue *)
>+tevent_queue_wait_recv: bool (struct tevent_req *)
>+tevent_queue_wait_send: struct tevent_req *(TALLOC_CTX *, struct tevent_context *, struct tevent_queue *)
>+tevent_re_initialise: int (struct tevent_context *)
>+tevent_register_backend: bool (const char *, const struct tevent_ops *)
>+tevent_req_default_print: char *(struct tevent_req *, TALLOC_CTX *)
>+tevent_req_defer_callback: void (struct tevent_req *, struct tevent_context *)
>+tevent_req_is_error: bool (struct tevent_req *, enum tevent_req_state *, uint64_t *)
>+tevent_req_is_in_progress: bool (struct tevent_req *)
>+tevent_req_poll: bool (struct tevent_req *, struct tevent_context *)
>+tevent_req_post: struct tevent_req *(struct tevent_req *, struct tevent_context *)
>+tevent_req_print: char *(TALLOC_CTX *, struct tevent_req *)
>+tevent_req_received: void (struct tevent_req *)
>+tevent_req_reset_endtime: void (struct tevent_req *)
>+tevent_req_set_callback: void (struct tevent_req *, tevent_req_fn, void *)
>+tevent_req_set_cancel_fn: void (struct tevent_req *, tevent_req_cancel_fn)
>+tevent_req_set_cleanup_fn: void (struct tevent_req *, tevent_req_cleanup_fn)
>+tevent_req_set_endtime: bool (struct tevent_req *, struct tevent_context *, struct timeval)
>+tevent_req_set_print_fn: void (struct tevent_req *, tevent_req_print_fn)
>+tevent_sa_info_queue_count: size_t (void)
>+tevent_set_abort_fn: void (void (*)(const char *))
>+tevent_set_debug: int (struct tevent_context *, void (*)(void *, enum tevent_debug_level, const char *, va_list), void *)
>+tevent_set_debug_stderr: int (struct tevent_context *)
>+tevent_set_default_backend: void (const char *)
>+tevent_set_trace_callback: void (struct tevent_context *, tevent_trace_callback_t, void *)
>+tevent_signal_support: bool (struct tevent_context *)
>+tevent_thread_proxy_create: struct tevent_thread_proxy *(struct tevent_context *)
>+tevent_thread_proxy_schedule: void (struct tevent_thread_proxy *, struct tevent_immediate **, tevent_immediate_handler_t, void *)
>+tevent_threaded_context_create: struct tevent_threaded_context *(TALLOC_CTX *, struct tevent_context *)
>+tevent_timeval_add: struct timeval (const struct timeval *, uint32_t, uint32_t)
>+tevent_timeval_compare: int (const struct timeval *, const struct timeval *)
>+tevent_timeval_current: struct timeval (void)
>+tevent_timeval_current_ofs: struct timeval (uint32_t, uint32_t)
>+tevent_timeval_is_zero: bool (const struct timeval *)
>+tevent_timeval_set: struct timeval (uint32_t, uint32_t)
>+tevent_timeval_until: struct timeval (const struct timeval *, const struct timeval *)
>+tevent_timeval_zero: struct timeval (void)
>+tevent_trace_point_callback: void (struct tevent_context *, enum tevent_trace_point)
>+tevent_update_timer: void (struct tevent_timer *, struct timeval)
>+tevent_wakeup_recv: bool (struct tevent_req *)
>+tevent_wakeup_send: struct tevent_req *(TALLOC_CTX *, struct tevent_context *, struct timeval)
>diff --git a/lib/tevent/wscript b/lib/tevent/wscript
>index 54f216d..bc874bb 100644
>--- a/lib/tevent/wscript
>+++ b/lib/tevent/wscript
>@@ -1,7 +1,7 @@
> #!/usr/bin/env python
> 
> APPNAME = 'tevent'
>-VERSION = '0.9.32'
>+VERSION = '0.9.33'
> 
> blddir = 'bin'
> 
>-- 
>1.9.1
>

Flags:

abartlet: review+
metze: review? (slow)

Actions: View

Attachments on bug 12928: 13414