1
1

As discussed at the OMPI developer's meeting, add functions to start, stop, and restart libevent-driven progress threads. Critical NOTE: if you don't have a file descriptor event defined for your progress thread, it will spin hard! Accordingly, the "start progress thread" function has a boolean parameter you can use to request that the function automatically create one for you.

This commit was SVN r32137.
Этот коммит содержится в:
Ralph Castain 2014-07-03 18:56:46 +00:00
родитель 9f97c74ba3
Коммит f6d4b4c11b
3 изменённых файлов: 217 добавлений и 2 удалений

Просмотреть файл

@ -12,6 +12,7 @@
# All rights reserved.
# Copyright (c) 2012 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2014 Intel, Inc. All rights reserved
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -33,7 +34,8 @@ headers += \
runtime/opal.h \
runtime/opal_cr.h \
runtime/opal_info_support.h \
runtime/opal_params.h
runtime/opal_params.h \
runtime/opal_progress_threads.h
libopen_pal_la_SOURCES += \
runtime/opal_progress.c \
@ -41,4 +43,5 @@ libopen_pal_la_SOURCES += \
runtime/opal_init.c \
runtime/opal_params.c \
runtime/opal_cr.c \
runtime/opal_info_support.c
runtime/opal_info_support.c \
runtime/opal_progress_threads.c

178
opal/runtime/opal_progress_threads.c Обычный файл
Просмотреть файл

@ -0,0 +1,178 @@
/*
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/
#include "opal_config.h"
#include "opal/constants.h"
#include "opal/class/opal_list.h"
#include "opal/mca/event/event.h"
#include "opal/threads/threads.h"
#include "opal/util/error.h"
#include "opal/util/fd.h"
#include "opal/runtime/opal_progress_threads.h"
/* create a tracking object for progress threads */
typedef struct {
opal_list_item_t super;
char *name;
opal_event_base_t *ev_base;
bool block_active;
opal_event_t block;
bool engine_defined;
opal_thread_t engine;
int pipe[2];
} opal_progress_tracker_t;
static void trkcon(opal_progress_tracker_t *p)
{
p->name = NULL;
p->ev_base = NULL;
p->block_active = false;
p->engine_defined = false;
p->pipe[0] = -1;
p->pipe[1] = -1;
}
static void trkdes(opal_progress_tracker_t *p)
{
if (NULL != p->name) {
free(p->name);
}
if (p->block_active) {
opal_event_del(&p->block);
}
if (NULL != p->ev_base) {
opal_event_base_free(p->ev_base);
}
if (0 <= p->pipe[0]) {
close(p->pipe[0]);
}
if (0 <= p->pipe[1]) {
close(p->pipe[1]);
}
if (p->engine_defined) {
OBJ_DESTRUCT(&p->engine);
}
}
static OBJ_CLASS_INSTANCE(opal_progress_tracker_t,
opal_list_item_t,
trkcon, trkdes);
static opal_list_t tracking;
static bool inited = false;
static void wakeup(int fd, short args, void *cbdata)
{
opal_output(0, "progress:wakeup invoked");
}
opal_event_base_t *opal_start_progress_thread(char *name,
opal_thread_fn_t func,
bool create_block)
{
opal_progress_tracker_t *trk;
int rc;
trk = OBJ_NEW(opal_progress_tracker_t);
trk->name = strdup(name);
if (NULL == (trk->ev_base = opal_event_base_create())) {
OPAL_ERROR_LOG(OPAL_ERR_OUT_OF_RESOURCE);
OBJ_RELEASE(trk);
return NULL;
}
if (create_block) {
/* add an event it can block on */
if (0 > pipe(trk->pipe)) {
OPAL_ERROR_LOG(OPAL_ERR_IN_ERRNO);
OBJ_RELEASE(trk);
return NULL;
}
/* Make sure the pipe FDs are set to close-on-exec so that
they don't leak into children */
if (opal_fd_set_cloexec(trk->pipe[0]) != OPAL_SUCCESS ||
opal_fd_set_cloexec(trk->pipe[1]) != OPAL_SUCCESS) {
OPAL_ERROR_LOG(OPAL_ERR_IN_ERRNO);
OBJ_RELEASE(trk);
return NULL;
}
opal_event_set(trk->ev_base, &trk->block, trk->pipe[0], OPAL_EV_READ, wakeup, NULL);
opal_event_add(&trk->block, 0);
trk->block_active = true;
}
/* construct the thread object */
OBJ_CONSTRUCT(&trk->engine, opal_thread_t);
trk->engine_defined = true;
/* fork off a thread to progress it */
trk->engine.t_run = func;
if (OPAL_SUCCESS != (rc = opal_thread_start(&trk->engine))) {
OPAL_ERROR_LOG(rc);
OBJ_RELEASE(trk);
return NULL;
}
if (!inited) {
OBJ_CONSTRUCT(&tracking, opal_list_t);
inited = true;
}
opal_list_append(&tracking, &trk->super);
return trk->ev_base;
}
void opal_stop_progress_thread(char *name, bool cleanup)
{
opal_progress_tracker_t *trk;
if (!inited) {
/* nothing we can do */
return;
}
/* find the specified engine */
OPAL_LIST_FOREACH(trk, &tracking, opal_progress_tracker_t) {
if (0 == strcmp(name, trk->name)) {
/* break the event loop */
opal_event_base_loopbreak(trk->ev_base);
/* wait for thread to exit */
opal_thread_join(&trk->engine, NULL);
/* cleanup, if they indicated they are done with this event base */
if (cleanup) {
opal_list_remove_item(&tracking, &trk->super);
OBJ_RELEASE(trk);
}
return;
}
}
}
int opal_restart_progress_thread(char *name)
{
opal_progress_tracker_t *trk;
int rc;
if (!inited) {
/* nothing we can do */
return OPAL_ERROR;
}
/* find the specified engine */
OPAL_LIST_FOREACH(trk, &tracking, opal_progress_tracker_t) {
if (0 == strcmp(name, trk->name)) {
if (!trk->engine_defined) {
OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED);
return OPAL_ERR_NOT_SUPPORTED;
}
if (OPAL_SUCCESS != (rc = opal_thread_start(&trk->engine))) {
OPAL_ERROR_LOG(rc);
return rc;
}
}
}
return OPAL_ERR_NOT_FOUND;
}

34
opal/runtime/opal_progress_threads.h Обычный файл
Просмотреть файл

@ -0,0 +1,34 @@
/*
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/
#ifndef OPAL_PROGRESS_THREADS_H
#define OPAL_PROGRESS_THREADS_H
#include "opal_config.h"
#include "opal/mca/event/event.h"
/* start a progress thread using the given function, assigning
* it the provided name for tracking purposes. This function will
* also create a pipe so that libevent has something to block
* against, thus keeping the thread from free-running
*/
OPAL_DECLSPEC opal_event_base_t *opal_start_progress_thread(char *name,
opal_thread_fn_t func,
bool create_block);
/* stop the progress thread of the provided name. This function will
* also cleanup the blocking pipes and release the event base if
* the cleanup param is true */
OPAL_DECLSPEC void opal_stop_progress_thread(char *name, bool cleanup);
/* restart the progress thread of the provided name */
OPAL_DECLSPEC int opal_restart_progress_thread(char *name);
#endif