That was my mail software messing around with tabs in the patch. Will re-send again.
-- Best Regards, Stanisław Kardach On Wed, Dec 28, 2016 at 3:00 PM, Christophe Milard < [email protected]> wrote: > This seems a good correction. However I get the following when > applying this patch: > git am ~/incoming/lng-odp_PATCH_helper_do_not_break_odp_term_ > global_protocol.mbox > Applying: helper: do not break odp_term_global protocol > error: patch failed: helper/linux.c:42 > error: helper/linux.c: patch does not apply > Patch failed at 0001 helper: do not break odp_term_global protocol > The copy of the patch that failed is found in: .git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git st > On branch master > Your branch is up-to-date with 'origin/master'. > > > needs rebase? > > Christophe > > On 28 December 2016 at 14:23, Stanislaw Kardach <[email protected]> wrote: > > As per API documentation, odp_term_global() should be a final ODP call > > when terminating the ODP application in a controlled way. Therefore ODP > > threads or sub-processes created using ODP helper API should not call > > this function but leave it to the main application thread/process. > > > > Signed-off-by: Stanislaw Kardach <[email protected]> > > --- > > helper/linux.c | 4 ---- > > 1 file changed, 4 deletions(-) > > > > diff --git a/helper/linux.c b/helper/linux.c > > index 7bd0b07..1f009cd 100644 > > --- a/helper/linux.c > > +++ b/helper/linux.c > > @@ -42,8 +42,6 @@ static void *odp_run_start_routine(void *arg) > > > > if (ret < 0) > > ODPH_ERR("Local term failed\n"); > > - else if (ret == 0 && odp_term_global(thr_params->instance)) > > - ODPH_ERR("Global term failed\n"); > > > > return ret_ptr; > > } > > @@ -277,8 +275,6 @@ static void *odpthread_run_start_routine(void *arg) > > > > if (ret < 0) > > ODPH_ERR("Local term failed\n"); > > - else if (ret == 0 && odp_term_global(thr_params->instance)) > > - ODPH_ERR("Global term failed\n"); > > > > /* for process implementation of odp threads, just return > status... > > */ > > if (start_args->linuxtype == ODPTHREAD_PROCESS) > > -- > > 2.7.4 >
