From 53bb93a967aed8435ccf8d6a07dcc923e1b9d875 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 4 Mar 2020 13:38:40 +0100 Subject: [PATCH] use new kernel namespace --- lib/kernel/tc.cpp | 6 ++++-- lib/kernel/tc_netem.cpp | 3 ++- lib/memory.cpp | 4 +++- lib/memory/mmap.cpp | 9 +++++---- lib/pool.cpp | 4 +++- lib/shmem.cpp | 4 +++- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/lib/kernel/tc.cpp b/lib/kernel/tc.cpp index 50ad807a3..f0e096ade 100644 --- a/lib/kernel/tc.cpp +++ b/lib/kernel/tc.cpp @@ -34,13 +34,15 @@ #include #include +using namespace villas; + int tc_prio(struct interface *i, struct rtnl_qdisc **qd, tc_hdl_t handle, tc_hdl_t parent, int bands) { int ret; struct nl_sock *sock = nl_init(); struct rtnl_qdisc *q = rtnl_qdisc_alloc(); - ret = kernel_module_load("sch_prio"); + ret = kernel::module_load("sch_prio"); if (ret) error("Failed to load kernel module: sch_prio (%d)", ret); @@ -73,7 +75,7 @@ int tc_mark(struct interface *i, struct rtnl_cls **cls, tc_hdl_t flowid, uint32_ struct nl_sock *sock = nl_init(); struct rtnl_cls *c = rtnl_cls_alloc(); - ret = kernel_module_load("cls_fw"); + ret = kernel::module_load("cls_fw"); if (ret) error("Failed to load kernel module: cls_fw"); diff --git a/lib/kernel/tc_netem.cpp b/lib/kernel/tc_netem.cpp index f8e3249eb..2dc18f292 100644 --- a/lib/kernel/tc_netem.cpp +++ b/lib/kernel/tc_netem.cpp @@ -34,6 +34,7 @@ #include #include +using namespace villas; using namespace villas::utils; static const double max_percent_value = 0xffffffff; @@ -216,7 +217,7 @@ int tc_netem(struct interface *i, struct rtnl_qdisc **qd, tc_hdl_t handle, tc_hd struct nl_sock *sock = nl_init(); struct rtnl_qdisc *q = *qd; - ret = kernel_module_load("sch_netem"); + ret = kernel::module_load("sch_netem"); if (ret) error("Failed to load kernel module: sch_netem (%d)", ret); diff --git a/lib/memory.cpp b/lib/memory.cpp index 3ebd02043..69f31115e 100644 --- a/lib/memory.cpp +++ b/lib/memory.cpp @@ -36,6 +36,8 @@ #include #include +using namespace villas; + static std::unordered_map allocations; int memory_init(int hugepages) @@ -48,7 +50,7 @@ int memory_init(int hugepages) if (ret < 0) return ret; - size_t lock = kernel_get_hugepage_size() * hugepages; + size_t lock = kernel::get_hugepage_size() * hugepages; ret = memory_lock(lock); if (ret) diff --git a/lib/memory/mmap.cpp b/lib/memory/mmap.cpp index 0ea0d7dd0..e96cc4a61 100644 --- a/lib/memory/mmap.cpp +++ b/lib/memory/mmap.cpp @@ -40,6 +40,7 @@ #include #include +using namespace villas; using namespace villas::utils; static size_t pgsz = -1; @@ -47,12 +48,12 @@ static size_t hugepgsz = -1; int memory_mmap_init(int hugepages) { - pgsz = kernel_get_page_size(); + pgsz = kernel::get_page_size(); if (pgsz < 0) return -1; if (hugepages > 0) { - hugepgsz = kernel_get_hugepage_size(); + hugepgsz = kernel::get_hugepage_size(); if (hugepgsz < 0) { warning("Failed to determine hugepage size."); @@ -63,10 +64,10 @@ int memory_mmap_init(int hugepages) #if defined(__linux__) && defined(__x86_64__) int ret, pagecnt; - pagecnt = kernel_get_nr_hugepages(); + pagecnt = kernel::get_nr_hugepages(); if (pagecnt < hugepages) { if (getuid() == 0) { - ret = kernel_set_nr_hugepages(hugepages); + ret = kernel::set_nr_hugepages(hugepages); if (ret) { warning("Failed to increase number of reserved hugepages"); memory_default = &memory_mmap; diff --git a/lib/pool.cpp b/lib/pool.cpp index 94469ceab..3fe018ed6 100644 --- a/lib/pool.cpp +++ b/lib/pool.cpp @@ -25,12 +25,14 @@ #include #include +using namespace villas; + int pool_init(struct pool *p, size_t cnt, size_t blocksz, struct memory_type *m) { int ret; /* Make sure that we use a block size that is aligned to the size of a cache line */ - p->alignment = kernel_get_cacheline_size(); + p->alignment = kernel::get_cacheline_size(); p->blocksz = p->alignment * CEIL(blocksz, p->alignment); p->len = cnt * p->blocksz; diff --git a/lib/shmem.cpp b/lib/shmem.cpp index 373eace0b..1cd81e383 100644 --- a/lib/shmem.cpp +++ b/lib/shmem.cpp @@ -33,6 +33,8 @@ #include #include +using namespace villas; + size_t shmem_total_size(int queuelen, int samplelen) { /* We have the constant const of the memory_type header */ @@ -42,7 +44,7 @@ size_t shmem_total_size(int queuelen, int samplelen) /* the size of the actual queue and the queue for the pool */ + queuelen * (2 * sizeof(struct queue_cell)) /* the size of the pool */ - + queuelen * kernel_get_cacheline_size() * CEIL(SAMPLE_LENGTH(samplelen), kernel_get_cacheline_size()) + + queuelen * kernel::get_cacheline_size() * CEIL(SAMPLE_LENGTH(samplelen), kernel::get_cacheline_size()) /* a memblock for each allocation (1 shmem_shared, 2 queues, 1 pool) */ + 4 * sizeof(struct memory_block) /* and some extra buffer for alignment */