Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
DOC-ONLY: upgrade the "requests" package
[vpp.git]
/
src
/
vppinfra
/
mem.h
diff --git
a/src/vppinfra/mem.h
b/src/vppinfra/mem.h
index
1646072
..
a2c5474
100644
(file)
--- a/
src/vppinfra/mem.h
+++ b/
src/vppinfra/mem.h
@@
-52,7
+52,7
@@
#endif
#include <vppinfra/os.h>
#endif
#include <vppinfra/os.h>
-#include <vppinfra/string.h> /* memcpy, memset */
+#include <vppinfra/string.h> /* memcpy,
clib_
memset */
#include <vppinfra/valgrind.h>
#define CLIB_MAX_MHEAPS 256
#include <vppinfra/valgrind.h>
#define CLIB_MAX_MHEAPS 256
@@
-348,7
+348,7
@@
always_inline void *
clib_mem_vm_map (void *addr, uword size)
{
void *mmap_addr;
clib_mem_vm_map (void *addr, uword size)
{
void *mmap_addr;
- uword flags = MAP_PRIVATE | MAP_FIXED;
+ uword flags = MAP_PRIVATE | MAP_FIXED
| MAP_ANONYMOUS
;
mmap_addr = mmap (addr, size, (PROT_READ | PROT_WRITE), flags, -1, 0);
if (mmap_addr == (void *) -1)
mmap_addr = mmap (addr, size, (PROT_READ | PROT_WRITE), flags, -1, 0);
if (mmap_addr == (void *) -1)
@@
-386,9
+386,13
@@
typedef struct
uword requested_va; /**< Request fixed position mapping */
} clib_mem_vm_alloc_t;
uword requested_va; /**< Request fixed position mapping */
} clib_mem_vm_alloc_t;
+clib_error_t *clib_mem_create_fd (char *name, int *fdp);
+clib_error_t *clib_mem_create_hugetlb_fd (char *name, int *fdp);
clib_error_t *clib_mem_vm_ext_alloc (clib_mem_vm_alloc_t * a);
clib_error_t *clib_mem_vm_ext_alloc (clib_mem_vm_alloc_t * a);
-u64 clib_mem_vm_get_page_size (int fd);
-int clib_mem_vm_get_log2_page_size (int fd);
+void clib_mem_vm_ext_free (clib_mem_vm_alloc_t * a);
+u64 clib_mem_get_fd_page_size (int fd);
+uword clib_mem_get_default_hugepage_size (void);
+int clib_mem_get_fd_log2_page_size (int fd);
u64 *clib_mem_vm_get_paddr (void *mem, int log2_page_size, int n_pages);
typedef struct
u64 *clib_mem_vm_get_paddr (void *mem, int log2_page_size, int n_pages);
typedef struct