sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

messaging3: Only store the pid in messaging_dgm_context

Browse Source 
That's all we need here

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2014-07-25 11:03:11 +00:00 committed by Jeremy Allison
parent 6e6342055a
commit bff27ee783
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/lib/messages_dgm.c
View File

@ -28,7 +28,7 @@
#include "unix_msg/unix_msg.h" #include "unix_msg/unix_msg.h"
struct messaging_dgm_context { struct messaging_dgm_context {
struct server_id pid; pid_t pid;
struct poll_funcs *msg_callbacks; struct poll_funcs *msg_callbacks;
void *tevent_handle; void *tevent_handle;
struct unix_msg_ctx *dgm_ctx; struct unix_msg_ctx *dgm_ctx;
@ -199,7 +199,7 @@ int messaging_dgm_init(TALLOC_CTX *mem_ctx,
if (ctx == NULL) { if (ctx == NULL) {
goto fail_nomem; goto fail_nomem;
} }
ctx->pid = pid; ctx->pid = pid.pid;
ctx->recv_cb = recv_cb; ctx->recv_cb = recv_cb;
ctx->recv_cb_private_data = recv_cb_private_data; ctx->recv_cb_private_data = recv_cb_private_data;
@ -274,16 +274,14 @@ fail_nomem:
static int messaging_dgm_context_destructor(struct messaging_dgm_context *c) static int messaging_dgm_context_destructor(struct messaging_dgm_context *c)
{ {
struct server_id pid = c->pid;
/* /*
* First delete the socket to avoid races. The lockfile is the * First delete the socket to avoid races. The lockfile is the
* indicator that we're still around. * indicator that we're still around.
*/ */
unix_msg_free(c->dgm_ctx); unix_msg_free(c->dgm_ctx);
if (getpid() == pid.pid) { if (getpid() == c->pid) {
(void)messaging_dgm_lockfile_remove(c, c->cache_dir, pid.pid); (void)messaging_dgm_lockfile_remove(c, c->cache_dir, c->pid);
} }
close(c->lockfile_fd); close(c->lockfile_fd);