Skip to content

Commit

Permalink
s/pmembb/peanuts/g
Browse files Browse the repository at this point in the history
  • Loading branch information
range3 committed May 12, 2024
1 parent b69d42f commit 9f7f4cd
Show file tree
Hide file tree
Showing 44 changed files with 561 additions and 557 deletions.
2 changes: 1 addition & 1 deletion 3rd-party/romio341/adio/Makefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ include $(top_srcdir)/adio/ad_nfs/Makefile.mk
## NTFS builds are handled entirely by the separate Windows build system
##include $(top_srcdir)/adio/ad_ntfs/Makefile.mk
include $(top_srcdir)/adio/ad_panfs/Makefile.mk
include $(top_srcdir)/adio/ad_pmembb/Makefile.mk
include $(top_srcdir)/adio/ad_peanuts/Makefile.mk
include $(top_srcdir)/adio/ad_pvfs2/Makefile.mk
include $(top_srcdir)/adio/ad_testfs/Makefile.mk
include $(top_srcdir)/adio/ad_ufs/Makefile.mk
Expand Down
28 changes: 28 additions & 0 deletions 3rd-party/romio341/adio/ad_peanuts/Makefile.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
if BUILD_AD_PEANUTS

noinst_HEADERS += \
adio/ad_peanuts/ad_peanuts.h \
adio/ad_peanuts/peanuts_c.h

romio_other_sources += \
adio/ad_peanuts/ad_peanuts_close.c \
adio/ad_peanuts/ad_peanuts_read.c \
adio/ad_peanuts/ad_peanuts_rdcoll.c \
adio/ad_peanuts/ad_peanuts_wrcoll.c \
adio/ad_peanuts/ad_peanuts_open.c \
adio/ad_peanuts/ad_peanuts_write.c \
adio/ad_peanuts/ad_peanuts_done.c \
adio/ad_peanuts/ad_peanuts_fcntl.c \
adio/ad_peanuts/ad_peanuts_feature.c \
adio/ad_peanuts/ad_peanuts_iread.c \
adio/ad_peanuts/ad_peanuts_iwrite.c \
adio/ad_peanuts/ad_peanuts_wait.c \
adio/ad_peanuts/ad_peanuts_flush.c \
adio/ad_peanuts/ad_peanuts_seek.c \
adio/ad_peanuts/ad_peanuts_resize.c \
adio/ad_peanuts/ad_peanuts_binding.c \
adio/ad_peanuts/ad_peanuts_hints.c \
adio/ad_peanuts/ad_peanuts_delete.c \
adio/ad_peanuts/ad_peanuts.c

endif BUILD_AD_PEANUTS
48 changes: 48 additions & 0 deletions 3rd-party/romio341/adio/ad_peanuts/ad_peanuts.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Copyright (C) by Argonne National Laboratory
* See COPYRIGHT in top-level directory
*/

#include "ad_peanuts.h"

/* adioi.h has the ADIOI_Fns_struct define */
#include "adioi.h"

struct ADIOI_Fns_struct ADIO_PEANUTS_operations = {
ADIOI_PEANUTS_Open, /* Open */
ADIOI_PEANUTS_OpenColl, /* OpenColl */
ADIOI_PEANUTS_ReadContig, /* ReadContig */
ADIOI_PEANUTS_WriteContig, /* WriteContig */
ADIOI_PEANUTS_ReadStridedColl, /* ReadStridedColl */
ADIOI_PEANUTS_WriteStridedColl, /* WriteStridedColl */
ADIOI_PEANUTS_SeekIndividual, /* SeekIndividual */
ADIOI_PEANUTS_Fcntl, /* Fcntl */
ADIOI_PEANUTS_SetInfo, /* SetInfo */
#ifdef PEANUTS_AGGREGATE_READ
ADIOI_PEANUTS_ReadStrided, /* Aggregated ReadStrided */
#else
ADIOI_GEN_ReadStrided, /* Non-aggregated ReadStrided */
#endif
ADIOI_PEANUTS_WriteStrided, /* WriteStrided */
ADIOI_PEANUTS_Close, /* Close */
ADIOI_PEANUTS_IreadContig, /* IreadContig */
ADIOI_PEANUTS_IwriteContig, /* IwriteContig */
ADIOI_PEANUTS_ReadDone, /* ReadDone */
ADIOI_PEANUTS_WriteDone, /* WriteDone */
ADIOI_PEANUTS_ReadComplete, /* ReadComplete */
ADIOI_PEANUTS_WriteComplete, /* WriteComplete */
ADIOI_PEANUTS_IreadStrided, /* IreadStrided */
ADIOI_PEANUTS_IwriteStrided, /* IwriteStrided */
ADIOI_PEANUTS_Flush, /* Flush */
ADIOI_PEANUTS_Resize, /* Resize */
ADIOI_PEANUTS_Delete, /* Delete */
ADIOI_PEANUTS_Feature, /* Features */
"PEANUTS: A Persistent Memory-Based Network Unilateral Transfer System",
ADIOI_GEN_IreadStridedColl, /* IreadStridedColl */
ADIOI_GEN_IwriteStridedColl, /* IwriteStridedColl */
#if defined(F_SETLKW64)
ADIOI_GEN_SetLock /* SetLock */
#else
ADIOI_GEN_SetLock64 /* SetLock */
#endif
};
78 changes: 78 additions & 0 deletions 3rd-party/romio341/adio/ad_peanuts/ad_peanuts.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
#ifndef AD_PEANUTS_H_INCLUDED
#define AD_PEANUTS_H_INCLUDED

