1
1

Mark the orte_abort function as noreturn and change the return value from

int to void. This function call exit at the end, so there is no way to
return from there. Apply the same thing to the errmsg_abort function and
update all components.

This commit was SVN r15704.
Этот коммит содержится в:
George Bosilca 2007-07-31 16:09:52 +00:00
родитель a5d0e53bb3
Коммит 2e2bf472ff
8 изменённых файлов: 8 добавлений и 8 удалений

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

@ -69,7 +69,7 @@ ORTE_DECLSPEC void orte_errmgr_base_error_detected(int error_code, char *fmt,
ORTE_DECLSPEC int orte_errmgr_base_register_job_not_avail(orte_jobid_t job); ORTE_DECLSPEC int orte_errmgr_base_register_job_not_avail(orte_jobid_t job);
ORTE_DECLSPEC void orte_errmgr_base_abort(void); ORTE_DECLSPEC void orte_errmgr_base_abort(void) __opal_attribute_noreturn__;
ORTE_DECLSPEC int orte_errmgr_base_abort_procs_request_not_avail(orte_process_name_t *procs, orte_std_cntr_t num_procs); ORTE_DECLSPEC int orte_errmgr_base_abort_procs_request_not_avail(orte_process_name_t *procs, orte_std_cntr_t num_procs);

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

@ -68,7 +68,7 @@ int orte_errmgr_bproc_incomplete_start(orte_gpr_notify_message_t *msg);
void orte_errmgr_bproc_error_detected(int error_code, char *fmt, ...) __opal_attribute_format__(__printf__, 2, 3); void orte_errmgr_bproc_error_detected(int error_code, char *fmt, ...) __opal_attribute_format__(__printf__, 2, 3);
void orte_errmgr_bproc_abort(void); void orte_errmgr_bproc_abort(void) __opal_attribute_noreturn__;
int orte_errmgr_bproc_register_job(orte_jobid_t job); int orte_errmgr_bproc_register_job(orte_jobid_t job);

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

@ -144,7 +144,7 @@ typedef int (*orte_errmgr_base_module_register_job_fn_t)(orte_jobid_t job);
* itself, and then exits - it takes no other actions. The intent here is to provide * itself, and then exits - it takes no other actions. The intent here is to provide
* a last-ditch exit procedure that attempts to clean up a little. * a last-ditch exit procedure that attempts to clean up a little.
*/ */
typedef void (*orte_errmgr_base_module_abort_fn_t)(void); typedef void (*orte_errmgr_base_module_abort_fn_t)(void) __opal_attribute_noreturn__;
/* /*
* Request that the system abort processes other than myself * Request that the system abort processes other than myself

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

@ -66,7 +66,7 @@ int orte_errmgr_hnp_incomplete_start(orte_gpr_notify_message_t *msg);
void orte_errmgr_hnp_error_detected(int error_code, char *fmt, ...) __opal_attribute_format__(__printf__, 2, 3); void orte_errmgr_hnp_error_detected(int error_code, char *fmt, ...) __opal_attribute_format__(__printf__, 2, 3);
void orte_errmgr_hnp_abort(void); void orte_errmgr_hnp_abort(void) __opal_attribute_noreturn__;
int orte_errmgr_hnp_register_job(orte_jobid_t job); int orte_errmgr_hnp_register_job(orte_jobid_t job);

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

@ -68,7 +68,7 @@ int orte_errmgr_orted_incomplete_start(orte_gpr_notify_message_t *msg);
void orte_errmgr_orted_error_detected(int error_code, char *fmt, ...) __opal_attribute_format__(__printf__, 2, 3); void orte_errmgr_orted_error_detected(int error_code, char *fmt, ...) __opal_attribute_format__(__printf__, 2, 3);
void orte_errmgr_orted_abort(void); void orte_errmgr_orted_abort(void) __opal_attribute_noreturn__;
int orte_errmgr_orted_register_job(orte_jobid_t job); int orte_errmgr_orted_register_job(orte_jobid_t job);

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

@ -68,7 +68,7 @@ int orte_errmgr_proxy_incomplete_start(orte_gpr_notify_message_t *msg);
void orte_errmgr_proxy_error_detected(int error_code, char *fmt, ...) __opal_attribute_format__(__printf__, 2, 3); void orte_errmgr_proxy_error_detected(int error_code, char *fmt, ...) __opal_attribute_format__(__printf__, 2, 3);
void orte_errmgr_proxy_abort(void); void orte_errmgr_proxy_abort(void) __opal_attribute_noreturn__;
int orte_errmgr_proxy_register_job(orte_jobid_t job); int orte_errmgr_proxy_register_job(orte_jobid_t job);

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

@ -67,7 +67,7 @@
* to prevent the abort file from being created. This allows the * to prevent the abort file from being created. This allows the
* session directory tree to cleanly be eliminated. * session directory tree to cleanly be eliminated.
*/ */
int orte_abort(int status, bool report) void orte_abort(int status, bool report)
{ {
char *abort_file; char *abort_file;
int fd; int fd;

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

@ -60,7 +60,7 @@ extern "C" {
* function should create an appropriate file to alert the local * function should create an appropriate file to alert the local
* orted that termination was abnormal. * orted that termination was abnormal.
*/ */
ORTE_DECLSPEC int orte_abort(int status, bool report); ORTE_DECLSPEC void orte_abort(int status, bool report) __opal_attribute_noreturn__;
/** /**