Number of small changes to fix compile warnings. Most of these should be
completely harmless This commit was SVN r969.
Этот коммит содержится в:
родитель
079affe31d
Коммит
1cd0bbdbbf
@ -31,7 +31,7 @@
|
|||||||
enum lam_consts{
|
enum lam_consts{
|
||||||
LAM_PREDEFINED = 1,
|
LAM_PREDEFINED = 1,
|
||||||
MPI_ERROR,
|
MPI_ERROR,
|
||||||
MPI_INVALID_ATTR_KEYVAL,
|
MPI_INVALID_ATTR_KEYVAL
|
||||||
};
|
};
|
||||||
|
|
||||||
/* ******************************************************************* */
|
/* ******************************************************************* */
|
||||||
|
@ -155,7 +155,7 @@ int lam_errhandler_finalize(void)
|
|||||||
/* All done */
|
/* All done */
|
||||||
|
|
||||||
return LAM_SUCCESS;
|
return LAM_SUCCESS;
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
lam_errhandler_t *lam_errhandler_create(lam_errhandler_type_t object_type,
|
lam_errhandler_t *lam_errhandler_create(lam_errhandler_type_t object_type,
|
||||||
|
@ -124,6 +124,7 @@ static int lam_timeout_next(struct timeval *tv);
|
|||||||
static void lam_timeout_correct(struct timeval *off);
|
static void lam_timeout_correct(struct timeval *off);
|
||||||
static void lam_timeout_process(void);
|
static void lam_timeout_process(void);
|
||||||
static void lam_timeout_insert(struct lam_event *);
|
static void lam_timeout_insert(struct lam_event *);
|
||||||
|
int lam_event_haveevents(void);
|
||||||
|
|
||||||
static RB_HEAD(lam_event_tree, lam_event) lam_timetree;
|
static RB_HEAD(lam_event_tree, lam_event) lam_timetree;
|
||||||
static struct lam_event_list lam_activequeue;
|
static struct lam_event_list lam_activequeue;
|
||||||
@ -143,9 +144,9 @@ compare(struct lam_event *a, struct lam_event *b)
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static RB_PROTOTYPE(lam_event_tree, lam_event, ev_timeout_node, compare);
|
static RB_PROTOTYPE(lam_event_tree, lam_event, ev_timeout_node, compare)
|
||||||
|
|
||||||
static RB_GENERATE(lam_event_tree, lam_event, ev_timeout_node, compare);
|
static RB_GENERATE(lam_event_tree, lam_event, ev_timeout_node, compare)
|
||||||
|
|
||||||
/* run loop for dispatch thread */
|
/* run loop for dispatch thread */
|
||||||
static void* lam_event_run(lam_object_t* arg)
|
static void* lam_event_run(lam_object_t* arg)
|
||||||
|
@ -59,6 +59,8 @@ static short lam_evsigcaught[NSIG];
|
|||||||
static int lam_needrecalc;
|
static int lam_needrecalc;
|
||||||
volatile sig_atomic_t lam_evsignal_caught = 0;
|
volatile sig_atomic_t lam_evsignal_caught = 0;
|
||||||
|
|
||||||
|
void lam_evsignal_handler(int sig);
|
||||||
|
|
||||||
void
|
void
|
||||||
lam_evsignal_init(sigset_t *evsigmask)
|
lam_evsignal_init(sigset_t *evsigmask)
|
||||||
{
|
{
|
||||||
|
@ -191,4 +191,4 @@ int lam_group_finalize(void){
|
|||||||
|
|
||||||
/* return */
|
/* return */
|
||||||
return return_value;
|
return return_value;
|
||||||
};
|
}
|
||||||
|
@ -123,7 +123,7 @@ find_match(lam_job_handle_t job_handle, int vpid, int* tag)
|
|||||||
while ((ent = readdir(dir)) != NULL) {
|
while ((ent = readdir(dir)) != NULL) {
|
||||||
if (ent->d_name[0] == '.') continue;
|
if (ent->d_name[0] == '.') continue;
|
||||||
|
|
||||||
ret = sscanf(ent->d_name, "%[^_]_%d_%d_%d_%lld.msg", tmp_handle, &tmp_vpid,
|
ret = sscanf(ent->d_name, "%[^_]_%d_%d_%d_%llu.msg", tmp_handle, &tmp_vpid,
|
||||||
&tmp_myvpid, &tmp_tag, &tmp_serial);
|
&tmp_myvpid, &tmp_tag, &tmp_serial);
|
||||||
if (ret != 5) {
|
if (ret != 5) {
|
||||||
continue;
|
continue;
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include "mca/ptl/ptl.h"
|
#include "mca/ptl/ptl.h"
|
||||||
#include "mca/pml/base/pml_base_request.h"
|
#include "mca/pml/base/pml_base_request.h"
|
||||||
|
|
||||||
extern lam_class_t mca_ptl_base_recv_request_t_class;;
|
extern lam_class_t mca_ptl_base_recv_request_t_class;
|
||||||
struct mca_ptl_base_recv_frag_t;
|
struct mca_ptl_base_recv_frag_t;
|
||||||
|
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ mca_ptl_tcp_proc_t* mca_ptl_tcp_proc_create(lam_proc_t* lam_proc)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
memcpy(ptl_proc->proc_guid, lam_proc->proc_job, size);
|
memcpy(ptl_proc->proc_guid, lam_proc->proc_job, size);
|
||||||
memcpy(ptl_proc->proc_guid+size, &vpid, sizeof(uint32_t));
|
memcpy(((char*) ptl_proc->proc_guid) + size, &vpid, sizeof(uint32_t));
|
||||||
|
|
||||||
/* lookup tcp parameters exported by this proc */
|
/* lookup tcp parameters exported by this proc */
|
||||||
rc = mca_base_modex_recv(
|
rc = mca_base_modex_recv(
|
||||||
|
@ -85,7 +85,7 @@ void mca_ptl_tcp_send_frag_init(
|
|||||||
/* fragment state */
|
/* fragment state */
|
||||||
sendfrag->frag_owner = &ptl_peer->peer_ptl->super;
|
sendfrag->frag_owner = &ptl_peer->peer_ptl->super;
|
||||||
sendfrag->super.frag_request = sendreq;
|
sendfrag->super.frag_request = sendreq;
|
||||||
sendfrag->super.super.frag_addr = sendreq->super.req_addr + hdr->hdr_frag.hdr_frag_offset;
|
sendfrag->super.super.frag_addr = ((char*) sendreq->super.req_addr) + hdr->hdr_frag.hdr_frag_offset;
|
||||||
sendfrag->super.super.frag_size = size;
|
sendfrag->super.super.frag_size = size;
|
||||||
|
|
||||||
sendfrag->frag_peer = ptl_peer;
|
sendfrag->frag_peer = ptl_peer;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user