#include "adio.h"
#include <fcntl.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>

#include "peanuts_c.h"
extern peanuts_store_t mca_hook_peanuts_peanuts_store;

void ADIOI_PEANUTS_Open(ADIO_File fd, int *error_code);
void ADIOI_PEANUTS_OpenColl(ADIO_File fd, int rank, int access_mode, int *error_code);
void ADIOI_PEANUTS_Close(ADIO_File fd, int *error_code);
void ADIOI_PEANUTS_ReadAggregateContig(ADIO_File fd, void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Status *status,
int *error_code);
void ADIOI_PEANUTS_ReadContig(ADIO_File fd, void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Status *status,
int *error_code);
void ADIOI_PEANUTS_WriteContig(ADIO_File fd, const void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Status *status,
int *error_code);
void ADIOI_PEANUTS_IwriteContig(ADIO_File fd, const void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Request *request,
int *error_code);
void ADIOI_PEANUTS_IreadContig(ADIO_File fd, void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Request *request,
int *error_code);
int ADIOI_PEANUTS_ReadDone(ADIO_Request *request, ADIO_Status *status, int *error_code);
int ADIOI_PEANUTS_WriteDone(ADIO_Request *request, ADIO_Status *status, int *error_code);
void ADIOI_PEANUTS_ReadComplete(ADIO_Request *request, ADIO_Status *status, int *error_code);
void ADIOI_PEANUTS_WriteComplete(ADIO_Request *request, ADIO_Status *status, int *error_code);
void ADIOI_PEANUTS_Fcntl(ADIO_File fd, int flag, ADIO_Fcntl_t *fcntl_struct, int *error_code);
void ADIOI_PEANUTS_WriteStrided(ADIO_File fd, const void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Status *status,
int *error_code);
void ADIOI_PEANUTS_ReadStrided(ADIO_File fd, void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Status *status,
int *error_code);
void ADIOI_PEANUTS_WriteStridedColl(ADIO_File fd, const void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Status *status,
int *error_code);
void ADIOI_PEANUTS_ReadStridedColl(ADIO_File fd, void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Status *status,
int *error_code);
void ADIOI_PEANUTS_IreadStrided(ADIO_File fd, void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Request *request,
int *error_code);
void ADIOI_PEANUTS_IwriteStrided(ADIO_File fd, const void *buf, int count, MPI_Datatype datatype,
int file_ptr_type, ADIO_Offset offset, ADIO_Request *request,
int *error_code);
void ADIOI_PEANUTS_Flush(ADIO_File fd, int *error_code);
void ADIOI_PEANUTS_Resize(ADIO_File fd, ADIO_Offset size, int *error_code);
ADIO_Offset ADIOI_PEANUTS_SeekIndividual(ADIO_File fd, ADIO_Offset offset, int whence,
int *error_code);
void ADIOI_PEANUTS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code);
void ADIOI_PEANUTS_Get_shared_fp(ADIO_File fd, int size, ADIO_Offset *shared_fp, int *error_code);
void ADIOI_PEANUTS_Set_shared_fp(ADIO_File fd, ADIO_Offset offset, int *error_code);
void ADIOI_PEANUTS_Delete(const char *filename, int *error_code);
int ADIOI_PEANUTS_Feature(ADIO_File fd, int flag);

#ifndef NDEBUG
# define DEBUG_PRINT(comm, msg) \
do { \
int myrank, nprocs; \
MPI_Comm_size(comm, &nprocs); \
MPI_Comm_rank(comm, &myrank); \
FPRINTF(stdout, "[%d/%d] %s: %s\n", myrank, nprocs, __func__, msg); \
} while (0)
#else
# define DEBUG_PRINT(comm, filename) \
do { \
} while (0)
#endif

#endif /* AD_PEANUTS_H_INCLUDED */
103 changes: 103 additions & 0 deletions 3rd-party/romio341/adio/ad_peanuts/ad_peanuts_binding.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
#include "ad_peanuts.h"
#include "peanuts_c.h"

#pragma weak peanuts_store_create = default_peanuts_store_create
#pragma weak peanuts_store_free = default_peanuts_store_free
#pragma weak peanuts_store_save = default_peanuts_store_save
#pragma weak peanuts_store_load = default_peanuts_store_load
#pragma weak peanuts_store_open = default_peanuts_store_open
#pragma weak peanuts_store_unlink = default_peanuts_store_unlink
#pragma weak peanuts_bb_close = default_peanuts_bb_close
#pragma weak peanuts_bb_pwrite = default_peanuts_bb_pwrite
#pragma weak peanuts_bb_pread = default_peanuts_bb_pread
#pragma weak peanuts_bb_pread_aggregate = default_peanuts_bb_pread_aggregate
#pragma weak peanuts_bb_wait = default_peanuts_bb_wait
#pragma weak peanuts_bb_sync = default_peanuts_bb_sync
#pragma weak peanuts_bb_size = default_peanuts_bb_size
#pragma weak peanuts_bb_truncate = default_peanuts_bb_truncate

peanuts_store_t default_peanuts_store_create(MPI_Comm comm, const char *pmem_path, size_t pmem_size)
{
FPRINTF(stderr, "default_peanuts_store_create\n");
return NULL;
}

int default_peanuts_store_free(peanuts_store_t store)
{
FPRINTF(stderr, "default_peanuts_store_free\n");
return -1;
}

int default_peanuts_store_save(peanuts_store_t store)
{
FPRINTF(stderr, "default_peanuts_store_save\n");
return -1;
}

int default_peanuts_store_load(peanuts_store_t store)
{
FPRINTF(stderr, "default_peanuts_store_load\n");
return -1;
}

peanuts_handler_t default_peanuts_store_open(peanuts_store_t store, MPI_Comm comm, const char *pathname,
int flags, mode_t mode)
{
FPRINTF(stderr, "default_peanuts_store_open\n");
return NULL;
}

int default_peanuts_store_unlink(peanuts_store_t store, const char *pathname)
{
FPRINTF(stderr, "default_peanuts_store_unlink\n");
return -1;
}

int default_peanuts_bb_close(peanuts_handler_t handler)
{
FPRINTF(stderr, "default_peanuts_bb_close\n");
return -1;
}
ssize_t default_peanuts_bb_pwrite(peanuts_handler_t handler, const void *buf, size_t count,
off_t offset)
{
FPRINTF(stderr, "default_peanuts_bb_pwrite\n");
return -1;
}

ssize_t default_peanuts_bb_pread(peanuts_handler_t handler, void *buf, size_t count, off_t offset)
{
FPRINTF(stderr, "default_peanuts_bb_pread\n");
return -1;
}

ssize_t default_peanuts_bb_pread_aggregate(peanuts_handler_t handler, void *buf, size_t count,
off_t offset)
{
FPRINTF(stderr, "default_peanuts_bb_pread_aggregate\n");
return -1;
}

int default_peanuts_bb_wait(peanuts_handler_t handler)
{
FPRINTF(stderr, "default_peanuts_bb_wait\n");
return -1;
}

int default_peanuts_bb_sync(peanuts_handler_t handler)
{
FPRINTF(stderr, "default_peanuts_bb_sync\n");
return -1;
}

int default_peanuts_bb_size(peanuts_handler_t handler, size_t *size)
{
FPRINTF(stderr, "default_peanuts_bb_size\n");
return -1;
}

