mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r6379] Purpose:

Browse Source 
Update
Description:
    H5FP.c, H5FPclient.c, H5FPprivate.h, H5FPserver.c:
        Update. More progression towards the SAP as metadata cache. It
        only lacks the ability to take care of metadata allocations.

    H5FDfphdf5.[ch]:
        Start of a new driver for FPHDF5. Not fully implemented just
        yet...
Platforms tested:
    Linux
This commit is contained in:
Bill Wendling 2003-02-06 17:08:05 -05:00
parent 76457aac6c
commit c7cce26e6a
6 changed files with 1747 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1589
src/H5FDfphdf5.c Normal file
View File

File diff suppressed because it is too large Load Diff

62
src/H5FDfphdf5.h Normal file
View File

@ -0,0 +1,62 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the files COPYING and Copyright.html. COPYING can be found at the root *
* of the source code distribution tree; Copyright.html can be found at the *
* root level of an installed copy of the electronic HDF5 document set and *
* is linked from the top-level documents page. It can also be found at *
* http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef H5FDFPHDF5_H__
#define H5FDFPHDF5_H__
#include "H5FDpublic.h"
#include "H5Ipublic.h"
#ifdef H5_HAVE_PARALLEL
# define H5FD_FPHDF5 (H5FD_fphdf5_init())
#else
# define H5FD_FPHDF5 (-1)
#endif /* H5_HAVE_PARALLEL */
/* Macros */
#define IS_H5FD_FPHDF5(f) (H5F_get_driver_id(f) == H5FD_FPHDF5)
#ifdef H5_HAVE_PARALLEL
/* Turn on H5FDfphdf5_debug if H5F_DEBUG is on */
#ifdef H5F_DEBUG
# ifndef H5FDfphdf5_DEBUG
# define H5FDfphdf5_DEBUG
# endif
#endif
/* Function prototypes */
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
H5_DLL hid_t H5FD_fphdf5_init(void);
H5_DLL herr_t H5Pset_fapl_fphdf5(hid_t fapl_id, MPI_Comm comm, MPI_Info info);
H5_DLL herr_t H5Pget_fapl_fphdf5(hid_t fapl_id, MPI_Comm *comm/*out*/,
MPI_Info *info/*out*/);
H5_DLL MPI_Comm H5FD_fphdf5_communicator(H5FD_t *_file);
H5_DLL herr_t H5FD_fphdf5_setup(hid_t dxpl_id, MPI_Datatype btype,
MPI_Datatype ftype, unsigned use_view);
H5_DLL herr_t H5FD_fphdf5_teardown(hid_t dxpl_id);
H5_DLL int H5FD_fphdf5_mpi_rank(H5FD_t *_file);
H5_DLL int H5FD_fphdf5_mpi_size(H5FD_t *_file);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* H5_HAVE_PARALLEL */
#endif /* H5FDFPHDF5_H__ */

2
src/H5FP.c
View File

