diff options
author | Xiubo Li <xiubli@redhat.com> | 2019-07-26 12:34:52 +0800 |
---|---|---|
committer | Rinku Kothiya <rkothiya@redhat.com> | 2019-08-21 06:13:38 +0000 |
commit | acbabe3d916d763a0bb13e7df876cac61ca5b160 (patch) | |
tree | 8eeb15421811083a19c49bc3322500febbe53a5a /api | |
parent | d89199919265480e43172dd3883c20ee24d46bde (diff) |
event: rename event_XXX with gf_ prefixed
I hit one crash issue when using the libgfapi.
In the libgfapi it will call glfs_poller() --> event_dispatch()
in file api/src/glfs.c:721, and the event_dispatch() is defined
by libgluster locally, the problem is the name of event_dispatch()
is the extremly the same with the one from libevent package form
the OS.
For example, if a executable program Foo, which will also use and
link the libevent and the libgfapi at the same time, I can hit the
crash, like:
kernel: glfs_glfspoll[68486]: segfault at 1c0 ip 00007fef006fd2b8 sp
00007feeeaffce30 error 4 in libevent-2.0.so.5.1.9[7fef006ed000+46000]
The link for Foo is:
lib_foo_LADD = -levent $(GFAPI_LIBS)
It will crash.
This is because the glfs_poller() is calling the event_dispatch() from
the libevent, not the libglsuter.
The gfapi link info :
GFAPI_LIBS = -lacl -lgfapi -lglusterfs -lgfrpc -lgfxdr -luuid
If I link Foo like:
lib_foo_LADD = $(GFAPI_LIBS) -levent
It will works well without any problem.
And if Foo call one private lib, such as handler_glfs.so, and the
handler_glfs.so will link the GFAPI_LIBS directly, while the Foo won't
and it will dlopen(handler_glfs.so), then the crash will be hit everytime.
The link info will be:
foo_LADD = -levent
libhandler_glfs_LIBADD = $(GFAPI_LIBS)
I can avoid the crash temporarily by linking the GFAPI_LIBS in Foo too like:
foo_LADD = $(GFAPI_LIBS) -levent
libhandler_glfs_LIBADD = $(GFAPI_LIBS)
But this is ugly since the Foo won't use any APIs from the GFAPI_LIBS.
And in some cases when the --as-needed link option is added(on many dists
it is added as default), then the crash is back again, the above workaround
won't work.
Backport of:
> https://review.gluster.org/#/c/glusterfs/+/23110/
> Change-Id: I38f0200b941bd1cff4bf3066fca2fc1f9a5263aa
> Fixes: #699
> Signed-off-by: Xiubo Li <xiubli@redhat.com>
Change-Id: I38f0200b941bd1cff4bf3066fca2fc1f9a5263aa
updates: bz#1740519
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 799edc73c3d4f694c365c6a7c27c9ab8eed5f260)
Diffstat (limited to 'api')
-rw-r--r-- | api/src/glfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/api/src/glfs.c b/api/src/glfs.c index d13a99cc124..98054b6bdb6 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -92,8 +92,8 @@ glusterfs_ctx_defaults_init(glusterfs_ctx_t *ctx) goto err; } - ctx->event_pool = event_pool_new(DEFAULT_EVENT_POOL_SIZE, - STARTING_EVENT_THREADS); + ctx->event_pool = gf_event_pool_new(DEFAULT_EVENT_POOL_SIZE, + STARTING_EVENT_THREADS); if (!ctx->event_pool) { goto err; } @@ -725,7 +725,7 @@ glfs_poller(void *data) fs = data; - event_dispatch(fs->ctx->event_pool); + gf_event_dispatch(fs->ctx->event_pool); return NULL; } @@ -1189,7 +1189,7 @@ glusterfs_ctx_destroy(glusterfs_ctx_t *ctx) } /* Free the event pool */ - ret = event_pool_destroy(ctx->event_pool); + ret = gf_event_pool_destroy(ctx->event_pool); /* Free the iobuf pool */ iobuf_pool_destroy(ctx->iobuf_pool); @@ -1359,7 +1359,7 @@ pub_glfs_fini(struct glfs *fs) syncenv_destroy(ctx->env); /* Join the poller thread */ - if (event_dispatch_destroy(ctx->event_pool) < 0) + if (gf_event_dispatch_destroy(ctx->event_pool) < 0) ret = -1; } |