int default_peanuts_bb_truncate(peanuts_handler_t handler, size_t size)
{
FPRINTF(stderr, "default_peanuts_bb_truncate\n");
return -1;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
* See COPYRIGHT in top-level directory
*/

#include "ad_pmembb.h"
#include "ad_peanuts.h"
#include "adioi.h"

void ADIOI_PMEMBB_Close(ADIO_File fd, int *error_code)
void ADIOI_PEANUTS_Close(ADIO_File fd, int *error_code)
{
int ret;
rpmbb_handler_t handler = (rpmbb_handler_t) fd->fs_ptr;
peanuts_handler_t handler = (peanuts_handler_t) fd->fs_ptr;
DEBUG_PRINT(fd->comm, fd->filename);

if (handler != NULL) {
// int comp_result;
// MPI_Comm_compare(MPI_COMM_WORLD, fd->comm, &comp_result);
// if (comp_result == MPI_IDENT) {
// ret = rpmbb_bb_sync(handler);
// ret = peanuts_bb_sync(handler);
// if (ret != 0) {
// *error_code = ADIOI_Err_create_code(__func__, fd->filename, -ret);
// DEBUG_PRINT(fd->comm, "rpmbb_bb_sync failed");
// DEBUG_PRINT(fd->comm, "peanuts_bb_sync failed");
// }
// }
rpmbb_bb_close(handler);
peanuts_bb_close(handler);
}

fd->fs_ptr = NULL;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* See COPYRIGHT in top-level directory
*/

#include "ad_pmembb.h"
#include "ad_peanuts.h"
#include "adioi.h"

void ADIOI_PMEMBB_Delete(const char *filename, int *error_code)
void ADIOI_PEANUTS_Delete(const char *filename, int *error_code)
{
int err;
DEBUG_PRINT(MPI_COMM_SELF, filename);
Expand All @@ -17,7 +17,7 @@ void ADIOI_PMEMBB_Delete(const char *filename, int *error_code)
return;
}

rpmbb_store_unlink(mca_hook_pmembb_rpmbb_store, filename);
peanuts_store_unlink(mca_hook_peanuts_peanuts_store, filename);

*error_code = MPI_SUCCESS;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
* See COPYRIGHT in top-level directory
*/

#include "ad_pmembb.h"
#include "ad_peanuts.h"
#include "adioi.h"

int ADIOI_PMEMBB_ReadDone(ADIO_Request *request, ADIO_Status *status, int *error_code)
int ADIOI_PEANUTS_ReadDone(ADIO_Request *request, ADIO_Status *status, int *error_code)
{
DEBUG_PRINT(MPI_COMM_SELF, "called on ADIO_REQUEST_NULL");
*error_code = MPI_SUCCESS;
return 1;
}

int ADIOI_PMEMBB_WriteDone(ADIO_Request *request, ADIO_Status *status, int *error_code)
int ADIOI_PEANUTS_WriteDone(ADIO_Request *request, ADIO_Status *status, int *error_code)
{
DEBUG_PRINT(MPI_COMM_SELF, "called on ADIO_REQUEST_NULL");
*error_code = MPI_SUCCESS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
* See COPYRIGHT in top-level directory
*/

#include "ad_pmembb.h"
#include "ad_peanuts.h"
#include "adio_extern.h"
#include "adioi.h"

void ADIOI_PMEMBB_Fcntl(ADIO_File fd, int flag, ADIO_Fcntl_t *fcntl_struct, int *error_code)
void ADIOI_PEANUTS_Fcntl(ADIO_File fd, int flag, ADIO_Fcntl_t *fcntl_struct, int *error_code)
{
DEBUG_PRINT(fd->comm, fd->filename);

*error_code = MPI_SUCCESS;

switch (flag) {
case ADIO_FCNTL_GET_FSIZE:
rpmbb_handler_t handler = (rpmbb_handler_t) fd->fs_ptr;
peanuts_handler_t handler = (peanuts_handler_t) fd->fs_ptr;
size_t fsize;
int ret;
ret = rpmbb_bb_size(handler, &fsize);
ret = peanuts_bb_size(handler, &fsize);
if(ret != 0) {
*error_code = ADIOI_Err_create_code(__func__, fd->filename, -ret);
return;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "ad_pmembb.h"
#include "ad_peanuts.h"

int ADIOI_PMEMBB_Feature(ADIO_File fd, int flag)
int ADIOI_PEANUTS_Feature(ADIO_File fd, int flag)
{
switch (flag) {
case ADIO_SCALABLE_RESIZE:
Expand Down
Loading

0 comments on commit 9f7f4cd

Please sign in to comment.