@ -266,7 +266,7 @@ H5FP_read_metadata(char **mdata, int len, int from)
HDmemset(*mdata, 0, (size_t)len + 1);
if ((mrc = MPI_Recv(*mdata, len, MPI_BYTE, from, H5FP_TAG_METADATA,
if ((mrc = MPI_Recv(*mdata, len + 1, MPI_BYTE, from, H5FP_TAG_METADATA,
H5FP_SAP_COMM, &status)) != MPI_SUCCESS) {
HDfree(*mdata);
*mdata = NULL;

87
src/H5FPclient.c
View File

@ -20,11 +20,12 @@
#include "H5Dprivate.h" /* Dataset Functions */
#include "H5Eprivate.h" /* Error Handling */
#include "H5Fprivate.h" /* Files */
#include "H5Gpkg.h" /* Group functions */
#include "H5FDprivate.h" /* File Drivers */
#include "H5Gpkg.h" /* Group Functions */
#include "H5Iprivate.h" /* ID Functions */
#include "H5MMprivate.h" /* Memory allocation */
#include "H5MMprivate.h" /* Memory Allocation */
#include "H5Oprivate.h" /* Object Headers */
#include "H5Spkg.h" /* Dataspace functions */
#include "H5Spkg.h" /* Dataspace Functions */
#include "H5TBprivate.h" /* Threaded, Balanced, Binary Trees */
#ifdef H5_HAVE_FPHDF5
@ -40,7 +41,7 @@ static int interface_initialize_g = 0;
/* local functions */
static unsigned H5FP_gen_request_id(void);
static herr_t H5FP_dump_to_file(H5F_t *file, H5FP_read *sap_read);
static herr_t H5FP_dump_to_file(H5FD_t *file, H5FP_read *sap_read);
/*
*===----------------------------------------------------------------------===
@ -68,7 +69,7 @@ static herr_t H5FP_dump_to_file(H5F_t *file, H5FP_read *sap_read);
*/
herr_t
H5FP_request_open(const char *mdata, int md_size, H5FP_obj_t obj_type,
unsigned *file_id, unsigned *req_id)
haddr_t maxaddr, unsigned *file_id, unsigned *req_id)
{
H5FP_request req;
MPI_Status mpi_status;
@ -94,6 +95,7 @@ H5FP_request_open(const char *mdata, int md_size, H5FP_obj_t obj_type,
req.proc_rank = H5FP_my_rank;
req.md_size = md_size;
req.obj_type = obj_type;
req.addr = maxaddr;
if ((mrc = MPI_Send(&req, 1, H5FP_request_t, (int)H5FP_sap_rank,
H5FP_TAG_REQUEST, H5FP_SAP_COMM)) != MPI_SUCCESS)
@ -151,8 +153,10 @@ H5FP_request_lock(unsigned file_id, unsigned char *obj_oid,
H5FP_COPY_OID(req.oid, obj_oid);
if ((mrc = MPI_Send(&req, 1, H5FP_request_t, (int)H5FP_sap_rank,
H5FP_TAG_REQUEST, H5FP_SAP_COMM)) != MPI_SUCCESS)
H5FP_TAG_REQUEST, H5FP_SAP_COMM)) != MPI_SUCCESS) {
*status = H5FP_STATUS_LOCK_FAILED;
HMPI_GOTO_ERROR(FAIL, "MPI_Send failed", mrc);
}
if (last) {
/*
@ -175,9 +179,6 @@ H5FP_request_lock(unsigned file_id, unsigned char *obj_oid,
}
done:
if (ret_value == FAIL)
*status = H5FP_STATUS_LOCK_FAILED;
*req_id = req.req_id;
FUNC_LEAVE_NOAPI(ret_value);
}
@ -220,8 +221,10 @@ H5FP_request_release_lock(unsigned file_id, unsigned char *obj_oid,
req.proc_rank = H5FP_my_rank;
if ((mrc = MPI_Send(&req, 1, H5FP_request_t, (int)H5FP_sap_rank,
H5FP_TAG_REQUEST, H5FP_SAP_COMM)) != MPI_SUCCESS)
H5FP_TAG_REQUEST, H5FP_SAP_COMM)) != MPI_SUCCESS) {
*status = H5FP_STATUS_LOCK_RELEASE_FAILED;
HMPI_GOTO_ERROR(FAIL, "MPI_Send failed", mrc);
}
if (last) {
/*
@ -240,7 +243,8 @@ H5FP_request_release_lock(unsigned file_id, unsigned char *obj_oid,
*status = sap_reply.status;
if (sap_reply.status != H5FP_STATUS_LOCK_RELEASED)
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTUNLOCK, FAIL, "can't unlock object on server");
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTUNLOCK, FAIL,
"can't unlock object on server");
}
done:
@ -264,10 +268,9 @@ done:
* Modifications:
*/
herr_t
H5FP_request_read_metadata(H5F_t *file, unsigned file_id, H5FP_obj_t obj_type,
H5AC_subid_t type_id, haddr_t addr, size_t size,
uint8_t **buf, unsigned *req_id,
H5FP_status_t *status)
H5FP_request_read_metadata(H5FD_t *file, unsigned file_id, H5FD_mem_t mem_type,
haddr_t addr, size_t size, uint8_t **buf,
unsigned *req_id, H5FP_status_t *status)
{
H5FP_request req;
H5FP_read sap_read; /* metadata info read from the SAP's cache */
@ -290,8 +293,6 @@ H5FP_request_read_metadata(H5F_t *file, unsigned file_id, H5FP_obj_t obj_type,
req.req_id = H5FP_gen_request_id();
req.file_id = file_id;
req.proc_rank = H5FP_my_rank;
req.obj_type = obj_type;
req.type_id = type_id;
req.addr = addr;
if ((mrc = MPI_Send(&req, 1, H5FP_request_t, (int)H5FP_sap_rank,
@ -304,15 +305,14 @@ H5FP_request_read_metadata(H5F_t *file, unsigned file_id, H5FP_obj_t obj_type,
H5FP_SAP_COMM, &mpi_status)) != MPI_SUCCESS)
HMPI_GOTO_ERROR(FAIL, "MPI_Recv failed", mrc);
*status = sap_read.status;
HDmemset(*buf, '\0', size);
switch (*status) {
switch (sap_read.status) {
case H5FP_STATUS_OK:
/* use the info in the H5FP_read_t structure to update the metadata */
HDmemset(*buf, '\0', size);
HDmemset(&mpi_status, 0, sizeof(mpi_status));
if ((mrc = MPI_Recv(*buf, (int)sap_read.md_size, MPI_BYTE, (int)H5FP_sap_rank,
if ((mrc = MPI_Recv(*buf, (int)size, MPI_BYTE, (int)H5FP_sap_rank,
H5FP_TAG_METADATA, H5FP_SAP_COMM,
&mpi_status)) != MPI_SUCCESS)
HMPI_GOTO_ERROR(FAIL, "MPI_Recv failed", mrc);
@ -334,11 +334,15 @@ H5FP_request_read_metadata(H5F_t *file, unsigned file_id, H5FP_obj_t obj_type,
* The metadata wasn't in the SAP's cache. Should read from disk
* now.
*/
H5FD_read(file, mem_type, H5P_DATASET_XFER_DEFAULT, addr, size, buf);
break;
default:
break;
*status = sap_read.status;
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCHANGE, FAIL, "can't write metadata to server");
}
*status = H5FP_STATUS_OK;
done:
*req_id = req.req_id;
FUNC_LEAVE_NOAPI(ret_value);
@ -360,10 +364,10 @@ done:
* Modifications:
*/
herr_t
H5FP_request_write_metadata(H5F_t *file, unsigned file_id, uint8_t *obj_oid,
H5FP_obj_t obj_type, H5AC_subid_t type_id,
haddr_t addr, int mdata_size, const char *mdata,
unsigned *req_id, H5FP_status_t *status)
H5FP_request_write_metadata(H5FD_t *file, unsigned file_id, uint8_t *obj_oid,
H5AC_subid_t type_id, haddr_t addr, int mdata_size,
const char *mdata, unsigned *req_id,
H5FP_status_t *status)
{
H5FP_reply sap_reply;
H5FP_read sap_read; /* metadata info read from the SAP's cache */
@ -388,7 +392,6 @@ H5FP_request_write_metadata(H5F_t *file, unsigned file_id, uint8_t *obj_oid,
req.req_id = H5FP_gen_request_id();
req.proc_rank = H5FP_my_rank;
req.file_id = file_id;
req.obj_type = obj_type;
req.type_id = type_id;
req.addr = addr;
req.md_size = mdata_size;
@ -407,9 +410,10 @@ H5FP_request_write_metadata(H5F_t *file, unsigned file_id, uint8_t *obj_oid,
H5FP_TAG_REPLY, H5FP_SAP_COMM, &mpi_status)) != MPI_SUCCESS)
HMPI_GOTO_ERROR(FAIL, "MPI_Recv failed", mrc);
*status = sap_reply.status;
switch (*status) {
switch (sap_reply.status) {
case H5FP_STATUS_OK:
/* Nothing to do... */
break;
case H5FP_STATUS_DUMPING:
/*
* Collect the metadata updates from the SAP and write them to
@ -432,14 +436,14 @@ H5FP_request_write_metadata(H5F_t *file, unsigned file_id, uint8_t *obj_oid,
"can't write metadata update to file");
}
break;
case H5FP_STATUS_OK:
/* Nothing to do... */
break;
default:
*status = sap_reply.status;
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCHANGE, FAIL, "can't write metadata to server");
}
*status = H5FP_STATUS_OK;
done:
*req_id = req.req_id;
FUNC_LEAVE_NOAPI(ret_value);
@ -462,7 +466,7 @@ done:
* Modifications:
*/
herr_t
H5FP_request_close(H5F_t *file, unsigned file_id, unsigned *req_id,
H5FP_request_close(H5FD_t *file, unsigned file_id, unsigned *req_id,
H5FP_status_t *status)
{
H5FP_reply sap_reply;
@ -495,9 +499,10 @@ H5FP_request_close(H5F_t *file, unsigned file_id, unsigned *req_id,
H5FP_TAG_REPLY, H5FP_SAP_COMM, &mpi_status)) != MPI_SUCCESS)
HMPI_GOTO_ERROR(FAIL, "MPI_Recv failed", mrc);
*status = sap_reply.status;
switch (*status) {
switch (sap_reply.status) {
case H5FP_STATUS_OK:
/* Nothing to do... */
break;
case H5FP_STATUS_DUMPING:
/*
* Collect the metadata updates from the SAP and write them to
@ -520,14 +525,14 @@ H5FP_request_close(H5F_t *file, unsigned file_id, unsigned *req_id,
"can't write metadata update to file");
}
break;
case H5FP_STATUS_OK:
/* Nothing to do... */
break;
default:
*status = sap_reply.status;
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCHANGE, FAIL, "can't write metadata to server");
}
*status = H5FP_STATUS_OK;
done:
*req_id = req.req_id;
FUNC_LEAVE_NOAPI(ret_value);
@ -564,7 +569,7 @@ H5FP_gen_request_id()
* Modifications:
*/
static herr_t
H5FP_dump_to_file(H5F_t *file, H5FP_read *sap_read)
H5FP_dump_to_file(H5FD_t *file, H5FP_read *sap_read)
{
herr_t ret_value = SUCCEED;

17
src/H5FPprivate.h
View File

@ -222,24 +222,23 @@ 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,
unsigned *file_id, unsigned *req_id);
haddr_t 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);
extern herr_t H5FP_request_release_lock(unsigned sap_file_id, unsigned char *mdata,
int last, unsigned *req_id,
H5FP_status_t *status);
extern herr_t H5FP_request_read_metadata(H5F_t *file, unsigned sap_file_id,
H5FP_obj_t obj_type, H5AC_subid_t type_id,
haddr_t addr, size_t size,
uint8_t **buf, unsigned *req_id,
H5FP_status_t *status);
extern herr_t H5FP_request_write_metadata(H5F_t *file, unsigned sap_file_id,
unsigned char *obj_oid, H5FP_obj_t obj_type,
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,
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_close(H5F_t *file, unsigned sap_file_id, unsigned *req_id,
extern herr_t H5FP_request_close(H5FD_t *file, unsigned sap_file_id, unsigned *req_id,
H5FP_status_t *status);
#ifdef __cplusplus

90
src/H5FPserver.c
View File

@ -62,6 +62,7 @@ typedef struct {
} H5FP_mdata_mod;
typedef struct {
H5FD_t file; /* file driver structure */
unsigned file_id; /* the file id the SAP keeps per file */
char *filename; /* the filename - of dubious use */
int closing; /* we're closing the file - no more changes */
@ -99,7 +100,7 @@ static herr_t H5FP_remove_object_lock_from_list(H5FP_file_info *info,
H5FP_object_lock *ol);
/* local file information handling functions */
static herr_t H5FP_add_new_file_info_to_list(unsigned file_id, char *filename);
static herr_t H5FP_add_new_file_info_to_list(unsigned file_id, char *filename, haddr_t maxaddr);
static int H5FP_file_info_cmp(H5FP_file_info *k1, H5FP_file_info *k2, int cmparg);
static H5FP_file_info *H5FP_new_file_info_node(unsigned file_id, char *filename);
static H5FP_file_info *H5FP_find_file_info(unsigned file_id);
@ -600,13 +601,13 @@ H5FP_find_file_info(unsigned file_id)
/*
* Function: H5FP_add_new_file_info_to_list
* Purpose: Add a FILE_ID to the list of file IDS.
* Return: SUCCEED if the node was added
* FAIL otherwise
* Return: Success: SUCCEED
* Failure: FAIL
* Programmer: Bill Wendling, 02. August, 2002
* Modifications:
*/
static herr_t
H5FP_add_new_file_info_to_list(unsigned file_id, char *filename)
H5FP_add_new_file_info_to_list(unsigned file_id, char *filename, haddr_t maxaddr)
{
H5FP_file_info *info;
herr_t ret_value = FAIL;
@ -620,6 +621,13 @@ H5FP_add_new_file_info_to_list(unsigned file_id, char *filename)
"can't insert file structure into tree");
}
/*
* Initialize some of the information needed for metadata
* allocation requests
*/
info->file.maxaddr = maxaddr;
info->file.accum_loc = HADDR_UNDEF;
HDmemset(info->file.fl, 0, sizeof(info->file.fl));
ret_value = SUCCEED;
}
@ -804,36 +812,16 @@ H5FP_sap_handle_open_request(H5FP_request req, char *mdata, unsigned UNUSED md_s
if (req.obj_type == H5FP_OBJ_FILE) {
unsigned new_file_id = H5FP_gen_sap_file_id();
int i;
if (H5FP_add_new_file_info_to_list(new_file_id, mdata) != SUCCEED)
/* N.B. At this point, req.addr is equiv. to maxaddr in H5FD_open() */
if (H5FP_add_new_file_info_to_list(new_file_id, mdata, req.addr) != SUCCEED)
HGOTO_ERROR(H5E_FPHDF5, H5E_CANTINSERT, FAIL,
"can't insert new file structure to list");
/* broadcast the file id to all processes */
/*
* FIXME: Isn't there some way to broadcast this result to the
* barrier group? -QAK
*/
/*
* XXX:
* MPI_Bcast doesn't work in this way and I don't know how
* to get it to work for us. From what I gather, all of the
* processes need to execute the same bit of code (the
* MPI_Bcast function) to get the value to be passed to
* everyone. -BW
*/
for (i = 0; i < H5FP_comm_size; ++i)
if ((unsigned)i != H5FP_sap_rank)
if ((mrc = MPI_Send(&new_file_id, 1, MPI_UNSIGNED, i,
H5FP_TAG_FILE_ID, H5FP_SAP_COMM)) != MPI_SUCCESS)
/*
* FIXME: This is terrible...if we can't send to all
* processes, we should clean the file structure from
* the list and tell all of the other processes that
* we couldn't continue...but how to do that?!?
*/
HMPI_GOTO_ERROR(FAIL, "MPI_Send failed", mrc);
/* file ID gets broadcast via the captain process */
if ((mrc = MPI_Send(&new_file_id, 1, MPI_UNSIGNED, (int)H5FP_capt_rank,
H5FP_TAG_FILE_ID, H5FP_SAP_COMM)) != MPI_SUCCESS)
HMPI_GOTO_ERROR(FAIL, "MPI_Send failed", mrc);
}
done:
@ -1248,6 +1236,8 @@ H5FP_sap_handle_write_request(H5FP_request req, char *mdata, unsigned md_size)
FUNC_ENTER_NOINIT(H5FP_sap_handle_write_request);
if ((info = H5FP_find_file_info(req.file_id)) != NULL) {
H5FP_object_lock *lock;
if (info->num_mods >= H5FP_MDATA_CACHE_HIGHWATER_MARK) {
/*
* If there are any modifications not written out yet, dump
@ -1270,30 +1260,32 @@ H5FP_sap_handle_write_request(H5FP_request req, char *mdata, unsigned md_size)
if (info->closing) {
/* we're closing the file - don't accept anymore changes */
exit_state = H5FP_STATUS_FILE_CLOSING;
ret_value = FAIL;
} else {
/* handle the change request */
H5FP_object_lock *lock = H5FP_find_object_lock(info, req.oid);
HGOTO_DONE(FAIL);
}
if (!lock || lock->owned_rank != req.proc_rank
|| lock->rw_lock != H5FP_LOCK_WRITE) {
/*
* There isn't a write lock or we don't own the write
* lock on this OID
*/
exit_state = H5FP_STATUS_NO_LOCK;
ret_value = FAIL;
} else if (H5FP_add_file_mod_to_list(info, req.mem_type, req.type_id,
req.addr, req.proc_rank, md_size,
mdata) != SUCCEED) {
exit_state = H5FP_STATUS_OOM;
ret_value = FAIL;
}
/* handle the change request */
lock = H5FP_find_object_lock(info, req.oid);
if (!lock || lock->owned_rank != req.proc_rank
|| lock->rw_lock != H5FP_LOCK_WRITE) {
/*
* There isn't a write lock or we don't own the write
* lock on this OID
*/
exit_state = H5FP_STATUS_NO_LOCK;
HGOTO_DONE(FAIL);
}
if (H5FP_add_file_mod_to_list(info, req.mem_type, req.type_id,
req.addr, req.proc_rank, md_size,
mdata) != SUCCEED) {
exit_state = H5FP_STATUS_OOM;
HGOTO_DONE(FAIL);
}
} else {
/* error: there isn't a file opened to change */
exit_state = H5FP_STATUS_BAD_FILE_ID;
ret_value = FAIL;
HGOTO_DONE(FAIL);
}
done: