summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2019-01-29 13:13:50 +0100
committerAnton Khirnov <anton@khirnov.net>2019-01-29 13:14:58 +0100
commit51da2faa7a1fb204ce24081273e49910d66e1c37 (patch)
tree77cca5679cd0abde3626b0a6c33309c86a5f4e8f
parent3ee39d71042e04f8c5b929b1a4a0cd35436b6665 (diff)
Fix callback type mismatch
-rw-r--r--ell_grid_solve.c8
-rw-r--r--mg2d.c3
2 files changed, 8 insertions, 3 deletions
diff --git a/ell_grid_solve.c b/ell_grid_solve.c
index 5b6e586..370deab 100644
--- a/ell_grid_solve.c
+++ b/ell_grid_solve.c
@@ -243,7 +243,7 @@ static void residual_calc_line_s2_c(size_t linesize, double *dst, double *dst_ma
*dst_max = MAX(*dst_max, res_max);
}
-static void residual_calc_task(void *arg, unsigned int job_idx, unsigned int thread_idx)
+static int residual_calc_task(void *arg, unsigned int job_idx, unsigned int thread_idx)
{
EGSContext *ctx = arg;
EGSInternal *priv = ctx->priv;
@@ -257,6 +257,8 @@ static void residual_calc_task(void *arg, unsigned int job_idx, unsigned int thr
priv->residual_max + thread_idx * priv->calc_blocksize,
priv->stride, ctx->u + offset, ctx->rhs + offset,
diff_coeffs, priv->fd_factors);
+
+ return 0;
}
static void residual_calc(EGSContext *ctx)
@@ -406,7 +408,7 @@ static void boundaries_apply(EGSContext *ctx)
ctx->count_boundaries++;
}
-static void residual_add_task(void *arg, unsigned int job_idx, unsigned int thread_idx)
+static int residual_add_task(void *arg, unsigned int job_idx, unsigned int thread_idx)
{
EGSContext *ctx = arg;
EGSInternal *priv = ctx->priv;
@@ -416,6 +418,8 @@ static void residual_add_task(void *arg, unsigned int job_idx, unsigned int thre
ctx->u[idx] += priv->r.relax_factor * ctx->residual[idx];
}
+
+ return 0;
}
static int solve_relax_step(EGSContext *ctx)
diff --git a/mg2d.c b/mg2d.c
index a65af6c..003b88d 100644
--- a/mg2d.c
+++ b/mg2d.c
@@ -215,7 +215,7 @@ static void mg_interp_bilinear(TPContext *tp,
tp_execute(tp, ctx_dst->domain_size[1], mg_interp_bilinear_kernel, &ip);
}
-static void coarse_correct_task(void *arg, unsigned int job_idx, unsigned int thread_idx)
+static int coarse_correct_task(void *arg, unsigned int job_idx, unsigned int thread_idx)
{
MG2DLevel *level = arg;
@@ -224,6 +224,7 @@ static void coarse_correct_task(void *arg, unsigned int job_idx, unsigned int th
const ptrdiff_t idx_src = job_idx * level->prolong_tmp_stride + idx0;
level->solver->u[idx_dst] -= level->prolong_tmp[idx_src];
}
+ return 0;
}
static void restrict_residual(MG2DContext *ctx, MG2DLevel *dst, MG2DLevel *src)