1
1

Silence warnings by commenting out unused functions in the "hnp" notifier component.

This commit was SVN r23181.
Этот коммит содержится в:
Abhishek Kulkarni 2010-05-19 22:46:05 +00:00
родитель 118ce0e166
Коммит abe13d802c
3 изменённых файлов: 38 добавлений и 7 удалений

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

@ -38,8 +38,10 @@ void orte_notifier_hnp_exception_cb(const orte_process_name_t* peer,
orte_rml_exception_t reason); orte_rml_exception_t reason);
#endif #endif
/*
extern opal_pointer_array_t orte_notifier_hnp_tables; extern opal_pointer_array_t orte_notifier_hnp_tables;
extern opal_mutex_t orte_notifier_hnp_tables_lock; extern opal_mutex_t orte_notifier_hnp_tables_lock;
*/
/* /*
* Notifier interfaces * Notifier interfaces

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

@ -71,9 +71,6 @@ orte_notifier_base_module_t orte_notifier_hnp_module = {
static int send_command(orte_notifier_base_severity_t severity, int errcode, static int send_command(orte_notifier_base_severity_t severity, int errcode,
char *msg) char *msg)
{ {
/* JMS: As an example, I'll pack up the severity, errcode, and
string message. I assume you'll want to pack up the whole
corresponding OPAL SOS table. */
opal_buffer_t *buf; opal_buffer_t *buf;
int rc; int rc;
uint8_t u8 = (uint8_t) severity; uint8_t u8 = (uint8_t) severity;
@ -117,6 +114,12 @@ static int send_command(orte_notifier_base_severity_t severity, int errcode,
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#if 0
/**
* Function to pack a single SOS error entry.
*
* @return OPAL_SUCCESS Upon success
*/
static int opal_dss_pack_sos_error(opal_buffer_t *buf, opal_sos_error_t *error) static int opal_dss_pack_sos_error(opal_buffer_t *buf, opal_sos_error_t *error)
{ {
int rc; int rc;
@ -163,6 +166,16 @@ static int opal_dss_pack_sos_error(opal_buffer_t *buf, opal_sos_error_t *error)
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
/**
* Function to pack all the entries in the SOS table and send it
* over to the HNP.
*
* @return OPAL_SUCCESS Upon success
* @return OPAL_FAILURE Upon failure
*
* ADK: Presently, we simply rely on orte_show_help to do the aggregation on
* a per-error basis.
*/
static int opal_sos_send_table(void) static int opal_sos_send_table(void)
{ {
opal_sos_error_t *opal_error; opal_sos_error_t *opal_error;
@ -227,6 +240,7 @@ error:
OBJ_RELEASE(buf); OBJ_RELEASE(buf);
return rc; return rc;
} }
#endif
static int init(void) static int init(void)
{ {
@ -244,11 +258,18 @@ static int init(void)
return rc; return rc;
} }
/* Construct a list of SOS tables, one for each process.
ADK: Since we are not doing proper error trace analysis
and/or aggregation, each process maintains a separate SOS
table and individually sends each entry in the table to
the HNP. */
/*
OBJ_CONSTRUCT(&orte_notifier_hnp_tables, opal_pointer_array_t); OBJ_CONSTRUCT(&orte_notifier_hnp_tables, opal_pointer_array_t);
opal_pointer_array_init(&orte_notifier_hnp_tables, opal_pointer_array_init(&orte_notifier_hnp_tables,
orte_process_info.num_procs, orte_process_info.num_procs,
INT32_MAX, 8); INT32_MAX, 8);
OBJ_CONSTRUCT(&orte_notifier_hnp_tables_lock, opal_mutex_t); OBJ_CONSTRUCT(&orte_notifier_hnp_tables_lock, opal_mutex_t);
*/
#if OPAL_ENABLE_DEBUG #if OPAL_ENABLE_DEBUG
/* If we're debugging, also add an exception handler -- just to /* If we're debugging, also add an exception handler -- just to

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

@ -31,7 +31,8 @@
#include "notifier_hnp.h" #include "notifier_hnp.h"
/* /*
* This function is called back *after* the RML receive callback to avoid * This function is called back *after* the RML receive callback to
* avoid the RRD ("receive recursion of death").
*/ */
static void process_msg(int fd, short event, void *cbdata) static void process_msg(int fd, short event, void *cbdata)
{ {
@ -43,9 +44,6 @@ static void process_msg(int fd, short event, void *cbdata)
int errcode; int errcode;
char *msg; char *msg;
/* JMS: As an example, we packed the severity, errcode, and string
in notifier_hnp_module.c. We'll unpack it here. */
/* Unpack the severity */ /* Unpack the severity */
count = 1; count = 1;
if (ORTE_SUCCESS != if (ORTE_SUCCESS !=
@ -80,6 +78,12 @@ CLEAN_RETURN:
return; return;
} }
#if 0
/**
* Function to unpack a single SOS error entry.
*
* @return OPAL_SUCCESS Upon success
*/
static int opal_dss_unpack_sos_error(opal_buffer_t *buf, opal_sos_error_t *error) static int opal_dss_unpack_sos_error(opal_buffer_t *buf, opal_sos_error_t *error)
{ {
int count, rc; int count, rc;
@ -139,6 +143,9 @@ static int opal_dss_unpack_sos_error(opal_buffer_t *buf, opal_sos_error_t *error
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
/*
* Function to unpack the entire SOS table on the HNP.
*/
static void process_sos_table_msg(int fd, short event, void *cbdata) static void process_sos_table_msg(int fd, short event, void *cbdata)
{ {
orte_message_event_t *mev = (orte_message_event_t*)cbdata; orte_message_event_t *mev = (orte_message_event_t*)cbdata;
@ -213,6 +220,7 @@ error:
OBJ_DESTRUCT(sos_table); OBJ_DESTRUCT(sos_table);
return; return;
} }
#endif
void orte_notifier_hnp_recv_cb(int status, orte_process_name_t* sender, void orte_notifier_hnp_recv_cb(int status, orte_process_name_t* sender,
opal_buffer_t* buffer, orte_rml_tag_t tag, opal_buffer_t* buffer, orte_rml_tag_t tag,