diff --git a/benchmarks/blk_mt/blk_mt.c b/benchmarks/blk_mt/blk_mt.c
index f34c24684d67bdc88b63f529dd5a14aa1caa9a49..d3ff17c820348ee6848add98139e6c3a03666056 100644
--- a/benchmarks/blk_mt/blk_mt.c
+++ b/benchmarks/blk_mt/blk_mt.c
@@ -152,10 +152,10 @@ main(int argc, char *argv[])
} else {
close(worker_params[0].file_desc);
worker_params[0].file_desc = -1;
- if ((worker_params[0].handle = pmemblk_pool_open(
+ if ((worker_params[0].handle = pmemblk_open(
arguments.file_path,
worker_params[0].block_size)) == NULL) {
- fprintf(stderr, "!%s: pmemblk_pool_open\n", argv[2]);
+ fprintf(stderr, "!%s: pmemblk_open\n", argv[2]);
exit(1);
}
worker_params[0].num_blocks = pmemblk_nblock(
@@ -215,15 +215,15 @@ main(int argc, char *argv[])
/* cleanup and check pmem file */
if (!arguments.file_io) {
- pmemblk_pool_close(worker_params[0].handle);
+ pmemblk_close(worker_params[0].handle);
/* not really necessary, but check consistency */
- int result = pmemblk_pool_check(arguments.file_path);
+ int result = pmemblk_check(arguments.file_path);
if (result < 0) {
- fprintf(stderr, "!%s: pmemblk_pool_check\n",
+ fprintf(stderr, "!%s: pmemblk_check\n",
arguments.file_path);
} else if (result == 0) {
- fprintf(stderr, "%s: pmemblk_pool_check: not "
+ fprintf(stderr, "%s: pmemblk_check: not "
"consistent\n", arguments.file_path);
}
}
diff --git a/benchmarks/log_mt/log_mt.c b/benchmarks/log_mt/log_mt.c
index 2dcd77f1cf7f8b1e9a77b3087b6301d88061928c..122f38adf92a579c9104f21ebbb239ec381d8594 100644
--- a/benchmarks/log_mt/log_mt.c
+++ b/benchmarks/log_mt/log_mt.c
@@ -141,8 +141,8 @@ main(int argc, char *argv[])
exit(1);
}
- if ((plp = pmemlog_pool_open(args.file_name)) == NULL) {
- perror("pmemlog_pool_open");
+ if ((plp = pmemlog_open(args.file_name)) == NULL) {
+ perror("pmemlog_open");
exit(1);
}
Tasks = Tasks_pmemlog;
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
if (args.fileio_mode) {
close(fd);
} else {
- pmemlog_pool_close(plp);
+ pmemlog_close(plp);
}
(fails == 0) ? exit(0) : exit(1);
diff --git a/benchmarks/vmem_mt/vmem_mt.c b/benchmarks/vmem_mt/vmem_mt.c
index 3e9182165e3274e07480a346e555e7034d2f05dd..1f0ee51523e6ad51c6a06b3f612994f3b633ea8d 100644
--- a/benchmarks/vmem_mt/vmem_mt.c
+++ b/benchmarks/vmem_mt/vmem_mt.c
@@ -302,14 +302,14 @@ main(int argc, char *argv[])
}
/* suppress valgrind warnings */
memset(pools_data[i], 0xFF, pool_size);
- pools[i] = vmem_pool_create_in_region(
+ pools[i] = vmem_create_in_region(
pools_data[i], pool_size);
} else {
- pools[i] = vmem_pool_create(arguments.dir_path,
+ pools[i] = vmem_create(arguments.dir_path,
pool_size);
}
if (pools[i] == NULL) {
- perror("vmem_pool_create");
+ perror("vmem_create");
free(allocated_mem);
return EXIT_FAILURE;
}
@@ -334,7 +334,7 @@ main(int argc, char *argv[])
if (arguments.allocator == ALLOCATOR_VMEM) {
for (i = 0; i < pools_count; ++i) {
- vmem_pool_delete(pools[i]);
+ vmem_delete(pools[i]);
if (arguments.dir_path == NULL) {
if (pools_data[i] != NULL)
munmap(pools_data[i], pool_size);
diff --git a/doc/libvmem.3 b/doc/libvmem.3
index 68f4bc97a883f0dc7610203131e2fd428666a545..f0caf42cd894e0d95a965b9be5f910f5f90371c1 100644
--- a/doc/libvmem.3
+++ b/doc/libvmem.3
@@ -116,7 +116,7 @@ Under normal usage,
.B libvmem
will never print messages or intentionally cause the process to exit.
Exceptions to this are prints caused by calls to
-.BR vmem_pool_stats_print (),
+.BR vmem_stats_print (),
or by enabling debugging as described under
.B DEBUGGING
below.
@@ -154,7 +154,7 @@ To use
a
.I memory pool
is first created. This is most commonly done with the
-.BR vmem_pool_create ()
+.BR vmem_create ()
function described in this section.
The other functions
described in this section are for less common cases, where
@@ -167,10 +167,10 @@ of type
which is passed to the functions for memory allocation described in
the next section.
.PP
-.BI "VMEM *vmem_pool_create(const char *" dir ", size_t " size );
+.BI "VMEM *vmem_create(const char *" dir ", size_t " size );
.IP
The
-.BR vmem_pool_create ()
+.BR vmem_create ()
function creates a memory pool. The resulting pool is then used with
functions like
.BR vmem_malloc ()
@@ -179,7 +179,7 @@ and
to provide the familiar
.I malloc-like
programming model for the memory pool.
-.BR vmem_pool_create ()
+.BR vmem_create ()
creates the pool by allocating a
temporary file in the given directory
.IR dir .
@@ -197,7 +197,7 @@ value allowed by the library is defined in
as
.BR VMEM_MIN_POOL .
Calling
-.BR vmem_pool_create ()
+.BR vmem_create ()
with a size smaller than that will return an error.
The maximum allowed size is not limited by
.BR libvmem ,
@@ -209,7 +209,7 @@ The
passed in is the raw size of the memory pool and
.B libvmem
will use some of that space for its own metadata.
-.BR vmem_pool_create ()
+.BR vmem_create ()
returns an opaque memory pool handle or NULL if an error occurred
(in which case
.I errno
@@ -217,28 +217,28 @@ is set appropriately). The opaque memory pool handle
is then used with the other functions
described in this man page that operate on a specific memory pool.
.PP
-.BI "VMEM *vmem_pool_create_in_region(void *" addr ", size_t " size );
+.BI "VMEM *vmem_create_in_region(void *" addr ", size_t " size );
.IP
The
-.BR vmem_pool_create_in_region ()
+.BR vmem_create_in_region ()
is an alternate
.B libvmem
entry point for creating a memory pool.
It is for the rare case where an application needs to create
a memory pool from an already memory-mapped region.
Instead of allocating space from a given file system,
-.BR vmem_pool_create_in_region ()
+.BR vmem_create_in_region ()
is given the memory region explicitly via the
.I addr
and
.I size
arguments.
Any data in the region is lost by calling
-.BR vmem_pool_create_in_region (),
+.BR vmem_create_in_region (),
which will immediately store its own data structures for managing
the pool there.
Like
-.BR vmem_pool_create ()
+.BR vmem_create ()
above, the minimum
.I size
allowed is defined as
@@ -246,26 +246,26 @@ allowed is defined as
The
.I addr
argument must be page aligned.
-.BR vmem_pool_create_in_region ()
+.BR vmem_create_in_region ()
returns an opaque memory pool handle or NULL if an error occurred
(in which case
.I errno
is set appropriately).
.PP
-.BI "void vmem_pool_delete(VMEM *" vmp );
+.BI "void vmem_delete(VMEM *" vmp );
.IP
The
-.BR vmem_pool_delete ()
+.BR vmem_delete ()
function releases the memory pool
.IR vmp .
If the memory pool was created using
.BR vmem_create_pool (),
deleting it allows the space to be reclaimed.
.PP
-.BI "int vmem_pool_check(VMEM *" vmp );
+.BI "int vmem_check(VMEM *" vmp );
.IP
The
-.BR vmem_pool_check ()
+.BR vmem_check ()
function
performs an extensive consistency check of all
.B libvmem
@@ -281,19 +281,19 @@ is at least 1 (see
.B DEBUGGING
below).
During the consistency check performed by
-.BR vmem_pool_check (),
+.BR vmem_check (),
other operations on the same memory pool are locked out.
The checks are all read-only;
-.BR vmem_pool_check ()
+.BR vmem_check ()
never modifies the memory pool.
This function is mostly useful for
.B libvmem
developers during testing/debugging.
.PP
-.BI "int vmem_pool_freespace(VMEM *" vmp );
+.BI "int vmem_freespace(VMEM *" vmp );
.IP
The
-.BR vmem_pool_freespace ()
+.BR vmem_freespace ()
function returns the amount of unallocated space available
in the memory pool
.IR vmp .
@@ -302,10 +302,10 @@ an approximation since different allocation patterns will require
.B libvmem
to use up different amounts of space for internal metadata.
.PP
-.BI "void vmem_pool_stats_print(VMEM *" vmp ", const char *" opts );
+.BI "void vmem_stats_print(VMEM *" vmp ", const char *" opts );
.IP
The
-.BR vmem_pool_stats_print ()
+.BR vmem_stats_print ()
function produces messages containing statistics about the
given memory pool.
The output is printed using
@@ -594,7 +594,7 @@ The
function is called by
.B libvmem
when the
-.BR vmem_pool_stats_print ()
+.BR vmem_stats_print ()
entry point is used, or when additional tracing is enabled
in the debug version of the library as described in the
.B DEBUGGING
@@ -637,7 +637,7 @@ This is the default level when
.B VMEM_LOG_LEVEL
is not set.
Only statistics are logged, and then only in response to a call to
-.BR vmem_pool_stats_print ().
+.BR vmem_stats_print ().
.IP 1
Additional details on any errors detected are logged (in addition
to returning the errno-based errors as usual).
@@ -688,9 +688,9 @@ main()
char *ptr;
/* create minimum size pool of memory */
- if ((vmp = vmem_pool_create("/pmem-fs",
+ if ((vmp = vmem_create("/pmem-fs",
VMEM_MIN_POOL)) == NULL) {
- perror("vmem_pool_create");
+ perror("vmem_create");
exit(1);
}
diff --git a/examples/libpmemblk/assetdb/asset_checkout.c b/examples/libpmemblk/assetdb/asset_checkout.c
index 239f77b7fdc36af0ecae73aa1cb5971b71a3c4a7..f39c4c0c3888532bbb0ca02d66250f2b6f3179b0 100644
--- a/examples/libpmemblk/assetdb/asset_checkout.c
+++ b/examples/libpmemblk/assetdb/asset_checkout.c
@@ -64,7 +64,7 @@ main(int argc, char *argv[])
/* open an array of atomically writable elements */
if ((pbp = pmemblk_open(path, sizeof (struct asset))) == NULL) {
- perror("pmemblk_pool_open");
+ perror("pmemblk_open");
exit(1);
}
diff --git a/examples/libpmemblk/assetdb/asset_load.c b/examples/libpmemblk/assetdb/asset_load.c
index 9fcf01a39fbaa4587b6de0ad789e35af1affcad1..c2e0b4815864b4439720e4f4b10523e406ef8934 100644
--- a/examples/libpmemblk/assetdb/asset_load.c
+++ b/examples/libpmemblk/assetdb/asset_load.c
@@ -113,5 +113,5 @@ main(int argc, char *argv[])
free(line);
fclose(fp);
- pmemblk_pool_close(pbp);
+ pmemblk_close(pbp);
}
diff --git a/src/blk.c b/src/blk.c
index 75dabce5598185c0422ef4b554f01d96380c97d5..a6c95c5dad647ac8901316402a8f12e58429ae8a 100644
--- a/src/blk.c
+++ b/src/blk.c
@@ -235,7 +235,7 @@ static const struct ns_callback ns_cb = {
};
/*
- * pmemblk_pool_map_common -- (internal) map a block memory pool
+ * pmemblk_map_common -- (internal) map a block memory pool
*
* This routine does all the work, but takes a rdonly flag so internal
* calls can map a read-only pool if required.
@@ -247,7 +247,7 @@ static const struct ns_callback ns_cb = {
* will supply the block size).
*/
static PMEMblkpool *
-pmemblk_pool_map_common(int fd, size_t poolsize, size_t bsize, int rdonly,
+pmemblk_map_common(int fd, size_t poolsize, size_t bsize, int rdonly,
int empty)
{
LOG(3, "fd %d poolsize %zu bsize %zu rdonly %d empty %d",
@@ -432,10 +432,10 @@ err:
}
/*
- * pmemblk_pool_create -- create a block memory pool
+ * pmemblk_create -- create a block memory pool
*/
PMEMblkpool *
-pmemblk_pool_create(const char *path, size_t bsize, size_t poolsize,
+pmemblk_create(const char *path, size_t bsize, size_t poolsize,
mode_t mode)
{
LOG(3, "path %s bsize %zu poolsize %zu mode %d",
@@ -452,14 +452,14 @@ pmemblk_pool_create(const char *path, size_t bsize, size_t poolsize,
if (fd == -1)
return NULL; /* errno set by util_pool_create/open() */
- return pmemblk_pool_map_common(fd, poolsize, bsize, 0, 1);
+ return pmemblk_map_common(fd, poolsize, bsize, 0, 1);
}
/*
- * pmemblk_pool_open -- open a block memory pool
+ * pmemblk_open -- open a block memory pool
*/
PMEMblkpool *
-pmemblk_pool_open(const char *path, size_t bsize)
+pmemblk_open(const char *path, size_t bsize)
{
LOG(3, "path %s bsize %zu", path, bsize);
@@ -469,14 +469,14 @@ pmemblk_pool_open(const char *path, size_t bsize)
if ((fd = util_pool_open(path, &poolsize, PMEMBLK_MIN_POOL)) == -1)
return NULL; /* errno set by util_pool_open() */
- return pmemblk_pool_map_common(fd, poolsize, bsize, 0, 0);
+ return pmemblk_map_common(fd, poolsize, bsize, 0, 0);
}
/*
- * pmemblk_pool_close -- close a block memory pool
+ * pmemblk_close -- close a block memory pool
*/
void
-pmemblk_pool_close(PMEMblkpool *pbp)
+pmemblk_close(PMEMblkpool *pbp)
{
LOG(3, "pbp %p", pbp);
@@ -605,10 +605,10 @@ pmemblk_set_error(PMEMblkpool *pbp, off_t blockno)
}
/*
- * pmemblk_pool_check -- block memory pool consistency check
+ * pmemblk_check -- block memory pool consistency check
*/
int
-pmemblk_pool_check(const char *path)
+pmemblk_check(const char *path)
{
LOG(3, "path \"%s\"", path);
@@ -619,14 +619,14 @@ pmemblk_pool_check(const char *path)
return -1; /* errno set by util_pool_open() */
/* map the pool read-only */
- PMEMblkpool *pbp = pmemblk_pool_map_common(fd, poolsize, 0, 1, 0);
+ PMEMblkpool *pbp = pmemblk_map_common(fd, poolsize, 0, 1, 0);
if (pbp == NULL)
- return -1; /* errno set by pmemblk_pool_map_common() */
+ return -1; /* errno set by pmemblk_map_common() */
int retval = btt_check(pbp->bttp);
int oerrno = errno;
- pmemblk_pool_close(pbp);
+ pmemblk_close(pbp);
errno = oerrno;
return retval;
diff --git a/src/include/libpmemblk.h b/src/include/libpmemblk.h
index 846f5386dad6e3b5d2c9e49937b1b6c17f6748dd..08633ef1297e092a83da92e02d163279f379ee57 100644
--- a/src/include/libpmemblk.h
+++ b/src/include/libpmemblk.h
@@ -69,11 +69,11 @@ const char *pmemblk_check_version(
#define PMEMBLK_MIN_POOL ((size_t)(1 << 30)) /* min pool size: 1GB */
#define PMEMBLK_MIN_BLK ((size_t)512)
-PMEMblkpool *pmemblk_pool_open(const char *path, size_t bsize);
-PMEMblkpool *pmemblk_pool_create(const char *path, size_t bsize,
+PMEMblkpool *pmemblk_open(const char *path, size_t bsize);
+PMEMblkpool *pmemblk_create(const char *path, size_t bsize,
size_t poolsize, mode_t mode);
-void pmemblk_pool_close(PMEMblkpool *pbp);
-int pmemblk_pool_check(const char *path);
+void pmemblk_close(PMEMblkpool *pbp);
+int pmemblk_check(const char *path);
size_t pmemblk_nblock(PMEMblkpool *pbp);
int pmemblk_read(PMEMblkpool *pbp, void *buf, off_t blockno);
int pmemblk_write(PMEMblkpool *pbp, const void *buf, off_t blockno);
diff --git a/src/include/libpmemlog.h b/src/include/libpmemlog.h
index 57397a6b8d97ada8b4f9ac12311fffcbd126ec86..223fcb1d971e90b4b3043eddd3f576a4ca6c0e11 100644
--- a/src/include/libpmemlog.h
+++ b/src/include/libpmemlog.h
@@ -73,11 +73,10 @@ const char *pmemlog_check_version(
*/
#define PMEMLOG_MIN_POOL ((size_t)(1024 * 1024 * 2)) /* min pool size: 2MB */
-PMEMlogpool *pmemlog_pool_open(const char *path);
-PMEMlogpool *pmemlog_pool_create(const char *path, size_t poolsize,
- mode_t mode);
-void pmemlog_pool_close(PMEMlogpool *plp);
-int pmemlog_pool_check(const char *path);
+PMEMlogpool *pmemlog_open(const char *path);
+PMEMlogpool *pmemlog_create(const char *path, size_t poolsize, mode_t mode);
+void pmemlog_close(PMEMlogpool *plp);
+int pmemlog_check(const char *path);
size_t pmemlog_nbyte(PMEMlogpool *plp);
int pmemlog_append(PMEMlogpool *plp, const void *buf, size_t count);
int pmemlog_appendv(PMEMlogpool *plp, const struct iovec *iov, int iovcnt);
diff --git a/src/include/libpmemobj.h b/src/include/libpmemobj.h
index 6d115eaf57cebfc25f2595b61c91bfa418a385fa..aa9d8611accab943bc0c04d99cbf8ee3557c6a8e 100644
--- a/src/include/libpmemobj.h
+++ b/src/include/libpmemobj.h
@@ -69,11 +69,11 @@ const char *pmemobj_check_version(
#define PMEMOBJ_MIN_POOL ((size_t)(1 << 21)) /* min pool size: 2MB */
#define PMEMOBJ_LAYOUT_MAX ((size_t)1024)
-PMEMobjpool *pmemobj_pool_open(const char *path, const char *layout);
-PMEMobjpool *pmemobj_pool_create(const char *path, const char *layout,
+PMEMobjpool *pmemobj_open(const char *path, const char *layout);
+PMEMobjpool *pmemobj_create(const char *path, const char *layout,
size_t poolsize, mode_t mode);
-void pmemobj_pool_close(PMEMobjpool *pop);
-int pmemobj_pool_check(const char *path, const char *layout);
+void pmemobj_close(PMEMobjpool *pop);
+int pmemobj_check(const char *path, const char *layout);
/*
* Passing NULL to pmemobj_set_funcs() tells libpmemobj to continue to use the
diff --git a/src/include/libvmem.h b/src/include/libvmem.h
index ba70969bc9e1e186d63945aace71f0879eee0d7c..c51e21afa0fbfce381fe01f997de597db49515cc 100644
--- a/src/include/libvmem.h
+++ b/src/include/libvmem.h
@@ -55,12 +55,12 @@ typedef struct vmem VMEM; /* opaque type internal to libvmem */
#define VMEM_MIN_POOL ((size_t)(1024 * 1024 * 14)) /* min pool size: 14MB */
-VMEM *vmem_pool_create(const char *dir, size_t size);
-VMEM *vmem_pool_create_in_region(void *addr, size_t size);
-void vmem_pool_delete(VMEM *vmp);
-int vmem_pool_check(VMEM *vmp);
-size_t vmem_pool_freespace(VMEM *vmp);
-void vmem_pool_stats_print(VMEM *vmp, const char *opts);
+VMEM *vmem_create(const char *dir, size_t size);
+VMEM *vmem_create_in_region(void *addr, size_t size);
+void vmem_delete(VMEM *vmp);
+int vmem_check(VMEM *vmp);
+size_t vmem_freespace(VMEM *vmp);
+void vmem_stats_print(VMEM *vmp, const char *opts);
/*
* support for malloc and friends...
@@ -96,7 +96,7 @@ const char *vmem_check_version(
*
* The print_func is called by libvmem based on the environment
* variable VMEM_LOG_LEVEL:
- * 0 or unset: print_func is only called for vmem_pool_stats_print()
+ * 0 or unset: print_func is only called for vmem_stats_print()
* 1: additional details are logged when errors are returned
* 2: basic operations (allocations/frees) are logged
* 3: produce very verbose tracing of function calls in libvmem
diff --git a/src/libpmemblk.map b/src/libpmemblk.map
index 28608d7da776c06862af74694eab5b29c3b2c823..cf3dff099d7df3cb265a00f5ea0399da4b55c855 100644
--- a/src/libpmemblk.map
+++ b/src/libpmemblk.map
@@ -36,10 +36,10 @@ libpmemblk.so {
global:
pmemblk_check_version;
pmemblk_set_funcs;
- pmemblk_pool_create;
- pmemblk_pool_open;
- pmemblk_pool_close;
- pmemblk_pool_check;
+ pmemblk_create;
+ pmemblk_open;
+ pmemblk_close;
+ pmemblk_check;
pmemblk_nblock;
pmemblk_read;
pmemblk_write;
diff --git a/src/libpmemlog.map b/src/libpmemlog.map
index cfa39da9ee69ddbe611b540afcf83d10aef0ae23..bd4f46556cf6e05afaedf4cf9db42a09f0bdc7f6 100644
--- a/src/libpmemlog.map
+++ b/src/libpmemlog.map
@@ -36,10 +36,10 @@ libpmemlog.so {
global:
pmemlog_check_version;
pmemlog_set_funcs;
- pmemlog_pool_create;
- pmemlog_pool_open;
- pmemlog_pool_close;
- pmemlog_pool_check;
+ pmemlog_create;
+ pmemlog_open;
+ pmemlog_close;
+ pmemlog_check;
pmemlog_nbyte;
pmemlog_append;
pmemlog_appendv;
diff --git a/src/libpmemobj.map b/src/libpmemobj.map
index cc094b0ba07d6754b05d9b6f6987081929cc0019..f0d6a0a6c89a90940376b98ab8393fc80c41cd02 100644
--- a/src/libpmemobj.map
+++ b/src/libpmemobj.map
@@ -36,10 +36,10 @@ libpmemobj.so {
global:
pmemobj_check_version;
pmemobj_set_funcs;
- pmemobj_pool_create;
- pmemobj_pool_open;
- pmemobj_pool_close;
- pmemobj_pool_check;
+ pmemobj_create;
+ pmemobj_open;
+ pmemobj_close;
+ pmemobj_check;
local:
*;
};
diff --git a/src/libvmem.map b/src/libvmem.map
index 1853d1a13361739252d8bd3b649229aea67b7c3e..4e3c07c0f0ca2ffaefb0a9694c7cee2501140c30 100644
--- a/src/libvmem.map
+++ b/src/libvmem.map
@@ -34,12 +34,12 @@
#
libvmem.so {
global:
- vmem_pool_create;
- vmem_pool_create_in_region;
- vmem_pool_delete;
- vmem_pool_check;
- vmem_pool_freespace;
- vmem_pool_stats_print;
+ vmem_create;
+ vmem_create_in_region;
+ vmem_delete;
+ vmem_check;
+ vmem_freespace;
+ vmem_stats_print;
vmem_malloc;
vmem_free;
vmem_calloc;
diff --git a/src/log.c b/src/log.c
index 4c81f985308c685ba06aa867a0f5ac3421cdb74b..62c09d309decf572228a730b3593b1216d57dce1 100644
--- a/src/log.c
+++ b/src/log.c
@@ -56,7 +56,7 @@
#include "log.h"
/*
- * pmemlog_pool_map_common -- (internal) map a log memory pool
+ * pmemlog_map_common -- (internal) map a log memory pool
*
* This routine does all the work, but takes a rdonly flag so internal
* calls can map a read-only pool if required.
@@ -65,7 +65,7 @@
* a new pool header is created. Otherwise, a valid header must exist.
*/
static PMEMlogpool *
-pmemlog_pool_map_common(int fd, size_t poolsize, int rdonly, int empty)
+pmemlog_map_common(int fd, size_t poolsize, int rdonly, int empty)
{
LOG(3, "fd %d poolsize %zu rdonly %d empty %d",
fd, poolsize, rdonly, empty);
@@ -225,10 +225,10 @@ err:
}
/*
- * pmemlog_pool_create -- create a log memory pool
+ * pmemlog_create -- create a log memory pool
*/
PMEMlogpool *
-pmemlog_pool_create(const char *path, size_t poolsize, mode_t mode)
+pmemlog_create(const char *path, size_t poolsize, mode_t mode)
{
LOG(3, "path %s poolsize %zu mode %d", path, poolsize, mode);
@@ -243,14 +243,14 @@ pmemlog_pool_create(const char *path, size_t poolsize, mode_t mode)
if (fd == -1)
return NULL; /* errno set by util_pool_create/open() */
- return pmemlog_pool_map_common(fd, poolsize, 0, 1);
+ return pmemlog_map_common(fd, poolsize, 0, 1);
}
/*
- * pmemlog_pool_open -- open an existing log memory pool
+ * pmemlog_open -- open an existing log memory pool
*/
PMEMlogpool *
-pmemlog_pool_open(const char *path)
+pmemlog_open(const char *path)
{
LOG(3, "path %s", path);
@@ -260,14 +260,14 @@ pmemlog_pool_open(const char *path)
if ((fd = util_pool_open(path, &poolsize, PMEMLOG_MIN_POOL)) == -1)
return NULL; /* errno set by util_pool_open() */
- return pmemlog_pool_map_common(fd, poolsize, 0, 0);
+ return pmemlog_map_common(fd, poolsize, 0, 0);
}
/*
- * pmemlog_pool_close -- close a log memory pool
+ * pmemlog_close -- close a log memory pool
*/
void
-pmemlog_pool_close(PMEMlogpool *plp)
+pmemlog_close(PMEMlogpool *plp)
{
LOG(3, "plp %p", plp);
@@ -591,13 +591,13 @@ pmemlog_walk(PMEMlogpool *plp, size_t chunksize,
}
/*
- * pmemlog_pool_check -- log memory pool consistency check
+ * pmemlog_check -- log memory pool consistency check
*
* Returns true if consistent, zero if inconsistent, -1/error if checking
* cannot happen due to other errors.
*/
int
-pmemlog_pool_check(const char *path)
+pmemlog_check(const char *path)
{
LOG(3, "path \"%s\"", path);
@@ -608,10 +608,10 @@ pmemlog_pool_check(const char *path)
return -1; /* errno set by util_pool_open() */
/* map the pool read-only */
- PMEMlogpool *plp = pmemlog_pool_map_common(fd, poolsize, 1, 0);
+ PMEMlogpool *plp = pmemlog_map_common(fd, poolsize, 1, 0);
if (plp == NULL)
- return -1; /* errno set by pmemlog_pool_map_common() */
+ return -1; /* errno set by pmemlog_map_common() */
int consistent = 1;
@@ -645,7 +645,7 @@ pmemlog_pool_check(const char *path)
consistent = 0;
}
- pmemlog_pool_close(plp);
+ pmemlog_close(plp);
if (consistent)
LOG(4, "pool consistency check OK");
diff --git a/src/obj.c b/src/obj.c
index 288f4a5da0e44992e2498b84cbee67bfd347042a..82d79f46f7ede3d7e788d685282b186310595a04 100644
--- a/src/obj.c
+++ b/src/obj.c
@@ -52,7 +52,7 @@
#include "obj.h"
/*
- * pmemobj_pool_map_common -- (internal) map a transactional memory pool
+ * pmemobj_map_common -- (internal) map a transactional memory pool
*
* This routine does all the work, but takes a rdonly flag so internal
* calls can map a read-only pool if required.
@@ -61,7 +61,7 @@
* new pool header is created. Otherwise, a valid header must exist.
*/
static PMEMobjpool *
-pmemobj_pool_map_common(int fd, const char *layout, size_t poolsize, int rdonly,
+pmemobj_map_common(int fd, const char *layout, size_t poolsize, int rdonly,
int empty)
{
LOG(3, "fd %d layout %s poolsize %zu rdonly %d empty %d",
@@ -200,10 +200,10 @@ err:
}
/*
- * pmemobj_pool_create -- create a transactional memory pool
+ * pmemobj_create -- create a transactional memory pool
*/
PMEMobjpool *
-pmemobj_pool_create(const char *path, const char *layout, size_t poolsize,
+pmemobj_create(const char *path, const char *layout, size_t poolsize,
mode_t mode)
{
LOG(3, "path %s layout %s poolsize %zu mode %d",
@@ -220,14 +220,14 @@ pmemobj_pool_create(const char *path, const char *layout, size_t poolsize,
if (fd == -1)
return NULL; /* errno set by util_pool_create/open() */
- return pmemobj_pool_map_common(fd, layout, poolsize, 0, 1);
+ return pmemobj_map_common(fd, layout, poolsize, 0, 1);
}
/*
- * pmemobj_pool_open -- open a transactional memory pool
+ * pmemobj_open -- open a transactional memory pool
*/
PMEMobjpool *
-pmemobj_pool_open(const char *path, const char *layout)
+pmemobj_open(const char *path, const char *layout)
{
LOG(3, "path %s layout %s", path, layout);
@@ -237,14 +237,14 @@ pmemobj_pool_open(const char *path, const char *layout)
if ((fd = util_pool_open(path, &poolsize, PMEMOBJ_MIN_POOL)) == -1)
return NULL; /* errno set by util_pool_open() */
- return pmemobj_pool_map_common(fd, layout, poolsize, 0, 0);
+ return pmemobj_map_common(fd, layout, poolsize, 0, 0);
}
/*
- * pmemobj_pool_close -- close a transactional memory pool
+ * pmemobj_close -- close a transactional memory pool
*/
void
-pmemobj_pool_close(PMEMobjpool *pop)
+pmemobj_close(PMEMobjpool *pop)
{
LOG(3, "pop %p", pop);
@@ -254,10 +254,10 @@ pmemobj_pool_close(PMEMobjpool *pop)
}
/*
- * pmemobj_pool_check -- transactional memory pool consistency check
+ * pmemobj_check -- transactional memory pool consistency check
*/
int
-pmemobj_pool_check(const char *path, const char *layout)
+pmemobj_check(const char *path, const char *layout)
{
LOG(3, "path %s layout %s", path, layout);
@@ -268,16 +268,16 @@ pmemobj_pool_check(const char *path, const char *layout)
return -1; /* errno set by util_pool_open() */
/* map the pool read-only */
- PMEMobjpool *pop = pmemobj_pool_map_common(fd, layout, poolsize, 1, 0);
+ PMEMobjpool *pop = pmemobj_map_common(fd, layout, poolsize, 1, 0);
if (pop == NULL)
- return -1; /* errno set by pmemobj_pool_map_common() */
+ return -1; /* errno set by pmemobj_map_common() */
int consistent = 1;
/* XXX validate metadata */
- pmemobj_pool_close(pop);
+ pmemobj_close(pop);
if (consistent)
LOG(4, "pool consistency check OK");
diff --git a/src/test/Makefile b/src/test/Makefile
index 00eceaebacda1b3065f9142568c09ba7de8a5631..aae2bba3a05727853d6827cdb7f89015d5391793 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -46,7 +46,7 @@ TEST = blk_nblock\
pmem_isa_proc\
pmem_is_pmem\
pmem_is_pmem_proc\
- pmem_map_raw\
+ pmem_map\
scope\
traces\
traces_custom_function\
@@ -64,10 +64,10 @@ TEST = blk_nblock\
vmem_mix_allocations\
vmem_multiple_pools\
vmem_out_of_memory\
- vmem_pool_check\
- vmem_pool_create\
- vmem_pool_create_error\
- vmem_pool_create_in_region\
+ vmem_check\
+ vmem_create\
+ vmem_create_error\
+ vmem_create_in_region\
vmem_realloc\
vmem_stats\
vmem_strdup\
diff --git a/src/test/blk_nblock/README b/src/test/blk_nblock/README
index e325d53aa591d0387db2afa457af8cf3daa745de..4dfd430ba5e35280f81acf354c474c25fbaa0c28 100644
--- a/src/test/blk_nblock/README
+++ b/src/test/blk_nblock/README
@@ -9,5 +9,5 @@ For example:
./blk_nblock 4096:file1
-this will call pmemblk_pool_open() on file1 and then report what pmemblk_nblock()
+this will call pmemblk_open() on file1 and then report what pmemblk_nblock()
reports back as the usable size.
diff --git a/src/test/blk_nblock/blk_nblock.c b/src/test/blk_nblock/blk_nblock.c
index b6fbd0026ff575cdbe124c5270d58b30e8f3833d..c0f2bde3ca16756282fcfb4357a44e5389bf725b 100644
--- a/src/test/blk_nblock/blk_nblock.c
+++ b/src/test/blk_nblock/blk_nblock.c
@@ -134,19 +134,18 @@ main(int argc, char *argv[])
fname++;
PMEMblkpool *handle;
- handle = pmemblk_pool_create(fname, bsize, 0, S_IWUSR);
+ handle = pmemblk_create(fname, bsize, 0, S_IWUSR);
if (handle == NULL) {
- OUT("!%s: pmemblk_pool_create", fname);
+ OUT("!%s: pmemblk_create", fname);
} else {
OUT("%s: block size %zu usable blocks: %zu",
fname, bsize, pmemblk_nblock(handle));
- pmemblk_pool_close(handle);
- int result = pmemblk_pool_check(fname);
+ pmemblk_close(handle);
+ int result = pmemblk_check(fname);
if (result < 0)
- OUT("!%s: pmemblk_pool_check", fname);
+ OUT("!%s: pmemblk_check", fname);
else if (result == 0)
- OUT("%s: pmemblk_pool_check: not consistent",
- fname);
+ OUT("%s: pmemblk_check: not consistent", fname);
}
}
diff --git a/src/test/blk_nblock/out0.log.match b/src/test/blk_nblock/out0.log.match
index 47fb2f6f5bc6a714b20220c3113ebcc2f538cbae..fbd71ab735e029cee4f3c8de9c9575125c6d170e 100644
--- a/src/test/blk_nblock/out0.log.match
+++ b/src/test/blk_nblock/out0.log.match
@@ -1,8 +1,8 @@
blk_nblock/TEST0: START: blk_nblock
./blk_nblock$(*) 512:$(*)/testfile1 512:$(*)/testfile2.512 4096:$(*)/testfile2.512 520:$(*)/testfile2.520 528:$(*)/testfile2.528 4096:$(*)/testfile2.4096 4160:$(*)/testfile2.4160 4224:$(*)/testfile2.4224 512:$(*)/testfile3.512 520:$(*)/testfile3.520 528:$(*)/testfile3.528 4096:$(*)/testfile3.4096 4160:$(*)/testfile3.4160 4224:$(*)/testfile3.4224 512:$(*)/testfile4.512 520:$(*)/testfile4.520 528:$(*)/testfile4.528 4096:$(*)/testfile4.4096 4160:$(*)/testfile4.4160 4224:$(*)/testfile4.4224 512:$(*)/testfile5.512 520:$(*)/testfile5.520 528:$(*)/testfile5.528 4096:$(*)/testfile5.4096 4160:$(*)/testfile5.4160 4224:$(*)/testfile5.4224 512:$(*)/testfile6.512 520:$(*)/testfile6.520 528:$(*)/testfile6.528 4096:$(*)/testfile6.4096 4160:$(*)/testfile6.4160 4224:$(*)/testfile6.4224
-$(*)/testfile1: pmemblk_pool_create: Invalid argument
+$(*)/testfile1: pmemblk_create: Invalid argument
$(*)/testfile2.512: block size 512 usable blocks: 4161462
-$(*)/testfile2.512: pmemblk_pool_create: Invalid argument
+$(*)/testfile2.512: pmemblk_create: Invalid argument
$(*)/testfile2.520: block size 520 usable blocks: 2781410
$(*)/testfile2.528: block size 528 usable blocks: 2781410
$(*)/testfile2.4096: block size 4096 usable blocks: 523511
diff --git a/src/test/blk_nblock/out1.log.match b/src/test/blk_nblock/out1.log.match
index 4ce2e52f39ed978d9016c054238b28f261b645fa..f082c181fa4ed0875a523f5802a0618b3334f9ae 100644
--- a/src/test/blk_nblock/out1.log.match
+++ b/src/test/blk_nblock/out1.log.match
@@ -1,22 +1,22 @@
blk_nblock/TEST1: START: blk_nblock
./blk_nblock$(*) 2096896:$(*)/testfile1.2096896 2096897:$(*)/testfile1.2096897 0:$(*)/testfile2.0 1:$(*)/testfile2.1 17:$(*)/testfile2.17 511:$(*)/testfile2.511 1048576:$(*)/testfile2.1048576 2097152:$(*)/testfile2.2097152 4194304:$(*)/testfile2.4194304 8388608:$(*)/testfile2.8388608 16777216:$(*)/testfile2.16777216 33554432:$(*)/testfile2.33554432 67108864:$(*)/testfile2.67108864 134217728:$(*)/testfile2.134217728 268435456:$(*)/testfile2.268435456 536870912:$(*)/testfile2.536870912 1073741824:$(*)/testfile2.1073741824 2147483648:$(*)/testfile2.2147483648 -1:$(*)/testfile2.-1
$(*)/testfile1.2096896: block size 2096896 usable blocks: 256
-$(*)/testfile1.2096897: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.0: pmemblk_pool_create: Invalid argument
+$(*)/testfile1.2096897: pmemblk_create: Invalid argument
+$(*)/testfile2.0: pmemblk_create: Invalid argument
$(*)/testfile2.1: block size 1 usable blocks: 4161462
$(*)/testfile2.17: block size 17 usable blocks: 4161462
$(*)/testfile2.511: block size 511 usable blocks: 4161462
$(*)/testfile2.1048576: block size 1048576 usable blocks: 1791
$(*)/testfile2.2097152: block size 2097152 usable blocks: 767
-$(*)/testfile2.4194304: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.8388608: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.16777216: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.33554432: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.67108864: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.134217728: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.268435456: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.536870912: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.1073741824: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.2147483648: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.-1: pmemblk_pool_create: Invalid argument
+$(*)/testfile2.4194304: pmemblk_create: Invalid argument
+$(*)/testfile2.8388608: pmemblk_create: Invalid argument
+$(*)/testfile2.16777216: pmemblk_create: Invalid argument
+$(*)/testfile2.33554432: pmemblk_create: Invalid argument
+$(*)/testfile2.67108864: pmemblk_create: Invalid argument
+$(*)/testfile2.134217728: pmemblk_create: Invalid argument
+$(*)/testfile2.268435456: pmemblk_create: Invalid argument
+$(*)/testfile2.536870912: pmemblk_create: Invalid argument
+$(*)/testfile2.1073741824: pmemblk_create: Invalid argument
+$(*)/testfile2.2147483648: pmemblk_create: Invalid argument
+$(*)/testfile2.-1: pmemblk_create: Invalid argument
blk_nblock/TEST1: Done
diff --git a/src/test/blk_recovery/README b/src/test/blk_recovery/README
index ea65a9781c79f9b02f51f6ec225c566795eaa5d3..e0e3566d7464aa8e71563f1c0411f25c1becbbc5 100644
--- a/src/test/blk_recovery/README
+++ b/src/test/blk_recovery/README
@@ -13,11 +13,11 @@ For example:
./blk_recovery 4096 file1 5 10
-this will call pmemblk_pool_open() on file1, call pmemblk_write() for LBA 5
+this will call pmemblk_open() on file1, call pmemblk_write() for LBA 5
(causing all the layout to be written), then it will change the memory
protection on the arena map area to read-only. Next, pmemblk_write()
is called for for LBA 10 and SIGSEGV is caught and reported. Finally,
-pmemblk_pool_check() is called.
+pmemblk_check() is called.
This is not a perfect simulation of a system interruption, but does allow
creating a file where a write was interrupted before updating the map.
diff --git a/src/test/blk_recovery/TEST0 b/src/test/blk_recovery/TEST0
index 7715888c91226ffaee7d9badbe145e0221e72942..d591cd53c7f8f401ee1db715e9020a65b2467e58 100755
--- a/src/test/blk_recovery/TEST0
+++ b/src/test/blk_recovery/TEST0
@@ -51,7 +51,7 @@ rm -f $DIR/testfile1
truncate -s 2G $DIR/testfile1
#
-# Simple case, one write interrupted. pmemblk_pool_check() should note
+# Simple case, one write interrupted. pmemblk_check() should note
# that testfile1 is consistent (after recovery steps were taken).
#
expect_normal_exit ./blk_recovery$EXESUFFIX 4096 $DIR/testfile1 5 10
diff --git a/src/test/blk_recovery/blk_recovery.c b/src/test/blk_recovery/blk_recovery.c
index 0ae50aa7e0a0838b7e084055b4830ee003984e48..dbd7c273c09959c6e5b9e7b39ee4578c163c9ec0 100644
--- a/src/test/blk_recovery/blk_recovery.c
+++ b/src/test/blk_recovery/blk_recovery.c
@@ -108,8 +108,8 @@ main(int argc, char *argv[])
const char *path = argv[2];
PMEMblkpool *handle;
- if ((handle = pmemblk_pool_create(path, Bsize, 0, S_IWUSR)) == NULL)
- FATAL("!%s: pmemblk_pool_create", path);
+ if ((handle = pmemblk_create(path, Bsize, 0, S_IWUSR)) == NULL)
+ FATAL("!%s: pmemblk_create", path);
OUT("%s block size %zu usable blocks %zu",
argv[1], Bsize, pmemblk_nblock(handle));
@@ -151,13 +151,13 @@ main(int argc, char *argv[])
FATAL("write lba %zu: %s", lba, ident(buf));
}
- pmemblk_pool_close(handle);
+ pmemblk_close(handle);
- int result = pmemblk_pool_check(path);
+ int result = pmemblk_check(path);
if (result < 0)
- OUT("!%s: pmemblk_pool_check", path);
+ OUT("!%s: pmemblk_check", path);
else if (result == 0)
- OUT("%s: pmemblk_pool_check: not consistent", path);
+ OUT("%s: pmemblk_check: not consistent", path);
else
OUT("%s: consistent", path);
diff --git a/src/test/blk_rw/README b/src/test/blk_rw/README
index e1e89e2e36a2ee4dbaefcba3aea7bf2d419f6dd4..f10579997cfb88ce2b0f0fcb060d6d6691e5317a 100644
--- a/src/test/blk_rw/README
+++ b/src/test/blk_rw/README
@@ -9,7 +9,7 @@ operation:LBA pairs. For example:
./blk_rw 4096 file1 r:0 w:5 z:9 e:100
-this will call pmemblk_pool_open() on file1 and then pmemblk_read() for LBA 0,
+this will call pmemblk_open() on file1 and then pmemblk_read() for LBA 0,
pmemblk_write() for LBA 5, pmemblk_set_zero() for LBA 9, and pmem_set_error()
for LAB 100.
diff --git a/src/test/blk_rw/blk_rw.c b/src/test/blk_rw/blk_rw.c
index cf04a3d6acdaf53cb3d80c3c08ae1bf3011b367e..090cfaa906529e32dcd9dd6dc998332be2a83527 100644
--- a/src/test/blk_rw/blk_rw.c
+++ b/src/test/blk_rw/blk_rw.c
@@ -172,14 +172,14 @@ main(int argc, char *argv[])
PMEMblkpool *handle;
switch (*argv[3]) {
case 'c':
- handle = pmemblk_pool_create(path, Bsize, 0, S_IWUSR);
+ handle = pmemblk_create(path, Bsize, 0, S_IWUSR);
if (handle == NULL)
- FATAL("!%s: pmemblk_pool_create", path);
+ FATAL("!%s: pmemblk_create", path);
break;
case 'o':
- handle = pmemblk_pool_open(path, Bsize);
+ handle = pmemblk_open(path, Bsize);
if (handle == NULL)
- FATAL("!%s: pmemblk_pool_open", path);
+ FATAL("!%s: pmemblk_open", path);
break;
}
@@ -226,13 +226,13 @@ main(int argc, char *argv[])
}
}
- pmemblk_pool_close(handle);
+ pmemblk_close(handle);
- int result = pmemblk_pool_check(path);
+ int result = pmemblk_check(path);
if (result < 0)
- OUT("!%s: pmemblk_pool_check", path);
+ OUT("!%s: pmemblk_check", path);
else if (result == 0)
- OUT("%s: pmemblk_pool_check: not consistent", path);
+ OUT("%s: pmemblk_check: not consistent", path);
DONE(NULL);
}
diff --git a/src/test/blk_rw_mt/blk_rw_mt.c b/src/test/blk_rw_mt/blk_rw_mt.c
index cb06e331b8cbb613efccede160a3fa082b1d6d04..87e9c9e3503701fc9c18141303be5c15b1d9bd7d 100644
--- a/src/test/blk_rw_mt/blk_rw_mt.c
+++ b/src/test/blk_rw_mt/blk_rw_mt.c
@@ -119,8 +119,8 @@ main(int argc, char *argv[])
const char *path = argv[2];
- if ((Handle = pmemblk_pool_create(path, Bsize, 0, S_IWUSR)) == NULL)
- FATAL("!%s: pmemblk_pool_create", path);
+ if ((Handle = pmemblk_create(path, Bsize, 0, S_IWUSR)) == NULL)
+ FATAL("!%s: pmemblk_create", path);
if (Nblock == 0)
Nblock = pmemblk_nblock(Handle);
@@ -140,14 +140,14 @@ main(int argc, char *argv[])
for (int i = 0; i < Nthread; i++)
PTHREAD_JOIN(threads[i], NULL);
- pmemblk_pool_close(Handle);
+ pmemblk_close(Handle);
/* XXX not ready to pass this part of the test yet */
- int result = pmemblk_pool_check(path);
+ int result = pmemblk_check(path);
if (result < 0)
- OUT("!%s: pmemblk_pool_check", path);
+ OUT("!%s: pmemblk_check", path);
else if (result == 0)
- OUT("%s: pmemblk_pool_check: not consistent", path);
+ OUT("%s: pmemblk_check: not consistent", path);
DONE(NULL);
}
diff --git a/src/test/log_basic/README b/src/test/log_basic/README
index 919c5078b540ca40e94c4027db329f87c9b51fe6..74f9759f4fd91c6dcfa5e3c1766ff022dfc37e33 100644
--- a/src/test/log_basic/README
+++ b/src/test/log_basic/README
@@ -3,15 +3,15 @@ Linux NVM Library
This is src/test/log_basic/README.
This directory contains a unit test for:
-- pmemlog_pool_open
-- pmemlog_pool_close
+- pmemlog_open
+- pmemlog_close
- pmemlog_nbyte
- pmemlog_append
- pmemlog_appendv
- pmemlog_tell
- pmemlog_rewind
- pmemlog_walk
-- pmemlog_pool_check
+- pmemlog_check
The program in pmemlog.c takes a file name and a list of
diff --git a/src/test/log_basic/TEST0 b/src/test/log_basic/TEST0
index cd2bab43906cfb6c344f9248cf8d794399e93209..31f60aaecc4b1286cbd84e7ab012d26dd2b51c3f 100755
--- a/src/test/log_basic/TEST0
+++ b/src/test/log_basic/TEST0
@@ -38,9 +38,9 @@
# - pmemlog_walk
# - pmemlog_rewind
# in case of empty pool and:
-# - pmemlog_pool_check
-# - pmemlog_pool_open
-# - pmemlog_pool_close
+# - pmemlog_check
+# - pmemlog_open
+# - pmemlog_close
#
export UNITTEST_NAME=log_basic/TEST0
export UNITTEST_NUM=0
diff --git a/src/test/log_basic/TEST1 b/src/test/log_basic/TEST1
index b512f147e365314951611c570d846cf419538166..4d7fc9e1653da413ecc88ed388d2121e6d4525ef 100755
--- a/src/test/log_basic/TEST1
+++ b/src/test/log_basic/TEST1
@@ -40,9 +40,9 @@
# - pmemlog_walk
# - pmemlog_rewind
# in case of non-empty pool and
-# - pmemlog_pool_check
-# - pmemlog_pool_open
-# - pmemlog_pool_close
+# - pmemlog_check
+# - pmemlog_open
+# - pmemlog_close
#
export UNITTEST_NAME=log_basic/TEST1
export UNITTEST_NUM=1
diff --git a/src/test/log_basic/TEST2 b/src/test/log_basic/TEST2
index b9615bca372059d397ac63e2aa660a441d6df7df..74076e0ea399efe293b9762d382763331eee3c79 100755
--- a/src/test/log_basic/TEST2
+++ b/src/test/log_basic/TEST2
@@ -40,9 +40,9 @@
# - pmemlog_walk
# - pmemlog_rewind
# in case of non-empty pool and
-# - pmemlog_pool_check
-# - pmemlog_pool_open
-# - pmemlog_pool_close
+# - pmemlog_check
+# - pmemlog_open
+# - pmemlog_close
#
export UNITTEST_NAME=log_basic/TEST2
export UNITTEST_NUM=2
diff --git a/src/test/log_basic/TEST3 b/src/test/log_basic/TEST3
index dd49d9ab64e62331ad8c49f9250894f185f52013..2ddd831d519cd2794b931bbb6e228d26f68ef917 100755
--- a/src/test/log_basic/TEST3
+++ b/src/test/log_basic/TEST3
@@ -41,9 +41,9 @@
# - pmemlog_walk
# - pmemlog_rewind
# in case of non-empty pool and
-# - pmemlog_pool_check
-# - pmemlog_pool_open
-# - pmemlog_pool_close
+# - pmemlog_check
+# - pmemlog_open
+# - pmemlog_close
#
export UNITTEST_NAME=log_basic/TEST3
export UNITTEST_NUM=3
diff --git a/src/test/log_basic/log_basic.c b/src/test/log_basic/log_basic.c
index a2121536e30d6842343c3fef75dec1d8f82a8532..f2ee587e6b782a2890ec9b5382e9f783f27a7773 100644
--- a/src/test/log_basic/log_basic.c
+++ b/src/test/log_basic/log_basic.c
@@ -205,11 +205,11 @@ main(int argc, char *argv[])
const char *path = argv[1];
/* check consistency */
- result = pmemlog_pool_check(path);
+ result = pmemlog_check(path);
if (result < 0)
- OUT("!%s: pmemlog_pool_check", path);
+ OUT("!%s: pmemlog_check", path);
else if (result == 0)
- OUT("%s: pmemlog_pool_check: not consistent", path);
+ OUT("%s: pmemlog_check: not consistent", path);
int fd = OPEN(path, O_RDWR);
@@ -220,8 +220,8 @@ main(int argc, char *argv[])
CLOSE(fd);
- if ((plp = pmemlog_pool_create(path, 0, S_IWUSR)) == NULL)
- FATAL("!pmemlog_pool_create: %s", path);
+ if ((plp = pmemlog_create(path, 0, S_IWUSR)) == NULL)
+ FATAL("!pmemlog_create: %s", path);
/* go through all arguments one by one */
for (int arg = 2; arg < argc; arg++) {
@@ -257,14 +257,14 @@ main(int argc, char *argv[])
}
}
- pmemlog_pool_close(plp);
+ pmemlog_close(plp);
/* check consistency again */
- result = pmemlog_pool_check(path);
+ result = pmemlog_check(path);
if (result < 0)
- OUT("!%s: pmemlog_pool_check", path);
+ OUT("!%s: pmemlog_check", path);
else if (result == 0)
- OUT("%s: pmemlog_pool_check: not consistent", path);
+ OUT("%s: pmemlog_check: not consistent", path);
DONE(NULL);
}
diff --git a/src/test/log_basic/out0.log.match b/src/test/log_basic/out0.log.match
index 47c5f4b285caaff7a59b2a03ba7e44d7afd8b261..b21758a451415d1e153a8e1405f41455ee0f1fe3 100644
--- a/src/test/log_basic/out0.log.match
+++ b/src/test/log_basic/out0.log.match
@@ -1,6 +1,6 @@
log_basic/TEST0: START: log_basic
./log_basic$(*) $(*)/testfile1 n t w r
-$(*)/testfile1: pmemlog_pool_check: Invalid argument
+$(*)/testfile1: pmemlog_check: Invalid argument
usable size: 2088960
tell 0
diff --git a/src/test/log_basic/out1.log.match b/src/test/log_basic/out1.log.match
index d41af37496b90321554ddcfc18f32233d583b999..57ddee3aa7105a0b54eba06b2af57cb090f7f799 100644
--- a/src/test/log_basic/out1.log.match
+++ b/src/test/log_basic/out1.log.match
@@ -1,6 +1,6 @@
log_basic/TEST1: START: log_basic
./log_basic$(*) $(*)/testfile1 a n t w r t w
-$(*)/testfile1: pmemlog_pool_check: Invalid argument
+$(*)/testfile1: pmemlog_check: Invalid argument
append str[0] 1st test string
append str[1] 2nd test string
diff --git a/src/test/log_basic/out2.log.match b/src/test/log_basic/out2.log.match
index fa7dea59b38428b71df852db19532402c717812b..ac8e1fb835ca3822c7ffddf73e2bc602c7382653 100644
--- a/src/test/log_basic/out2.log.match
+++ b/src/test/log_basic/out2.log.match
@@ -1,6 +1,6 @@
log_basic/TEST2: START: log_basic
./log_basic$(*) $(*)/testfile1 v n t w r t w
-$(*)/testfile1: pmemlog_pool_check: Invalid argument
+$(*)/testfile1: pmemlog_check: Invalid argument
appendv
usable size: 2088960
tell 144
diff --git a/src/test/log_basic/out3.log.match b/src/test/log_basic/out3.log.match
index ec55d774ae3df3bc348ecf62c7d72dd888282304..d05683a077a503d79660506db4861cae913b55c0 100644
--- a/src/test/log_basic/out3.log.match
+++ b/src/test/log_basic/out3.log.match
@@ -1,6 +1,6 @@
log_basic/TEST3: START: log_basic
./log_basic$(*) $(*)/testfile1 a n t w r t w v n t w r t w
-$(*)/testfile1: pmemlog_pool_check: Invalid argument
+$(*)/testfile1: pmemlog_check: Invalid argument
append str[0] 1st test string
append str[1] 2nd test string
diff --git a/src/test/log_recovery/README b/src/test/log_recovery/README
index 08d5a86b750a42761b70153b12b6959fbb766052..41dee4880ce515592710c6eebe4fed4dba9c3f7e 100644
--- a/src/test/log_recovery/README
+++ b/src/test/log_recovery/README
@@ -12,9 +12,9 @@ pmemlog_appendv() will be used to do that. For example:
./log_recovery file1 a
-this will call pmemlog_pool_open() on file1, call pmemlog_append() to append
+this will call pmemlog_open() on file1, call pmemlog_append() to append
six strings to the log and pmemlog_tell() to check the current write point,
then it will change the memory protection on the metadata area to read-only.
Next, pmemlog_append() is called again and SIGSEGV is caught and reported.
-Finally, pmemblk_pool_check() and pmemlog_tell() are called to make sure
-there are no partial log entries.
+Finally, pmemblk_check() and pmemlog_tell() are called to make sure there are
+no partial log entries.
diff --git a/src/test/log_recovery/log_recovery.c b/src/test/log_recovery/log_recovery.c
index 635c75ba35ea9589e66ed631d6fcb2df21104cd6..2b5e51ba4d92d4da3db7ae06efadb19c87742b6f 100644
--- a/src/test/log_recovery/log_recovery.c
+++ b/src/test/log_recovery/log_recovery.c
@@ -209,8 +209,8 @@ main(int argc, char *argv[])
CLOSE(fd);
- if ((plp = pmemlog_pool_create(path, 0, S_IWUSR)) == NULL)
- FATAL("!pmemlog_pool_create: %s", path);
+ if ((plp = pmemlog_create(path, 0, S_IWUSR)) == NULL)
+ FATAL("!pmemlog_create: %s", path);
/* append some data */
if (argv[2][0] == 'a')
@@ -238,20 +238,20 @@ main(int argc, char *argv[])
do_appendv(plp);
}
- pmemlog_pool_close(plp);
+ pmemlog_close(plp);
/* check consistency */
- result = pmemlog_pool_check(path);
+ result = pmemlog_check(path);
if (result < 0)
- OUT("!%s: pmemlog_pool_check", path);
+ OUT("!%s: pmemlog_check", path);
else if (result == 0)
- OUT("%s: pmemlog_pool_check: not consistent", path);
+ OUT("%s: pmemlog_check: not consistent", path);
else
OUT("%s: consistent", path);
/* map again to print out whole log */
- if ((plp = pmemlog_pool_open(path)) == NULL)
- FATAL("!pmemlog_pool_open: %s", path);
+ if ((plp = pmemlog_open(path)) == NULL)
+ FATAL("!pmemlog_open: %s", path);
/* print out current write point */
do_tell(plp);
@@ -259,7 +259,7 @@ main(int argc, char *argv[])
/* print out whole log */
do_walk(plp);
- pmemlog_pool_close(plp);
+ pmemlog_close(plp);
DONE(NULL);
}
diff --git a/src/test/log_walker/README b/src/test/log_walker/README
index 033182c2447db5040ea3b5cdb4cd9b21bbcd5acd..e24ee13b15a2c025cf8a273df339e3dd40a89c37 100644
--- a/src/test/log_walker/README
+++ b/src/test/log_walker/README
@@ -9,6 +9,6 @@ The program in log_walker.c takes only a file name as an argument. For example:
./log_walker file1
-this calls pmemlog_pool_open() on file1 and pmemlog_append() to append six strings
+this calls pmemlog_open() on file1 and pmemlog_append() to append six strings
to the log. Next pmemlog_walk() is called and the walk handler tries to store
to the buffer and SIGSEGV is caught and reported.
diff --git a/src/test/log_walker/log_walker.c b/src/test/log_walker/log_walker.c
index 9964221d09faa26baed935e76d05a725717e58d4..a79393f058dff92ff17e9059498b1c0dd0e1017b 100644
--- a/src/test/log_walker/log_walker.c
+++ b/src/test/log_walker/log_walker.c
@@ -127,8 +127,8 @@ main(int argc, char *argv[])
CLOSE(fd);
- if ((plp = pmemlog_pool_create(path, 0, S_IWUSR)) == NULL)
- FATAL("!pmemlog_pool_create: %s", path);
+ if ((plp = pmemlog_create(path, 0, S_IWUSR)) == NULL)
+ FATAL("!pmemlog_create: %s", path);
/* append some data */
do_append(plp);
@@ -142,7 +142,7 @@ main(int argc, char *argv[])
do_walk(plp);
}
- pmemlog_pool_close(plp);
+ pmemlog_close(plp);
DONE(NULL);
}
diff --git a/src/test/pmem_map/.gitignore b/src/test/pmem_map/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e293c6e0ab8be8d21bae243c60a5af6674620946
--- /dev/null
+++ b/src/test/pmem_map/.gitignore
@@ -0,0 +1 @@
+pmem_map
diff --git a/src/test/pmem_map_raw/Makefile b/src/test/pmem_map/Makefile
similarity index 92%
rename from src/test/pmem_map_raw/Makefile
rename to src/test/pmem_map/Makefile
index 4a580892bb1b85198c1920e70ff89321c9f5b6ae..908f0432ab7c44fabdbf364c8e3eeb8ca3d5a712 100644
--- a/src/test/pmem_map_raw/Makefile
+++ b/src/test/pmem_map/Makefile
@@ -31,13 +31,13 @@
#
#
-# src/test/pmem_map_raw/Makefile -- build pmem_map() unit test
+# src/test/pmem_map/Makefile -- build pmem_map() unit test
#
-TARGET = pmem_map_raw
-OBJS = pmem_map_raw.o
+TARGET = pmem_map
+OBJS = pmem_map.o
LIBPMEM=y
include ../Makefile.inc
-pmem_map_raw.o: pmem_map_raw.c
+pmem_map.o: pmem_map.c
diff --git a/src/test/pmem_map_raw/README b/src/test/pmem_map/README
similarity index 83%
rename from src/test/pmem_map_raw/README
rename to src/test/pmem_map/README
index de39142c79349a8382def11da25cfc1a88410e42..418ef026aa4355db65718d376aa21e7a56075d3a 100644
--- a/src/test/pmem_map_raw/README
+++ b/src/test/pmem_map/README
@@ -1,10 +1,10 @@
Linux NVM Library
-This is src/test/pmem_map_raw/README.
+This is src/test/pmem_map/README.
This directory contains a unit test for pmem_map().
-The program in pmem_map_raw.c takes a file name as an argument.
+The program in pmem_map.c takes a file name as an argument.
Initially, the first 4k of the file is populated with some pattern
using write(). The file content is verified after successful mapping
diff --git a/src/test/pmem_map_raw/TEST0 b/src/test/pmem_map/TEST0
similarity index 91%
rename from src/test/pmem_map_raw/TEST0
rename to src/test/pmem_map/TEST0
index 7ca4bf15a1d288b6199b02171edd2198466d3f7c..1a62b9475a84ab90943501f9d0d4cf7d4ed3f177 100755
--- a/src/test/pmem_map_raw/TEST0
+++ b/src/test/pmem_map/TEST0
@@ -32,9 +32,9 @@
#
#
-# src/test/pmem_map_raw/TEST0 -- unit test for pmem_map
+# src/test/pmem_map/TEST0 -- unit test for pmem_map
#
-export UNITTEST_NAME=pmem_map_raw/TEST0
+export UNITTEST_NAME=pmem_map/TEST0
export UNITTEST_NUM=0
# standard unit test setup
@@ -47,7 +47,7 @@ setup
rm -f $DIR/testfile1
truncate -s 2G $DIR/testfile1
-expect_normal_exit ./pmem_map_raw$EXESUFFIX $DIR/testfile1
+expect_normal_exit ./pmem_map$EXESUFFIX $DIR/testfile1
rm $DIR/testfile1
diff --git a/src/test/pmem_map_raw/TEST1 b/src/test/pmem_map/TEST1
similarity index 92%
rename from src/test/pmem_map_raw/TEST1
rename to src/test/pmem_map/TEST1
index 45174717fa79af16edc0cd302d6ef101f967007d..cd8c0eb38ed2d24af8c6c337ca4275ff0b7ec74c 100755
--- a/src/test/pmem_map_raw/TEST1
+++ b/src/test/pmem_map/TEST1
@@ -32,9 +32,9 @@
#
#
-# src/test/pmem_map_raw/TEST1 -- unit test for pmem_map
+# src/test/pmem_map/TEST1 -- unit test for pmem_map
#
-export UNITTEST_NAME=pmem_map_raw/TEST1
+export UNITTEST_NAME=pmem_map/TEST1
export UNITTEST_NUM=1
# standard unit test setup
@@ -48,7 +48,7 @@ rm -f $DIR/testfile1
touch $DIR/testfile1
# pass the file of zero length
-expect_normal_exit ./pmem_map_raw$EXESUFFIX $DIR/testfile1
+expect_normal_exit ./pmem_map$EXESUFFIX $DIR/testfile1
rm $DIR/testfile1
diff --git a/src/test/pmem_map_raw/err0.log.match b/src/test/pmem_map/err0.log.match
similarity index 100%
rename from src/test/pmem_map_raw/err0.log.match
rename to src/test/pmem_map/err0.log.match
diff --git a/src/test/pmem_map_raw/err1.log.match b/src/test/pmem_map/err1.log.match
similarity index 100%
rename from src/test/pmem_map_raw/err1.log.match
rename to src/test/pmem_map/err1.log.match
diff --git a/src/test/pmem_map/out0.log.match b/src/test/pmem_map/out0.log.match
new file mode 100644
index 0000000000000000000000000000000000000000..023e858ad1a6531a746582f1ea7278ad59e5532c
--- /dev/null
+++ b/src/test/pmem_map/out0.log.match
@@ -0,0 +1,3 @@
+pmem_map/TEST0: START: pmem_map
+ ./pmem_map$(*) $(*)/testfile1
+pmem_map/TEST0: Done
diff --git a/src/test/pmem_map/out1.log.match b/src/test/pmem_map/out1.log.match
new file mode 100644
index 0000000000000000000000000000000000000000..8cbab9090d99702f915b216c8281b4c89f4cd719
--- /dev/null
+++ b/src/test/pmem_map/out1.log.match
@@ -0,0 +1,4 @@
+pmem_map/TEST1: START: pmem_map
+ ./pmem_map$(*) $(*)/testfile1
+pmem_map: Invalid argument
+pmem_map/TEST1: Done
diff --git a/src/test/pmem_map_raw/pmem_map_raw.c b/src/test/pmem_map/pmem_map.c
similarity index 95%
rename from src/test/pmem_map_raw/pmem_map_raw.c
rename to src/test/pmem_map/pmem_map.c
index d3ec40a61d548f7fb7fbf6a74b01e57f5aef8ff3..9324edbb60810c7b4c65278432b8de27706efe82 100644
--- a/src/test/pmem_map_raw/pmem_map_raw.c
+++ b/src/test/pmem_map/pmem_map.c
@@ -31,9 +31,9 @@
*/
/*
- * pmem_map_raw.c -- unit test for mapping persistent memory for raw access
+ * pmem_map.c -- unit test for mapping persistent memory for raw access
*
- * usage: pmem_map_raw file
+ * usage: pmem_map file
*/
#include "unittest.h"
@@ -43,7 +43,7 @@
int
main(int argc, char *argv[])
{
- START(argc, argv, "pmem_map_raw");
+ START(argc, argv, "pmem_map");
if (argc != 2)
FATAL("usage: %s file", argv[0]);
diff --git a/src/test/pmem_map_raw/.gitignore b/src/test/pmem_map_raw/.gitignore
deleted file mode 100644
index a288a1bb9ed8359ae87d0266e53940dc7cbbd36a..0000000000000000000000000000000000000000
--- a/src/test/pmem_map_raw/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pmem_map_raw
diff --git a/src/test/pmem_map_raw/out0.log.match b/src/test/pmem_map_raw/out0.log.match
deleted file mode 100644
index b60fcac6ebaa3a5baa946afb7362bcc05c0d0ff5..0000000000000000000000000000000000000000
--- a/src/test/pmem_map_raw/out0.log.match
+++ /dev/null
@@ -1,3 +0,0 @@
-pmem_map_raw/TEST0: START: pmem_map_raw
- ./pmem_map_raw$(*) $(*)/testfile1
-pmem_map_raw/TEST0: Done
diff --git a/src/test/pmem_map_raw/out1.log.match b/src/test/pmem_map_raw/out1.log.match
deleted file mode 100644
index 3cfcfdded526bf760e0365c59a54a7b9e7f17258..0000000000000000000000000000000000000000
--- a/src/test/pmem_map_raw/out1.log.match
+++ /dev/null
@@ -1,4 +0,0 @@
-pmem_map_raw/TEST1: START: pmem_map_raw
- ./pmem_map_raw$(*) $(*)/testfile1
-pmem_map: Invalid argument
-pmem_map_raw/TEST1: Done
diff --git a/src/test/scope/out0.log.match b/src/test/scope/out0.log.match
index f58741df05f2cfd4b5b78539ac8d515c5f58fac6..27003683f58e7f1bc86947221011b5692b4fcd8b 100644
--- a/src/test/scope/out0.log.match
+++ b/src/test/scope/out0.log.match
@@ -2,60 +2,60 @@ scope/TEST0:
../../debug/libvmem.so:
vmem_aligned_alloc
vmem_calloc
+vmem_check
vmem_check_version
+vmem_create
+vmem_create_in_region
+vmem_delete
vmem_free
+vmem_freespace
vmem_malloc
-vmem_pool_check
-vmem_pool_create
-vmem_pool_create_in_region
-vmem_pool_delete
-vmem_pool_freespace
-vmem_pool_stats_print
vmem_realloc
vmem_set_funcs
+vmem_stats_print
vmem_strdup
../../nondebug/libvmem.so:
vmem_aligned_alloc
vmem_calloc
+vmem_check
vmem_check_version
+vmem_create
+vmem_create_in_region
+vmem_delete
vmem_free
+vmem_freespace
vmem_malloc
-vmem_pool_check
-vmem_pool_create
-vmem_pool_create_in_region
-vmem_pool_delete
-vmem_pool_freespace
-vmem_pool_stats_print
vmem_realloc
vmem_set_funcs
+vmem_stats_print
vmem_strdup
../../debug/libvmem.a:
vmem_aligned_alloc
vmem_calloc
+vmem_check
vmem_check_version
+vmem_create
+vmem_create_in_region
+vmem_delete
vmem_free
+vmem_freespace
vmem_malloc
-vmem_pool_check
-vmem_pool_create
-vmem_pool_create_in_region
-vmem_pool_delete
-vmem_pool_freespace
-vmem_pool_stats_print
vmem_realloc
vmem_set_funcs
+vmem_stats_print
vmem_strdup
../../nondebug/libvmem.a:
vmem_aligned_alloc
vmem_calloc
+vmem_check
vmem_check_version
+vmem_create
+vmem_create_in_region
+vmem_delete
vmem_free
+vmem_freespace
vmem_malloc
-vmem_pool_check
-vmem_pool_create
-vmem_pool_create_in_region
-vmem_pool_delete
-vmem_pool_freespace
-vmem_pool_stats_print
vmem_realloc
vmem_set_funcs
+vmem_stats_print
vmem_strdup
diff --git a/src/test/scope/out2.log.match b/src/test/scope/out2.log.match
index 128678abf77ec16a55f3ddfc782513ffc0534366..a27b83c42207bfef9be9d714c4d53b2d6559b0b3 100644
--- a/src/test/scope/out2.log.match
+++ b/src/test/scope/out2.log.match
@@ -2,12 +2,12 @@ scope/TEST2:
../../debug/libpmemlog.so:
pmemlog_append
pmemlog_appendv
+pmemlog_check
pmemlog_check_version
+pmemlog_close
+pmemlog_create
pmemlog_nbyte
-pmemlog_pool_check
-pmemlog_pool_close
-pmemlog_pool_create
-pmemlog_pool_open
+pmemlog_open
pmemlog_rewind
pmemlog_set_funcs
pmemlog_tell
@@ -15,12 +15,12 @@ pmemlog_walk
../../nondebug/libpmemlog.so:
pmemlog_append
pmemlog_appendv
+pmemlog_check
pmemlog_check_version
+pmemlog_close
+pmemlog_create
pmemlog_nbyte
-pmemlog_pool_check
-pmemlog_pool_close
-pmemlog_pool_create
-pmemlog_pool_open
+pmemlog_open
pmemlog_rewind
pmemlog_set_funcs
pmemlog_tell
@@ -28,12 +28,12 @@ pmemlog_walk
../../debug/libpmemlog.a:
pmemlog_append
pmemlog_appendv
+pmemlog_check
pmemlog_check_version
+pmemlog_close
+pmemlog_create
pmemlog_nbyte
-pmemlog_pool_check
-pmemlog_pool_close
-pmemlog_pool_create
-pmemlog_pool_open
+pmemlog_open
pmemlog_rewind
pmemlog_set_funcs
pmemlog_tell
@@ -41,12 +41,12 @@ pmemlog_walk
../../nondebug/libpmemlog.a:
pmemlog_append
pmemlog_appendv
+pmemlog_check
pmemlog_check_version
+pmemlog_close
+pmemlog_create
pmemlog_nbyte
-pmemlog_pool_check
-pmemlog_pool_close
-pmemlog_pool_create
-pmemlog_pool_open
+pmemlog_open
pmemlog_rewind
pmemlog_set_funcs
pmemlog_tell
diff --git a/src/test/scope/out3.log.match b/src/test/scope/out3.log.match
index d33290eb4f80e89fec8956ac8f476fd39f906b0d..2920db191ce7a437ef01ac96f41b8e09a016e4f9 100644
--- a/src/test/scope/out3.log.match
+++ b/src/test/scope/out3.log.match
@@ -1,47 +1,47 @@
scope/TEST3:
../../debug/libpmemblk.so:
+pmemblk_check
pmemblk_check_version
+pmemblk_close
+pmemblk_create
pmemblk_nblock
-pmemblk_pool_check
-pmemblk_pool_close
-pmemblk_pool_create
-pmemblk_pool_open
+pmemblk_open
pmemblk_read
pmemblk_set_error
pmemblk_set_funcs
pmemblk_set_zero
pmemblk_write
../../nondebug/libpmemblk.so:
+pmemblk_check
pmemblk_check_version
+pmemblk_close
+pmemblk_create
pmemblk_nblock
-pmemblk_pool_check
-pmemblk_pool_close
-pmemblk_pool_create
-pmemblk_pool_open
+pmemblk_open
pmemblk_read
pmemblk_set_error
pmemblk_set_funcs
pmemblk_set_zero
pmemblk_write
../../debug/libpmemblk.a:
+pmemblk_check
pmemblk_check_version
+pmemblk_close
+pmemblk_create
pmemblk_nblock
-pmemblk_pool_check
-pmemblk_pool_close
-pmemblk_pool_create
-pmemblk_pool_open
+pmemblk_open
pmemblk_read
pmemblk_set_error
pmemblk_set_funcs
pmemblk_set_zero
pmemblk_write
../../nondebug/libpmemblk.a:
+pmemblk_check
pmemblk_check_version
+pmemblk_close
+pmemblk_create
pmemblk_nblock
-pmemblk_pool_check
-pmemblk_pool_close
-pmemblk_pool_create
-pmemblk_pool_open
+pmemblk_open
pmemblk_read
pmemblk_set_error
pmemblk_set_funcs
diff --git a/src/test/scope/out4.log.match b/src/test/scope/out4.log.match
index b37aa40f4bfc51a99ebb3bd9d6fce9996f8da294..731788008c991bc61d37ff828f445ca345323b70 100644
--- a/src/test/scope/out4.log.match
+++ b/src/test/scope/out4.log.match
@@ -1,29 +1,29 @@
scope/TEST4:
../../debug/libpmemobj.so:
+pmemobj_check
pmemobj_check_version
-pmemobj_pool_check
-pmemobj_pool_close
-pmemobj_pool_create
-pmemobj_pool_open
+pmemobj_close
+pmemobj_create
+pmemobj_open
pmemobj_set_funcs
../../nondebug/libpmemobj.so:
+pmemobj_check
pmemobj_check_version
-pmemobj_pool_check
-pmemobj_pool_close
-pmemobj_pool_create
-pmemobj_pool_open
+pmemobj_close
+pmemobj_create
+pmemobj_open
pmemobj_set_funcs
../../debug/libpmemobj.a:
+pmemobj_check
pmemobj_check_version
-pmemobj_pool_check
-pmemobj_pool_close
-pmemobj_pool_create
-pmemobj_pool_open
+pmemobj_close
+pmemobj_create
+pmemobj_open
pmemobj_set_funcs
../../nondebug/libpmemobj.a:
+pmemobj_check
pmemobj_check_version
-pmemobj_pool_check
-pmemobj_pool_close
-pmemobj_pool_create
-pmemobj_pool_open
+pmemobj_close
+pmemobj_create
+pmemobj_open
pmemobj_set_funcs
diff --git a/src/test/unittest/unittest.h b/src/test/unittest/unittest.h
index 00f72d46cc8476c386057df08f8994584372518f..94762bd7ff974d1997771a7787076058ca71231f 100644
--- a/src/test/unittest/unittest.h
+++ b/src/test/unittest/unittest.h
@@ -54,10 +54,10 @@
* and the error message includes the calling context information (file:line).
* in general, using the all-caps version of a call means you're using the
* unittest.h version which does the most common checking for you. so
- * calling VMEM_POOL_CREATE() instead of vmem_pool_create() returns the same
+ * calling VMEM_CREATE() instead of vmem_create() returns the same
* thing, but can never return an error since the unit test library checks for
- * it. * for routines like vmem_pool_delete() there is no corresponding
- * VMEM_POOL_DELETE() because there's no error to check for.
+ * it. * for routines like vmem_delete() there is no corresponding
+ * VMEM_DELETE() because there's no error to check for.
*
* all unit tests should use the same initialization:
*
diff --git a/src/test/util_pool_create/TEST0 b/src/test/util_pool_create/TEST0
index c0f96cdf18dc7f346e547dfcceb6fc1308c64fbb..9ef0386997efa37d4eef8d9cd5cc19bfb041d08d 100755
--- a/src/test/util_pool_create/TEST0
+++ b/src/test/util_pool_create/TEST0
@@ -57,7 +57,7 @@ rm -f $DIR/testlink4
rm -fr $DIR/testdir1
rm -fr $DIR/testdir2
-truncate -s 16M $DIR/testfile1
+truncate -s 32K $DIR/testfile1
mkdir $DIR/testdir1
mkdir $DIR/testdir2
chmod -w $DIR/testdir2
diff --git a/src/test/util_pool_open/TEST0 b/src/test/util_pool_open/TEST0
index ceadbfeb9ff997bc48db63b2ca593c19ec36217b..23f712a359ad0942a4839b62f553dd43cc897543 100755
--- a/src/test/util_pool_open/TEST0
+++ b/src/test/util_pool_open/TEST0
@@ -57,12 +57,12 @@ rm -f $DIR/testlink4
rm -f $DIR/testlink5
rm -fr $DIR/testdir1
-truncate -s 16M $DIR/testfile1
+truncate -s 32K $DIR/testfile1
chmod -rw $DIR/testfile1
-truncate -s 16M $DIR/testfile2
+truncate -s 32K $DIR/testfile2
chmod -w $DIR/testfile2
truncate -s 1K $DIR/testfile3
-truncate -s 16M $DIR/testfile4
+truncate -s 32K $DIR/testfile4
mkdir $DIR/testdir1
ln -s $DIR/testfile0 $DIR/testlink1
ln -s $DIR/testfile1 $DIR/testlink2
diff --git a/src/test/util_pool_open/out0.log.match b/src/test/util_pool_open/out0.log.match
index a9507d426089c37e687cd0c3f43c8165b14302bc..e595f470448ed124667a3b07235600144dc6017f 100644
--- a/src/test/util_pool_open/out0.log.match
+++ b/src/test/util_pool_open/out0.log.match
@@ -11,5 +11,5 @@ $(*)/testfile0: util_pool_open: No such file or directory
$(*)/testfile1: util_pool_open: Permission denied
$(*)/testfile2: util_pool_open: Permission denied
$(*)/testfile3: util_pool_open: Invalid argument
-$(*)/testfile4: open, len 16777216
+$(*)/testfile4: open, len 32768
util_pool_open/TEST0: Done
diff --git a/src/test/vmem_aligned_alloc/vmem_aligned_alloc.c b/src/test/vmem_aligned_alloc/vmem_aligned_alloc.c
index b87eea5c0fb2698b33310080423ec37dd9011238..0016965cc9856d2235b7364cd12db72c58899535 100644
--- a/src/test/vmem_aligned_alloc/vmem_aligned_alloc.c
+++ b/src/test/vmem_aligned_alloc/vmem_aligned_alloc.c
@@ -116,7 +116,7 @@ main(int argc, char *argv[])
FATAL("usage: %s [directory]", argv[0]);
}
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
@@ -129,14 +129,14 @@ main(int argc, char *argv[])
custom_alloc_calls = 0;
if (dir == NULL) {
- vmp = vmem_pool_create_in_region(mem_pool,
+ vmp = vmem_create_in_region(mem_pool,
VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
for (i = 0; i < MAX_ALLOCS; ++i) {
@@ -160,7 +160,7 @@ main(int argc, char *argv[])
}
}
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
/* check memory leaks */
ASSERTne(custom_alloc_calls, 0);
diff --git a/src/test/vmem_calloc/vmem_calloc.c b/src/test/vmem_calloc/vmem_calloc.c
index e9aca1f9bbed0e61b0d67960aac376a428632195..a7d27bf14b57f560b0fd5390b6f29d7140de4137 100644
--- a/src/test/vmem_calloc/vmem_calloc.c
+++ b/src/test/vmem_calloc/vmem_calloc.c
@@ -55,17 +55,17 @@ main(int argc, char *argv[])
}
if (dir == NULL) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
int *test = vmem_calloc(vmp, 1, sizeof (int));
@@ -84,7 +84,7 @@ main(int argc, char *argv[])
vmem_free(vmp, test);
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
DONE(NULL);
}
diff --git a/src/test/vmem_check/.gitignore b/src/test/vmem_check/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f01efd5eb5827553f61f86cf1cc19fb681451a22
--- /dev/null
+++ b/src/test/vmem_check/.gitignore
@@ -0,0 +1 @@
+vmem_check
diff --git a/src/test/vmem_pool_check/Makefile b/src/test/vmem_check/Makefile
similarity index 91%
rename from src/test/vmem_pool_check/Makefile
rename to src/test/vmem_check/Makefile
index e06abca7ff8ce4dc185fcad44f9219fc66cb79a5..325936116851b4c5be3bd11d830a818801c0a2cf 100644
--- a/src/test/vmem_pool_check/Makefile
+++ b/src/test/vmem_check/Makefile
@@ -31,16 +31,16 @@
#
#
-# src/test/vmem_pool_check/Makefile -- build vmem_pool_check unit test
+# src/test/vmem_check/Makefile -- build vmem_check unit test
#
vpath %.h ../..
-TARGET = vmem_pool_check
-OBJS = vmem_pool_check.o
+TARGET = vmem_check
+OBJS = vmem_check.o
LIBVMEM=y
include ../Makefile.inc
-vmem_pool_check.o: vmem_pool_check.c
+vmem_check.o: vmem_check.c
diff --git a/src/test/vmem_pool_check/TEST0 b/src/test/vmem_check/TEST0
similarity index 91%
rename from src/test/vmem_pool_check/TEST0
rename to src/test/vmem_check/TEST0
index 8f47801dc133528cf0198d921d40e41a67058df0..2412de8328f93e96cfbc78dcb4a753788ea1b589 100755
--- a/src/test/vmem_pool_check/TEST0
+++ b/src/test/vmem_check/TEST0
@@ -32,9 +32,9 @@
#
#
-# src/test/vmem_pool_check/TEST0 -- unit test for vmem_pool_check
+# src/test/vmem_check/TEST0 -- unit test for vmem_check
#
-export UNITTEST_NAME=vmem_pool_check/TEST0
+export UNITTEST_NAME=vmem_check/TEST0
export UNITTEST_NUM=0
# standard unit test setup
@@ -44,6 +44,6 @@ require_fs_type local
setup
-expect_normal_exit ./vmem_pool_check$EXESUFFIX
+expect_normal_exit ./vmem_check$EXESUFFIX
pass
diff --git a/src/test/vmem_pool_check/TEST1 b/src/test/vmem_check/TEST1
similarity index 91%
rename from src/test/vmem_pool_check/TEST1
rename to src/test/vmem_check/TEST1
index 552e71515414ae605179b64eda2583b230c03ab2..938d44a0f5d877eaa921f51989a9ea85d3aa8066 100755
--- a/src/test/vmem_pool_check/TEST1
+++ b/src/test/vmem_check/TEST1
@@ -32,9 +32,9 @@
#
#
-# src/test/vmem_pool_check/TEST1 -- unit test for vmem_pool_check
+# src/test/vmem_check/TEST1 -- unit test for vmem_check
#
-export UNITTEST_NAME=vmem_pool_check/TEST1
+export UNITTEST_NAME=vmem_check/TEST1
export UNITTEST_NUM=1
# standard unit test setup
@@ -42,6 +42,6 @@ export UNITTEST_NUM=1
setup
-expect_normal_exit ./vmem_pool_check$EXESUFFIX $DIR
+expect_normal_exit ./vmem_check$EXESUFFIX $DIR
pass
diff --git a/src/test/vmem_pool_check/vmem_pool_check.c b/src/test/vmem_check/vmem_check.c
similarity index 75%
rename from src/test/vmem_pool_check/vmem_pool_check.c
rename to src/test/vmem_check/vmem_check.c
index c785a4804884b212b1df81d131f7cb87380d63a9..c540c6bdf4350fb1c98b66efd2bb12e9036a1745 100644
--- a/src/test/vmem_pool_check/vmem_pool_check.c
+++ b/src/test/vmem_check/vmem_check.c
@@ -31,9 +31,9 @@
*/
/*
- * vmem_pool_check.c -- unit test for vmem_pool_check
+ * vmem_check.c -- unit test for vmem_check
*
- * usage: vmem_pool_check [directory]
+ * usage: vmem_check [directory]
*/
#include "unittest.h"
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
void *mem_pool = NULL;
VMEM *vmp;
- START(argc, argv, "vmem_pool_check");
+ START(argc, argv, "vmem_check");
if (argc == 2) {
dir = argv[1];
@@ -54,20 +54,20 @@ main(int argc, char *argv[])
}
if (dir == NULL) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
mem_pool = MMAP(NULL, VMEM_MIN_POOL*2, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
- ASSERTeq(1, vmem_pool_check(vmp));
+ ASSERTeq(1, vmem_check(vmp));
/* create pool in this same memory region */
if (dir == NULL) {
@@ -75,26 +75,26 @@ main(int argc, char *argv[])
void *mem_pool2 = (void*)(((uintptr_t)mem_pool +
VMEM_MIN_POOL/2) & ~(Pagesize-1));
- VMEM *vmp2 = vmem_pool_create_in_region(mem_pool2,
+ VMEM *vmp2 = vmem_create_in_region(mem_pool2,
VMEM_MIN_POOL);
if (vmp2 == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
/* detect memory range collision */
- ASSERTne(1, vmem_pool_check(vmp));
- ASSERTne(1, vmem_pool_check(vmp2));
+ ASSERTne(1, vmem_check(vmp));
+ ASSERTne(1, vmem_check(vmp2));
- vmem_pool_delete(vmp2);
+ vmem_delete(vmp2);
- ASSERTne(1, vmem_pool_check(vmp2));
+ ASSERTne(1, vmem_check(vmp2));
}
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
- /* for vmem_pool_create() memory unmapped after delete pool */
+ /* for vmem_create() memory unmapped after delete pool */
if (!dir)
- ASSERTne(1, vmem_pool_check(vmp));
+ ASSERTne(1, vmem_check(vmp));
DONE(NULL);
}
diff --git a/src/test/vmem_check_allocations/vmem_check_allocations.c b/src/test/vmem_check_allocations/vmem_check_allocations.c
index 137c58393709bc125b753b4e9ace53a9f073a56f..a4b351ebece6fa0472ab7e3fb3cc387b0a979684 100644
--- a/src/test/vmem_check_allocations/vmem_check_allocations.c
+++ b/src/test/vmem_check_allocations/vmem_check_allocations.c
@@ -70,14 +70,14 @@ main(int argc, char *argv[])
PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool,
+ vmp = vmem_create_in_region(mem_pool,
VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
memset(allocs, 0, TEST_ALLOCS_SIZE);
@@ -113,7 +113,7 @@ main(int argc, char *argv[])
}
}
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
}
DONE(NULL);
diff --git a/src/test/vmem_create/.gitignore b/src/test/vmem_create/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..7abb8918d3296cfb0bf5b275b04609e954991a2d
--- /dev/null
+++ b/src/test/vmem_create/.gitignore
@@ -0,0 +1 @@
+vmem_create
diff --git a/src/test/vmem_pool_create/Makefile b/src/test/vmem_create/Makefile
similarity index 90%
rename from src/test/vmem_pool_create/Makefile
rename to src/test/vmem_create/Makefile
index caf57389e6aac505f653cd0a1777ca856d9ca5dd..215aac5a04ce4a56ef9820a75b74d58cf3e974f9 100644
--- a/src/test/vmem_pool_create/Makefile
+++ b/src/test/vmem_create/Makefile
@@ -31,13 +31,13 @@
#
#
-# src/test/vmem_pool_create/Makefile -- build vmem_pool_create unit test
+# src/test/vmem_create/Makefile -- build vmem_create unit test
#
-TARGET = vmem_pool_create
-OBJS = vmem_pool_create.o
+TARGET = vmem_create
+OBJS = vmem_create.o
LIBVMEM=y
include ../Makefile.inc
-vmem_pool_create.o: vmem_pool_create.c
+vmem_create.o: vmem_create.c
diff --git a/src/test/vmem_pool_create/TEST0 b/src/test/vmem_create/TEST0
similarity index 91%
rename from src/test/vmem_pool_create/TEST0
rename to src/test/vmem_create/TEST0
index 37695ff538b55a543cf96d8e6af59017b2fc4972..c0c4ffa4fe4f17d79a5e74c6490b54aaa00b8caf 100755
--- a/src/test/vmem_pool_create/TEST0
+++ b/src/test/vmem_create/TEST0
@@ -32,9 +32,9 @@
#
#
-# src/test/vmem_pool_create/TEST0 -- unit test for vmem_pool_create
+# src/test/vmem_create/TEST0 -- unit test for vmem_create
#
-export UNITTEST_NAME=vmem_pool_create/TEST0
+export UNITTEST_NAME=vmem_create/TEST0
export UNITTEST_NUM=0
# standard unit test setup
@@ -44,7 +44,7 @@ require_fs_type local
setup
-expect_normal_exit ./vmem_pool_create$EXESUFFIX $DIR
+expect_normal_exit ./vmem_create$EXESUFFIX $DIR
check
diff --git a/src/test/vmem_pool_create/err0.log.match b/src/test/vmem_create/err0.log.match
similarity index 100%
rename from src/test/vmem_pool_create/err0.log.match
rename to src/test/vmem_create/err0.log.match
diff --git a/src/test/vmem_create/out0.log.match b/src/test/vmem_create/out0.log.match
new file mode 100644
index 0000000000000000000000000000000000000000..58a6ff8c06fc66032368966f6dfe63ce0e223a03
--- /dev/null
+++ b/src/test/vmem_create/out0.log.match
@@ -0,0 +1,4 @@
+vmem_create/TEST0: START: vmem_create
+ ./vmem_create$(*)
+signal: Segmentation fault
+vmem_create/TEST0: Done
diff --git a/src/test/vmem_pool_create/vmem_pool_create.c b/src/test/vmem_create/vmem_create.c
similarity index 90%
rename from src/test/vmem_pool_create/vmem_pool_create.c
rename to src/test/vmem_create/vmem_create.c
index 5b1b47471bc96ddc1c12004ff6695a6ca55f1395..ce9f9f433be1238019a46b93ede36ff910a0794c 100644
--- a/src/test/vmem_pool_create/vmem_pool_create.c
+++ b/src/test/vmem_create/vmem_create.c
@@ -31,9 +31,9 @@
*/
/*
- * vmem_pool_create.c -- unit test for vmem_pool_create
+ * vmem_create.c -- unit test for vmem_create
*
- * usage: vmem_pool_create directory
+ * usage: vmem_create directory
*/
#include "unittest.h"
@@ -48,7 +48,7 @@ signal_handler(int sig)
{
OUT("signal: %s", strsignal(sig));
- vmem_pool_delete(Vmp);
+ vmem_delete(Vmp);
DONE(NULL);
}
@@ -56,15 +56,15 @@ signal_handler(int sig)
int
main(int argc, char *argv[])
{
- START(argc, argv, "vmem_pool_create");
+ START(argc, argv, "vmem_create");
if (argc < 2 || argc > 3)
FATAL("usage: %s directory", argv[0]);
- Vmp = vmem_pool_create(argv[1], VMEM_MIN_POOL);
+ Vmp = vmem_create(argv[1], VMEM_MIN_POOL);
if (Vmp == NULL)
- OUT("!vmem_pool_create");
+ OUT("!vmem_create");
else {
struct sigvec v = { 0 };
diff --git a/src/test/vmem_create_error/.gitignore b/src/test/vmem_create_error/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..1849f8501a89177c7b74ad945fe7c242617a71e2
--- /dev/null
+++ b/src/test/vmem_create_error/.gitignore
@@ -0,0 +1 @@
+vmem_create_error
diff --git a/src/test/vmem_pool_create_error/Makefile b/src/test/vmem_create_error/Makefile
similarity index 88%
rename from src/test/vmem_pool_create_error/Makefile
rename to src/test/vmem_create_error/Makefile
index 5beb9a7fbcf771d34ac070169bcb3c114d505231..4db6014a062c3e8f9856cebdb1132b64f9030bdb 100644
--- a/src/test/vmem_pool_create_error/Makefile
+++ b/src/test/vmem_create_error/Makefile
@@ -31,13 +31,13 @@
#
#
-# src/test/vmem_pool_create_error/Makefile -- build vmem_pool_create_error unit test
+# src/test/vmem_create_error/Makefile -- build vmem_create_error unit test
#
-TARGET = vmem_pool_create_error
-OBJS = vmem_pool_create_error.o
+TARGET = vmem_create_error
+OBJS = vmem_create_error.o
LIBVMEM=y
include ../Makefile.inc
-vmem_pool_create_error.o: vmem_pool_create_error.c
+vmem_create_error.o: vmem_create_error.c
diff --git a/src/test/vmem_pool_create_error/TEST0 b/src/test/vmem_create_error/TEST0
similarity index 90%
rename from src/test/vmem_pool_create_error/TEST0
rename to src/test/vmem_create_error/TEST0
index 1f4797eacee71eab7e3fa1b9199ec2a682597a0f..afe2f1b74b7e358514d9bf3b64cd5dd1aed6d0c1 100755
--- a/src/test/vmem_pool_create_error/TEST0
+++ b/src/test/vmem_create_error/TEST0
@@ -32,9 +32,9 @@
#
#
-# src/test/vmem_pool_create_error/TEST0 -- unit test for vmem_pool_create_error
+# src/test/vmem_create_error/TEST0 -- unit test for vmem_create_error
#
-export UNITTEST_NAME=vmem_pool_create_error/TEST0
+export UNITTEST_NAME=vmem_create_error/TEST0
export UNITTEST_NUM=0
# standard unit test setup
@@ -45,7 +45,7 @@ require_build_type debug nondebug
setup
-expect_normal_exit ./vmem_pool_create_error$EXESUFFIX
+expect_normal_exit ./vmem_create_error$EXESUFFIX
check
diff --git a/src/test/vmem_pool_create_error/err0.log.match b/src/test/vmem_create_error/err0.log.match
similarity index 100%
rename from src/test/vmem_pool_create_error/err0.log.match
rename to src/test/vmem_create_error/err0.log.match
diff --git a/src/test/vmem_create_error/out0.log.match b/src/test/vmem_create_error/out0.log.match
new file mode 100644
index 0000000000000000000000000000000000000000..4f911edd7c751fd1d7fd4350c4e79692e39fc5b2
--- /dev/null
+++ b/src/test/vmem_create_error/out0.log.match
@@ -0,0 +1,3 @@
+vmem_create_error/TEST0: START: vmem_create_error
+ ./vmem_create_error$(*)
+vmem_create_error/TEST0: Done
diff --git a/src/test/vmem_pool_create_error/vmem_pool_create_error.c b/src/test/vmem_create_error/vmem_create_error.c
similarity index 86%
rename from src/test/vmem_pool_create_error/vmem_pool_create_error.c
rename to src/test/vmem_create_error/vmem_create_error.c
index f470bd5e336d5733a78ac813198d515cbfc6781f..d6bba987b7d32b6476a550c84ab12fb786a02983 100644
--- a/src/test/vmem_pool_create_error/vmem_pool_create_error.c
+++ b/src/test/vmem_create_error/vmem_create_error.c
@@ -31,9 +31,9 @@
*/
/*
- * vmem_pool_create_error.c -- unit test for vmem_pool_create_error
+ * vmem_create_error.c -- unit test for vmem_create_error
*
- * usage: vmem_pool_create_error
+ * usage: vmem_create_error
*/
#include "unittest.h"
@@ -45,23 +45,23 @@ main(int argc, char *argv[])
{
VMEM *vmp;
- START(argc, argv, "vmem_pool_create_error");
+ START(argc, argv, "vmem_create_error");
if (argc > 1)
FATAL("usage: %s", argv[0]);
errno = 0;
- vmp = vmem_pool_create_in_region(mem_pool, 0);
+ vmp = vmem_create_in_region(mem_pool, 0);
ASSERTeq(vmp, NULL);
ASSERTeq(errno, EINVAL);
errno = 0;
- vmp = vmem_pool_create("./", 0);
+ vmp = vmem_create("./", 0);
ASSERTeq(vmp, NULL);
ASSERTeq(errno, EINVAL);
errno = 0;
- vmp = vmem_pool_create("invalid dir !@#$%^&*()=", VMEM_MIN_POOL);
+ vmp = vmem_create("invalid dir !@#$%^&*()=", VMEM_MIN_POOL);
ASSERTeq(vmp, NULL);
ASSERTne(errno, 0);
diff --git a/src/test/vmem_create_in_region/.gitignore b/src/test/vmem_create_in_region/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e65fa2561e054b3e7bec514cdc4eca0372fb75f1
--- /dev/null
+++ b/src/test/vmem_create_in_region/.gitignore
@@ -0,0 +1 @@
+vmem_create_in_region
diff --git a/src/test/vmem_create_in_region/Makefile b/src/test/vmem_create_in_region/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..39b4de2334160dfc72c922d30de9182f53264aad
--- /dev/null
+++ b/src/test/vmem_create_in_region/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2014, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# * Neither the name of Intel Corporation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# src/test/vmem_create_in_region/Makefile -- build vmem_create_in_region unit test
+#
+TARGET = vmem_create_in_region
+OBJS = vmem_create_in_region.o
+
+LIBVMEM=y
+
+include ../Makefile.inc
+
+vmem_create_in_region.o: vmem_create_in_region.c
diff --git a/src/test/vmem_pool_create_in_region/TEST0 b/src/test/vmem_create_in_region/TEST0
similarity index 89%
rename from src/test/vmem_pool_create_in_region/TEST0
rename to src/test/vmem_create_in_region/TEST0
index f3267ab701ccb06ae85ba6d5aa8de9c7fc71c1da..7a91cb3ea09a69dd649a66303d4f310c1f31395f 100755
--- a/src/test/vmem_pool_create_in_region/TEST0
+++ b/src/test/vmem_create_in_region/TEST0
@@ -32,9 +32,9 @@
#
#
-# src/test/vmem_pool_create_in_region/TEST0 -- unit test for vmem_pool_create_in_region
+# src/test/vmem_create_in_region/TEST0 -- unit test for vmem_create_in_region
#
-export UNITTEST_NAME=vmem_pool_create_in_region/TEST0
+export UNITTEST_NAME=vmem_create_in_region/TEST0
export UNITTEST_NUM=0
# standard unit test setup
@@ -44,7 +44,7 @@ require_fs_type local
setup
-expect_normal_exit ./vmem_pool_create_in_region$EXESUFFIX
+expect_normal_exit ./vmem_create_in_region$EXESUFFIX
check
diff --git a/src/test/vmem_pool_create_in_region/err0.log.match b/src/test/vmem_create_in_region/err0.log.match
similarity index 100%
rename from src/test/vmem_pool_create_in_region/err0.log.match
rename to src/test/vmem_create_in_region/err0.log.match
diff --git a/src/test/vmem_create_in_region/out0.log.match b/src/test/vmem_create_in_region/out0.log.match
new file mode 100644
index 0000000000000000000000000000000000000000..735e0b9500b1fc5bd4474d22813299fdac77f480
--- /dev/null
+++ b/src/test/vmem_create_in_region/out0.log.match
@@ -0,0 +1,3 @@
+vmem_create_in_region/TEST0: START: vmem_create_in_region
+ ./vmem_create_in_region$(*)
+vmem_create_in_region/TEST0: Done
diff --git a/src/test/vmem_pool_create_in_region/vmem_pool_create_in_region.c b/src/test/vmem_create_in_region/vmem_create_in_region.c
similarity index 86%
rename from src/test/vmem_pool_create_in_region/vmem_pool_create_in_region.c
rename to src/test/vmem_create_in_region/vmem_create_in_region.c
index bbaa3fb73951ab6c7e0f1affbdf92769de0a65d2..27b30eed9a650a038e73bb871cf97697deda4f80 100644
--- a/src/test/vmem_pool_create_in_region/vmem_pool_create_in_region.c
+++ b/src/test/vmem_create_in_region/vmem_create_in_region.c
@@ -31,9 +31,9 @@
*/
/*
- * vmem_pool_create_in_region.c -- unit test for vmem_pool_create_in_region
+ * vmem_create_in_region.c -- unit test for vmem_create_in_region
*
- * usage: vmem_pool_create_in_region
+ * usage: vmem_create_in_region
*/
#include "unittest.h"
@@ -48,19 +48,19 @@ main(int argc, char *argv[])
VMEM *vmp;
size_t i;
- START(argc, argv, "vmem_pool_create_in_region");
+ START(argc, argv, "vmem_create_in_region");
if (argc > 1)
FATAL("usage: %s", argv[0]);
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
for (i = 0; i < TEST_ALLOCATIONS; ++i) {
allocs[i] = vmem_malloc(vmp, sizeof (int));
@@ -75,7 +75,7 @@ main(int argc, char *argv[])
vmem_free(vmp, allocs[i]);
}
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
DONE(NULL);
}
diff --git a/src/test/vmem_custom_alloc/vmem_custom_alloc.c b/src/test/vmem_custom_alloc/vmem_custom_alloc.c
index 4be459c284fadc15dd65734bac75b9dc8863dd80..1c92c07afd71ed1719caf976ad0cf1910bff5e83 100644
--- a/src/test/vmem_custom_alloc/vmem_custom_alloc.c
+++ b/src/test/vmem_custom_alloc/vmem_custom_alloc.c
@@ -125,13 +125,13 @@ pool_test(const char *dir)
VMEM *vmp = NULL;
if (dir != NULL) {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
} else {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
}
if (expect_create_pool == 0) {
@@ -140,9 +140,9 @@ pool_test(const char *dir)
} else {
if (vmp == NULL) {
if (dir == NULL) {
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
}
}
@@ -155,7 +155,7 @@ pool_test(const char *dir)
vmem_free(vmp, test);
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
}
int
diff --git a/src/test/vmem_freespace/vmem_freespace.c b/src/test/vmem_freespace/vmem_freespace.c
index d1edd91f720cf658c3d64e7cd78dc7d6fcaf1878..9c317d5f4fa3fb53a05896e05f863fb4369ef8e8 100644
--- a/src/test/vmem_freespace/vmem_freespace.c
+++ b/src/test/vmem_freespace/vmem_freespace.c
@@ -54,20 +54,20 @@ main(int argc, char *argv[])
}
if (dir == NULL) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
- size_t total_space = vmem_pool_freespace(vmp);
+ size_t total_space = vmem_freespace(vmp);
size_t free_space = total_space;
/* allocate all memory */
@@ -76,7 +76,7 @@ main(int argc, char *argv[])
while ((next = vmem_malloc(vmp, 128)) != NULL) {
*next = prev;
prev = next;
- size_t space = vmem_pool_freespace(vmp);
+ size_t space = vmem_freespace(vmp);
/* free space can only decrease */
ASSERT(space <= free_space);
free_space = space;
@@ -90,13 +90,13 @@ main(int argc, char *argv[])
void **act = prev;
prev = *act;
vmem_free(vmp, act);
- size_t space = vmem_pool_freespace(vmp);
+ size_t space = vmem_freespace(vmp);
/* free space can only increase */
ASSERT(space >= free_space);
free_space = space;
}
- free_space = vmem_pool_freespace(vmp);
+ free_space = vmem_freespace(vmp);
/*
* Depending on the distance of the 'mem_pool' from the
@@ -106,7 +106,7 @@ main(int argc, char *argv[])
*/
ASSERT(free_space > ((total_space - 4L * MB) * 9) / 10);
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
DONE(NULL);
}
diff --git a/src/test/vmem_malloc/vmem_malloc.c b/src/test/vmem_malloc/vmem_malloc.c
index f7fdc03cd86d4c346c1f49207df11a0ddc8619b3..8a55214ef63267613ddb83e0d20bf23f9e970e44 100644
--- a/src/test/vmem_malloc/vmem_malloc.c
+++ b/src/test/vmem_malloc/vmem_malloc.c
@@ -55,17 +55,17 @@ main(int argc, char *argv[])
}
if (dir == NULL) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
int *test = vmem_malloc(vmp, sizeof (int));
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
vmem_free(vmp, test);
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
DONE(NULL);
}
diff --git a/src/test/vmem_mix_allocations/vmem_mix_allocations.c b/src/test/vmem_mix_allocations/vmem_mix_allocations.c
index 7de8b8f578bb2d6abe624bdac33d6c7655240e9f..a7ac50e160da0efee00e4d37e9cc5a29a5810e4f 100644
--- a/src/test/vmem_mix_allocations/vmem_mix_allocations.c
+++ b/src/test/vmem_mix_allocations/vmem_mix_allocations.c
@@ -57,17 +57,17 @@ main(int argc, char *argv[])
}
if (dir == NULL) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
/* test with multiple size of allocations from 4MB to 2B */
@@ -89,7 +89,7 @@ main(int argc, char *argv[])
/* allocate more than half of pool size */
ASSERT(sum_alloc * 2 > VMEM_MIN_POOL);
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
DONE(NULL);
}
diff --git a/src/test/vmem_multiple_pools/vmem_multiple_pools.c b/src/test/vmem_multiple_pools/vmem_multiple_pools.c
index e4759ec7298b7ea8ac6b66b4fd4345a0320188b1..b2741f413222a081226810616f4e13ed109fe415 100644
--- a/src/test/vmem_multiple_pools/vmem_multiple_pools.c
+++ b/src/test/vmem_multiple_pools/vmem_multiple_pools.c
@@ -61,7 +61,7 @@ main(int argc, char *argv[])
size_t pool_id;
for (pool_id = 0; pool_id < mem_pools_size; ++pool_id) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
mem_pools[pool_id] = MMAP(NULL, VMEM_MIN_POOL,
PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
}
@@ -71,22 +71,22 @@ main(int argc, char *argv[])
/* delete old pool with this same id if exist */
if (pools[pool_id] != NULL) {
- vmem_pool_delete(pools[pool_id]);
+ vmem_delete(pools[pool_id]);
pools[pool_id] = NULL;
}
if (pool_id % 2 == 0) {
/* for even pool_id, create in region */
- pools[pool_id] = vmem_pool_create_in_region(
+ pools[pool_id] = vmem_create_in_region(
mem_pools[pool_id / 2], VMEM_MIN_POOL);
if (pools[pool_id] == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
/* for odd pool_id, create in file */
- pools[pool_id] = vmem_pool_create(dir,
+ pools[pool_id] = vmem_create(dir,
VMEM_MIN_POOL);
if (pools[pool_id] == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
void *test = vmem_malloc(pools[pool_id],
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
for (pool_id = 0; pool_id < TEST_POOLS_MAX; ++pool_id) {
if (pools[pool_id] != NULL) {
- vmem_pool_delete(pools[pool_id]);
+ vmem_delete(pools[pool_id]);
pools[pool_id] = NULL;
}
}
diff --git a/src/test/vmem_out_of_memory/vmem_out_of_memory.c b/src/test/vmem_out_of_memory/vmem_out_of_memory.c
index a25b59c6f52325cbf7480a3954adfe69a36d56e6..3593053e7e713865da37a24f59ddf2913f8eba73 100644
--- a/src/test/vmem_out_of_memory/vmem_out_of_memory.c
+++ b/src/test/vmem_out_of_memory/vmem_out_of_memory.c
@@ -53,17 +53,17 @@ main(int argc, char *argv[])
}
if (dir == NULL) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
/* allocate all memory */
@@ -93,7 +93,7 @@ main(int argc, char *argv[])
vmem_free(vmp, act);
}
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
DONE(NULL);
}
diff --git a/src/test/vmem_pages_purging/vmem_pages_purging.c b/src/test/vmem_pages_purging/vmem_pages_purging.c
index 12bda9b41599d3ad2ce413bd160da9d64e47c1da..b421bb79a00cc00f7b53ecef3110dc7b8a3d5525 100644
--- a/src/test/vmem_pages_purging/vmem_pages_purging.c
+++ b/src/test/vmem_pages_purging/vmem_pages_purging.c
@@ -79,9 +79,9 @@ main(int argc, char *argv[])
usage(argv[0]);
}
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
for (i = 0; i < n; i++) {
int *test = NULL;
@@ -104,7 +104,7 @@ main(int argc, char *argv[])
vmem_free(vmp, test);
}
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
DONE(NULL);
}
diff --git a/src/test/vmem_pool_check/.gitignore b/src/test/vmem_pool_check/.gitignore
deleted file mode 100644
index ce80e73898e4d8837e0cc0dab64ba551c1f35e9b..0000000000000000000000000000000000000000
--- a/src/test/vmem_pool_check/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vmem_pool_check
diff --git a/src/test/vmem_pool_create/.gitignore b/src/test/vmem_pool_create/.gitignore
deleted file mode 100644
index 431dc90aadfd173660199a5e786a240bd74405b3..0000000000000000000000000000000000000000
--- a/src/test/vmem_pool_create/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vmem_pool_create
diff --git a/src/test/vmem_pool_create/out0.log.match b/src/test/vmem_pool_create/out0.log.match
deleted file mode 100644
index 70f089e0db8532f925a348c50bc2e409c97f19b3..0000000000000000000000000000000000000000
--- a/src/test/vmem_pool_create/out0.log.match
+++ /dev/null
@@ -1,4 +0,0 @@
-vmem_pool_create/TEST0: START: vmem_pool_create
- ./vmem_pool_create$(*)
-signal: Segmentation fault
-vmem_pool_create/TEST0: Done
diff --git a/src/test/vmem_pool_create_error/.gitignore b/src/test/vmem_pool_create_error/.gitignore
deleted file mode 100644
index 16c79c8dd56cb86a7a2fb159ec27c9c210f33c91..0000000000000000000000000000000000000000
--- a/src/test/vmem_pool_create_error/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vmem_pool_create_error
diff --git a/src/test/vmem_pool_create_error/out0.log.match b/src/test/vmem_pool_create_error/out0.log.match
deleted file mode 100644
index 1760759a7b379dccd0a31d29ead9b9b84f5e1904..0000000000000000000000000000000000000000
--- a/src/test/vmem_pool_create_error/out0.log.match
+++ /dev/null
@@ -1,3 +0,0 @@
-vmem_pool_create_error/TEST0: START: vmem_pool_create_error
- ./vmem_pool_create_error$(*)
-vmem_pool_create_error/TEST0: Done
diff --git a/src/test/vmem_pool_create_in_region/.gitignore b/src/test/vmem_pool_create_in_region/.gitignore
deleted file mode 100644
index 6e0c9297bdcd166c8ee9e0b01cab8934ca446d6b..0000000000000000000000000000000000000000
--- a/src/test/vmem_pool_create_in_region/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vmem_pool_create_in_region
diff --git a/src/test/vmem_pool_create_in_region/Makefile b/src/test/vmem_pool_create_in_region/Makefile
deleted file mode 100644
index 31dbfdcd28ec1c37a93d812e55a1a24a7f208531..0000000000000000000000000000000000000000
--- a/src/test/vmem_pool_create_in_region/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2014, Intel Corporation
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# * Neither the name of Intel Corporation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# src/test/vmem_pool_create_in_region/Makefile -- build vmem_pool_create_in_region unit test
-#
-TARGET = vmem_pool_create_in_region
-OBJS = vmem_pool_create_in_region.o
-
-LIBVMEM=y
-
-include ../Makefile.inc
-
-vmem_pool_create_in_region.o: vmem_pool_create_in_region.c
diff --git a/src/test/vmem_pool_create_in_region/out0.log.match b/src/test/vmem_pool_create_in_region/out0.log.match
deleted file mode 100644
index 90811d75763352cbc79906152c2eeb41891525ab..0000000000000000000000000000000000000000
--- a/src/test/vmem_pool_create_in_region/out0.log.match
+++ /dev/null
@@ -1,3 +0,0 @@
-vmem_pool_create_in_region/TEST0: START: vmem_pool_create_in_region
- ./vmem_pool_create_in_region$(*)
-vmem_pool_create_in_region/TEST0: Done
diff --git a/src/test/vmem_realloc/vmem_realloc.c b/src/test/vmem_realloc/vmem_realloc.c
index bf443542646e626dcf23d8ac1c0ec01562fd4329..8ddd69b51637285b8a0bf005421086856f74b6e1 100644
--- a/src/test/vmem_realloc/vmem_realloc.c
+++ b/src/test/vmem_realloc/vmem_realloc.c
@@ -55,17 +55,17 @@ main(int argc, char *argv[])
}
if (dir == NULL) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
int *test = vmem_realloc(vmp, NULL, sizeof (int));
@@ -92,7 +92,7 @@ main(int argc, char *argv[])
vmem_free(vmp, test);
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
DONE(NULL);
}
diff --git a/src/test/vmem_stats/vmem_stats.c b/src/test/vmem_stats/vmem_stats.c
index 5be85d51f488f8d99d15eb5ae58b96d9a46e9016..8bb0d0959ba5c47ae8c93977542c18dc07717117 100644
--- a/src/test/vmem_stats/vmem_stats.c
+++ b/src/test/vmem_stats/vmem_stats.c
@@ -57,27 +57,27 @@ main(int argc, char *argv[])
mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp_unused = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp_unused = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp_unused == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp_used = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp_used = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp_used == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
int *test = vmem_malloc(vmp_used, sizeof (int)*100);
ASSERTne(test, NULL);
- vmem_pool_stats_print(vmp_unused, opts);
- vmem_pool_stats_print(vmp_used, opts);
+ vmem_stats_print(vmp_unused, opts);
+ vmem_stats_print(vmp_used, opts);
vmem_free(vmp_used, test);
- vmem_pool_delete(vmp_unused);
- vmem_pool_delete(vmp_used);
+ vmem_delete(vmp_unused);
+ vmem_delete(vmp_used);
DONE(NULL);
}
diff --git a/src/test/vmem_strdup/vmem_strdup.c b/src/test/vmem_strdup/vmem_strdup.c
index 989fa81706501098b6c034e68c24fcc69ab077b4..7df3c266195d5005d691c025b121827bcf3e7127 100644
--- a/src/test/vmem_strdup/vmem_strdup.c
+++ b/src/test/vmem_strdup/vmem_strdup.c
@@ -56,17 +56,17 @@ main(int argc, char *argv[])
}
if (dir == NULL) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
char *str1 = vmem_strdup(vmp, text);
@@ -90,7 +90,7 @@ main(int argc, char *argv[])
vmem_free(vmp, str1);
vmem_free(vmp, str2);
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
DONE(NULL);
}
diff --git a/src/test/vmem_valgrind/vmem_valgrind.c b/src/test/vmem_valgrind/vmem_valgrind.c
index 7c86fa5594af6d7568a5ac7174d713098db2a4f7..2415d10f94a22093e3e71d13d14a2803948d6cdd 100644
--- a/src/test/vmem_valgrind/vmem_valgrind.c
+++ b/src/test/vmem_valgrind/vmem_valgrind.c
@@ -134,17 +134,17 @@ main(int argc, char *argv[])
}
if (dir == NULL) {
- /* allocate memory for function vmem_pool_create_in_region() */
+ /* allocate memory for function vmem_create_in_region() */
void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
- vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+ vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create_in_region");
+ FATAL("!vmem_create_in_region");
} else {
- vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+ vmp = vmem_create(dir, VMEM_MIN_POOL);
if (vmp == NULL)
- FATAL("!vmem_pool_create");
+ FATAL("!vmem_create");
}
switch (test_case) {
@@ -155,7 +155,7 @@ main(int argc, char *argv[])
FATAL("!vmem_malloc");
vmem_free(vmp, ptr);
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
break;
}
case 1: {
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
if (ptr == NULL)
FATAL("!vmem_malloc");
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
/* prevent reporting leaked memory as still reachable */
ptr = NULL;
@@ -199,7 +199,7 @@ main(int argc, char *argv[])
ptr[12] = 7;
vmem_free(vmp, ptr);
- vmem_pool_delete(vmp);
+ vmem_delete(vmp);
break;
}
default: {
diff --git a/src/vmem.c b/src/vmem.c
index a2739caae9dd1008aeaa2f59ce913710647bfc9b..55aed548881b27e04ca64c04f34116f6bb9155de 100644
--- a/src/vmem.c
+++ b/src/vmem.c
@@ -98,10 +98,10 @@ vmem_init(void)
}
/*
- * vmem_pool_create -- create a memory pool in a temp file
+ * vmem_create -- create a memory pool in a temp file
*/
VMEM *
-vmem_pool_create(const char *dir, size_t size)
+vmem_create(const char *dir, size_t size)
{
LOG(3, "dir \"%s\" size %zu", dir, size);
@@ -147,10 +147,10 @@ vmem_pool_create(const char *dir, size_t size)
}
/*
- * vmem_pool_create_in_region -- create a memory pool in a given range
+ * vmem_create_in_region -- create a memory pool in a given range
*/
VMEM *
-vmem_pool_create_in_region(void *addr, size_t size)
+vmem_create_in_region(void *addr, size_t size)
{
LOG(3, "addr %p size %zu", addr, size);
@@ -194,10 +194,10 @@ vmem_pool_create_in_region(void *addr, size_t size)
}
/*
- * vmem_pool_delete -- delete a memory pool
+ * vmem_delete -- delete a memory pool
*/
void
-vmem_pool_delete(VMEM *vmp)
+vmem_delete(VMEM *vmp)
{
LOG(3, "vmp %p", vmp);
@@ -209,10 +209,10 @@ vmem_pool_delete(VMEM *vmp)
}
/*
- * vmem_pool_check -- memory pool consistency check
+ * vmem_check -- memory pool consistency check
*/
int
-vmem_pool_check(VMEM *vmp)
+vmem_check(VMEM *vmp)
{
LOG(3, "vmp %p", vmp);
@@ -220,10 +220,10 @@ vmem_pool_check(VMEM *vmp)
}
/*
- * vmem_pool_freespace -- return current freespace in memory pool
+ * vmem_freespace -- return current freespace in memory pool
*/
size_t
-vmem_pool_freespace(VMEM *vmp)
+vmem_freespace(VMEM *vmp)
{
LOG(3, "vmp %p", vmp);
@@ -231,10 +231,10 @@ vmem_pool_freespace(VMEM *vmp)
}
/*
- * vmem_pool_stats_print -- spew memory allocator stats for a pool
+ * vmem_stats_print -- spew memory allocator stats for a pool
*/
void
-vmem_pool_stats_print(VMEM *vmp, const char *opts)
+vmem_stats_print(VMEM *vmp, const char *opts)
{
LOG(3, "vmp %p opts \"%s\"", vmp, opts);