diff options
Diffstat (limited to 'src/H5FPprivate.h')
| -rw-r--r-- | src/H5FPprivate.h | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/H5FPprivate.h b/src/H5FPprivate.h index 43caed9..65bce85 100644 --- a/src/H5FPprivate.h +++ b/src/H5FPprivate.h @@ -162,9 +162,8 @@ typedef struct { H5FP_obj_t obj_type; /* Type of the object */ H5FP_lock_t rw_lock; /* Indicates read or write lock */ H5FD_mem_t mem_type; /* Type of memory updated, if req'd */ - H5AC_subid_t type_id; /* Type of metadata */ unsigned md_size; /* Size of the metadata sent in next msg */ - haddr_t addr; /* Address of the metadata */ + MPI_Offset addr; /* Address of the metadata */ unsigned char oid[H5R_OBJ_REF_BUF_SIZE]; /* Buffer to store OID of object */ } H5FP_request; @@ -190,9 +189,8 @@ typedef struct { unsigned file_id; /* SAP's file ID for the specific file */ H5FP_status_t status; /* Status of the request */ H5FD_mem_t mem_type; /* Type of memory updated, if req'd */ - H5AC_subid_t type_id; /* Type of metadata */ unsigned md_size; /* Size of the metadata sent in next msg */ - haddr_t addr; /* Address of the metadata */ + MPI_Offset addr; /* Address of the metadata */ } H5FP_read; extern MPI_Datatype H5FP_read_t; /* MPI datatype for the H5FP_read obj */ @@ -206,23 +204,17 @@ extern MPI_Comm H5FP_SAP_BARRIER_COMM; /* Comm if you want to do a barrier */ extern unsigned H5FP_sap_rank; /* The rank of the SAP: Supplied by user */ extern unsigned H5FP_capt_rank; /* The rank which tells SAP of opens */ -extern unsigned H5FP_my_rank; /* Rank of this process in the COMM */ -extern int H5FP_comm_size; /* Size of the COMM */ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -/* NOTE: Don't use this function explicitly!! */ -extern herr_t H5FP_send_metadata(const char *mdata, int len, int to); -extern herr_t H5FP_read_metadata(char **mdata, int len, int from); - /* Start the SAP */ extern herr_t H5FP_sap_receive_loop(void); /* Use these functions to communicate with the SAP */ extern herr_t H5FP_request_open(const char *mdata, int md_len, H5FP_obj_t obj_type, - haddr_t maxaddr, unsigned *file_id, unsigned *req_id); + MPI_Offset maxaddr, unsigned *file_id, unsigned *req_id); extern herr_t H5FP_request_lock(unsigned sap_file_id, unsigned char *mdata, H5FP_lock_t rw_lock, int last, unsigned *req_id, H5FP_status_t *status); @@ -230,17 +222,21 @@ extern herr_t H5FP_request_release_lock(unsigned sap_file_id, unsigned char *mda int last, unsigned *req_id, H5FP_status_t *status); extern herr_t H5FP_request_read_metadata(H5FD_t *file, unsigned sap_file_id, - H5FD_mem_t mem_type, haddr_t addr, - size_t size, uint8_t **buf, + H5FD_mem_t mem_type, MPI_Offset addr, + size_t size, uint8_t **buf, int *bytes_read, unsigned *req_id, H5FP_status_t *status); -extern herr_t H5FP_request_write_metadata(H5FD_t *file, unsigned sap_file_id, - unsigned char *obj_oid, - H5AC_subid_t type_id, haddr_t addr, - int mdata_len, const char *mdata, - unsigned *req_id, H5FP_status_t *status); +extern herr_t H5FP_request_write_metadata(H5FD_t *file, unsigned file_id, + H5FD_mem_t mem_type, unsigned char *obj_oid, + MPI_Offset addr, int mdata_size, + const char *mdata, unsigned *req_id, + H5FP_status_t *status); extern herr_t H5FP_request_close(H5FD_t *file, unsigned sap_file_id, unsigned *req_id, H5FP_status_t *status); +/* NOTE: Don't use these functions outside of the H5FD* modules! */ +extern herr_t H5FP_send_metadata(const char *mdata, int len, int to); +extern herr_t H5FP_read_metadata(char **mdata, int len, int from); + #ifdef __cplusplus } #endif /* __cplusplus */ |