diff options
| -rw-r--r-- | libglusterfs/src/syncop.c | 29 | ||||
| -rw-r--r-- | libglusterfs/src/syncop.h | 10 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker-quota.c | 4 | ||||
| -rw-r--r-- | xlators/features/qemu-block/src/coroutine-synctask.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 2 |
5 files changed, 33 insertions, 14 deletions
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c index f56a21d11b9..9b0d7aa745a 100644 --- a/libglusterfs/src/syncop.c +++ b/libglusterfs/src/syncop.c @@ -437,8 +437,8 @@ synctask_setid (struct synctask *task, uid_t uid, gid_t gid) struct synctask * -synctask_create (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk, - call_frame_t *frame, void *opaque) +synctask_create (struct syncenv *env, size_t stacksize, synctask_fn_t fn, + synctask_cbk_t cbk, call_frame_t *frame, void *opaque) { struct synctask *newtask = NULL; xlator_t *this = THIS; @@ -493,13 +493,21 @@ synctask_create (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk, goto err; } - newtask->stack = GF_CALLOC (1, env->stacksize, gf_common_mt_syncstack); + if (stacksize <= 0) { + newtask->stack = GF_CALLOC (1, env->stacksize, + gf_common_mt_syncstack); + newtask->ctx.uc_stack.ss_size = env->stacksize; + } else { + newtask->stack = GF_CALLOC (1, stacksize, + gf_common_mt_syncstack); + newtask->ctx.uc_stack.ss_size = stacksize; + } + if (!newtask->stack) { goto err; } newtask->ctx.uc_stack.ss_sp = newtask->stack; - newtask->ctx.uc_stack.ss_size = env->stacksize; makecontext (&newtask->ctx, (void (*)(void)) synctask_wrap, 2, newtask); @@ -554,13 +562,13 @@ synctask_join (struct synctask *task) int -synctask_new (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk, - call_frame_t *frame, void *opaque) +synctask_new1 (struct syncenv *env, size_t stacksize, synctask_fn_t fn, + synctask_cbk_t cbk, call_frame_t *frame, void *opaque) { struct synctask *newtask = NULL; int ret = 0; - newtask = synctask_create (env, fn, cbk, frame, opaque); + newtask = synctask_create (env, stacksize, fn, cbk, frame, opaque); if (!newtask) return -1; @@ -571,6 +579,13 @@ synctask_new (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk, } +int +synctask_new (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk, + call_frame_t *frame, void *opaque) +{ + return synctask_new1 (env, 0, fn, cbk, frame, opaque); +} + struct synctask * syncenv_task (struct syncproc *proc) { diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h index 7779fada109..2cdedc0fc11 100644 --- a/libglusterfs/src/syncop.h +++ b/libglusterfs/src/syncop.h @@ -259,9 +259,13 @@ struct syncenv * syncenv_new (size_t stacksize, int procmin, int procmax); void syncenv_destroy (struct syncenv *); void syncenv_scale (struct syncenv *env); -int synctask_new (struct syncenv *, synctask_fn_t, synctask_cbk_t, call_frame_t* frame, void *); -struct synctask *synctask_create (struct syncenv *, synctask_fn_t, - synctask_cbk_t, call_frame_t *, void *); +int synctask_new1 (struct syncenv *, size_t stacksize, synctask_fn_t, + synctask_cbk_t, call_frame_t *frame, void *); +int synctask_new (struct syncenv *, synctask_fn_t, synctask_cbk_t, + call_frame_t *frame, void *); +struct synctask *synctask_create (struct syncenv *, size_t stacksize, + synctask_fn_t, synctask_cbk_t, call_frame_t *, + void *); int synctask_join (struct synctask *task); void synctask_wake (struct synctask *task); void synctask_yield (struct synctask *task); diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index 17ac85a05d8..00488c8407a 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -2820,8 +2820,8 @@ mq_synctask (xlator_t *this, synctask_fn_t task, gf_boolean_t spawn, loc_t *loc, args->contri = contri; if (spawn) { - ret = synctask_new (this->ctx->env, task, mq_synctask_cleanup, - NULL, args); + ret = synctask_new1 (this->ctx->env, 1024 * 16, task, + mq_synctask_cleanup, NULL, args); if (ret) { gf_log (this->name, GF_LOG_ERROR, "Failed to spawn " "new synctask"); diff --git a/xlators/features/qemu-block/src/coroutine-synctask.c b/xlators/features/qemu-block/src/coroutine-synctask.c index 68aef854072..d7d43831af4 100644 --- a/xlators/features/qemu-block/src/coroutine-synctask.c +++ b/xlators/features/qemu-block/src/coroutine-synctask.c @@ -100,7 +100,7 @@ qb_coroutine (call_frame_t *frame, synctask_fn_t fn) LOCK(&qb_co.lock); if (!qb_co.task) - qb_co.task = synctask_create(qb_conf->env, qb_synctask_wrap, + qb_co.task = synctask_create(qb_conf->env, 0, qb_synctask_wrap, synctask_nop_cbk, frame, NULL); list_add_tail(&qb_local->list, &qb_co.queue); diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 710407d2159..448ee7908c7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -2229,9 +2229,9 @@ static volgen_brick_xlator_t server_graph_table[] = { {brick_graph_add_ro, NULL}, {brick_graph_add_worm, NULL}, {brick_graph_add_quota, "quota"}, - {brick_graph_add_marker, "marker"}, {brick_graph_add_index, "index"}, {brick_graph_add_barrier, NULL}, + {brick_graph_add_marker, "marker"}, {brick_graph_add_iot, "io-threads"}, {brick_graph_add_upcall, "upcall"}, {brick_graph_add_pump, NULL}, |