common: avoid pmem_ prefix for pmem2 functions

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
pmem · Mar 21, 2024 · d2fb1bf · d2fb1bf
1 parent 30ee4a7
commit d2fb1bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/libpmem2/x86_64/init.c b/src/libpmem2/x86_64/init.c
@@ -110,7 +110,7 @@ pmem2_memmove_nodrain_eadr(void *dest, const void *src, size_t len,
 }
 
 static void *
-pmem_memset_nodrain(void *dest, int c, size_t len, unsigned flags,
+pmem2_memset_nodrain(void *dest, int c, size_t len, unsigned flags,
  flush_func flushf, const struct memset_nodrain *memset_funcs)
 {
  /* suppress unused-parameter errors */
@@ -134,7 +134,7 @@ pmem_memset_nodrain(void *dest, int c, size_t len, unsigned flags,
 }
 
 static void *
-pmem_memset_nodrain_eadr(void *dest, int c, size_t len, unsigned flags,
+pmem2_memset_nodrain_eadr(void *dest, int c, size_t len, unsigned flags,
  flush_func flushf, const struct memset_nodrain *memset_funcs)
 {
  /* suppress unused-parameter errors */
@@ -158,8 +158,8 @@ pmem_set_mem_funcs(struct pmem2_arch_info *info)
 {
  info->memmove_nodrain = pmem2_memmove_nodrain;
  info->memmove_nodrain_eadr = pmem2_memmove_nodrain_eadr;
- info->memset_nodrain = pmem_memset_nodrain;
- info->memset_nodrain_eadr = pmem_memset_nodrain_eadr;
+ info->memset_nodrain = pmem2_memset_nodrain;
+ info->memset_nodrain_eadr = pmem2_memset_nodrain_eadr;
 }
 
 enum memcpy_impl {

diff --git a/utils/call_stacks_analysis/make_extra.py b/utils/call_stacks_analysis/make_extra.py
@@ -61,7 +61,7 @@ def pmem_function_pointers(calls: Calls) -> Calls:
  calls['pmem_memmove_persist'] = memmove_nodrain_all
  calls['pmem_memcpy_persist'] = memmove_nodrain_all
 
- memset_nodrain_all = ['memset_nodrain_libc', 'memset_nodrain_generic', 'pmem_memset_nodrain.static', 'pmem_memset_nodrain_eadr.static']
+ memset_nodrain_all = ['memset_nodrain_libc', 'memset_nodrain_generic', 'pmem2_memset_nodrain', 'pmem2_memset_nodrain_eadr']
  calls['pmem_memset'] = memset_nodrain_all
  calls['pmem_memset_nodrain'] = memset_nodrain_all
  calls['pmem_memset_persist'] = memset_nodrain_all
@@ -154,12 +154,12 @@ def pmem_function_pointers(calls: Calls) -> Calls:
  memsetfuncs['nt']['empty'].extend(memsetfuncs_extras['nt']['empty'])
  memsetfuncs['nt']['flush'].extend(memsetfuncs_extras['nt']['flush'])
 
- calls['pmem_memset_nodrain.static'] = \
+ calls['pmem2_memset_nodrain'] = \
  memsetfuncs['t']['noflush'] + \
  memsetfuncs['nt']['flush'] + \
  memsetfuncs['t']['flush']
 
- calls['pmem_memset_nodrain_eadr.static'] = \
+ calls['pmem2_memset_nodrain_eadr'] = \
  memsetfuncs['t']['noflush'] + \
  memsetfuncs['nt']['empty'] + \
  memsetfuncs['t']['empty']