Hi Gilles,
Please try to avoid creating merge-of-master commits like 68bec0ae ("Merge
branch 'master' of..."), they just clutter the history. A rebase is almost
always more appropriate in this situation.
https://github.com/open-mpi/ompi/wiki/GitBestPractices
If you created that commit with "git pull", you can perform the rebase
equivalent by running "git pull --rebase". If this doesn't make sense, just
let me know and I can explain further and/or improve the docs around this.
Thanks,
-Dave
On Oct 31, 2014, at 2:35 AM, [email protected] wrote:
> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "open-mpi/ompi".
>
> The branch, master has been updated
> via 68bec0ae1f022e095c132b3f8c7317238b318416 (commit)
> via 76ee98c86a7dafc922d342bc4c819ecc3ee14f52 (commit)
> from 672d96704cc165b91c7bcf263e97704affcd5f20 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -----------------------------------------------------------------
> https://github.com/open-mpi/ompi/commit/68bec0ae1f022e095c132b3f8c7317238b318416
>
> commit 68bec0ae1f022e095c132b3f8c7317238b318416
> Merge: 76ee98c 672d967
> Author: Gilles Gouaillardet <[email protected]>
> Date: Fri Oct 31 16:34:43 2014 +0900
>
> Merge branch 'master' of https://github.com/open-mpi/ompi
>
>
>
> https://github.com/open-mpi/ompi/commit/76ee98c86a7dafc922d342bc4c819ecc3ee14f52
>
> commit 76ee98c86a7dafc922d342bc4c819ecc3ee14f52
> Author: Gilles Gouaillardet <[email protected]>
> Date: Fri Oct 31 16:34:02 2014 +0900
>
> btl/scif: start the listening thread once only
>
> diff --git a/opal/mca/btl/scif/btl_scif.h b/opal/mca/btl/scif/btl_scif.h
> index 741fda8..b8d9aab 100644
> --- a/opal/mca/btl/scif/btl_scif.h
> +++ b/opal/mca/btl/scif/btl_scif.h
> @@ -93,6 +93,7 @@ typedef struct mca_btl_scif_module_t {
> pthread_t listen_thread;
>
> volatile bool exiting;
> + bool listening;
> } mca_btl_scif_module_t;
>
> typedef struct mca_btl_scif_component_t {
> diff --git a/opal/mca/btl/scif/btl_scif_add_procs.c
> b/opal/mca/btl/scif/btl_scif_add_procs.c
> index 80da884..4a6d838 100644
> --- a/opal/mca/btl/scif/btl_scif_add_procs.c
> +++ b/opal/mca/btl/scif/btl_scif_add_procs.c
> @@ -98,10 +98,13 @@ int mca_btl_scif_add_procs(struct mca_btl_base_module_t*
> btl,
>
> scif_module->endpoint_count = procs_on_board;
>
> - /* start listening thread */
> - rc = pthread_create (&mca_btl_scif_module.listen_thread, NULL,
> mca_btl_scif_connect_accept, NULL);
> - if (0 > rc) {
> - return OPAL_ERROR;
> + if (!mca_btl_scif_module.listening) {
> + /* start listening thread */
> + rc = pthread_create (&mca_btl_scif_module.listen_thread, NULL,
> mca_btl_scif_connect_accept, NULL);
> + if (0 > rc) {
> + return OPAL_ERROR;
> + }
> + mca_btl_scif_module.listening = true;
> }
>
> return OPAL_SUCCESS;
> diff --git a/opal/mca/btl/scif/btl_scif_component.c
> b/opal/mca/btl/scif/btl_scif_component.c
> index 7600b12..61bf2d1 100644
> --- a/opal/mca/btl/scif/btl_scif_component.c
> +++ b/opal/mca/btl/scif/btl_scif_component.c
> @@ -267,6 +267,7 @@ static mca_btl_base_module_t
> **mca_btl_scif_component_init (int *num_btl_modules
>
> base_modules[0] = &mca_btl_scif_module.super;
> mca_btl_scif_module.exiting = false;
> + mca_btl_scif_module.listening = false;
>
> rc = mca_btl_scif_modex_send ();
> if (OPAL_SUCCESS != rc) {
> diff --git a/opal/mca/btl/scif/btl_scif_module.c
> b/opal/mca/btl/scif/btl_scif_module.c
> index 7777cfb..fb36b7b 100644
> --- a/opal/mca/btl/scif/btl_scif_module.c
> +++ b/opal/mca/btl/scif/btl_scif_module.c
> @@ -126,7 +126,7 @@ mca_btl_scif_module_finalize (struct
> mca_btl_base_module_t *btl)
> }
>
> /* close the listening endpoint */
> - if (-1 != mca_btl_scif_module.scif_fd) {
> + if (mca_btl_scif_module.listening && -1 != mca_btl_scif_module.scif_fd) {
> /* wake up the scif thread */
> scif_epd_t tmpfd;
> tmpfd = scif_open();
>
>
> -----------------------------------------------------------------------
>
> Summary of changes:
> opal/mca/btl/scif/btl_scif.h | 1 +
> opal/mca/btl/scif/btl_scif_add_procs.c | 11 +++++++----
> opal/mca/btl/scif/btl_scif_component.c | 1 +
> opal/mca/btl/scif/btl_scif_module.c | 2 +-
> 4 files changed, 10 insertions(+), 5 deletions(-)
>
>
> hooks/post-receive
> --
> open-mpi/ompi
> _______________________________________________
> ompi-commits mailing list
> [email protected]
> http://www.open-mpi.org/mailman/listinfo.cgi/ompi-commits
