From 21f1def3a8f73b54856f980274d63b3a047cd0b2 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 20 May 2021 06:21:33 -0400 Subject: [PATCH] kernel: refactor naming style --- common | 2 +- lib/kernel/tc.cpp | 4 ++-- lib/kernel/tc_netem.cpp | 2 +- lib/memory.cpp | 2 +- lib/memory/mmap.cpp | 8 ++++---- lib/pool.cpp | 2 +- lib/shmem.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common b/common index 74d5ca761..6fb725374 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 74d5ca76144d2faa7d7d0c0c6d5d8d94f9597fb2 +Subproject commit 6fb725374693af9cc8ac831bd12b3b504c391ca8 diff --git a/lib/kernel/tc.cpp b/lib/kernel/tc.cpp index 42997cfa9..1359f3e65 100644 --- a/lib/kernel/tc.cpp +++ b/lib/kernel/tc.cpp @@ -43,7 +43,7 @@ int villas::kernel::tc::prio(Interface *i, struct rtnl_qdisc **qd, tc_hdl_t hand struct nl_sock *sock = nl::init(); struct rtnl_qdisc *q = rtnl_qdisc_alloc(); - ret = kernel::module_load("sch_prio"); + ret = kernel::loadModule("sch_prio"); if (ret) throw RuntimeError("Failed to load kernel module: sch_prio ({})", ret); @@ -77,7 +77,7 @@ int villas::kernel::tc::mark(Interface *i, struct rtnl_cls **cls, tc_hdl_t flowi struct nl_sock *sock = nl::init(); struct rtnl_cls *c = rtnl_cls_alloc(); - ret = kernel::module_load("cls_fw"); + ret = kernel::loadModule("cls_fw"); if (ret) throw RuntimeError("Failed to load kernel module: cls_fw"); diff --git a/lib/kernel/tc_netem.cpp b/lib/kernel/tc_netem.cpp index b02f3a54d..4f093ab32 100644 --- a/lib/kernel/tc_netem.cpp +++ b/lib/kernel/tc_netem.cpp @@ -273,7 +273,7 @@ int villas::kernel::tc::netem(Interface *i, struct rtnl_qdisc **qd, tc_hdl_t han struct nl_sock *sock = nl::init(); struct rtnl_qdisc *q = *qd; - ret = kernel::module_load("sch_netem"); + ret = kernel::loadModule("sch_netem"); if (ret) throw RuntimeError("Failed to load kernel module: sch_netem ({})", ret); diff --git a/lib/memory.cpp b/lib/memory.cpp index 03271bc3e..5c9301fff 100644 --- a/lib/memory.cpp +++ b/lib/memory.cpp @@ -53,7 +53,7 @@ int memory_init(int hugepages) if (ret < 0) return ret; - size_t lock = kernel::get_hugepage_size() * hugepages; + size_t lock = kernel::getHugePageSize() * hugepages; ret = memory_lock(lock); if (ret) diff --git a/lib/memory/mmap.cpp b/lib/memory/mmap.cpp index 2ceb2e330..42f12df57 100644 --- a/lib/memory/mmap.cpp +++ b/lib/memory/mmap.cpp @@ -53,12 +53,12 @@ int memory_mmap_init(int hugepages) { logger = logging.get("memory:mmap"); - pgsz = kernel::get_page_size(); + pgsz = kernel::getPageSize(); if (pgsz < 0) return -1; if (hugepages > 0) { - hugepgsz = kernel::get_hugepage_size(); + hugepgsz = kernel::getHugePageSize(); if (hugepgsz < 0) { logger->warn("Failed to determine hugepage size."); @@ -69,10 +69,10 @@ int memory_mmap_init(int hugepages) #if defined(__linux__) && defined(__x86_64__) int ret, pagecnt; - pagecnt = kernel::get_nr_hugepages(); + pagecnt = kernel::getNrHugepages(); if (pagecnt < hugepages) { if (getuid() == 0) { - ret = kernel::set_nr_hugepages(hugepages); + ret = kernel::setNrHugepages(hugepages); if (ret) { logger->warn("Failed to increase number of reserved hugepages"); memory_default = &memory_mmap; diff --git a/lib/pool.cpp b/lib/pool.cpp index e8f85c352..6a8def7bd 100644 --- a/lib/pool.cpp +++ b/lib/pool.cpp @@ -34,7 +34,7 @@ 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::getCachelineSize(); p->blocksz = p->alignment * CEIL(blocksz, p->alignment); p->len = cnt * p->blocksz; diff --git a/lib/shmem.cpp b/lib/shmem.cpp index ecf4a3613..c5d69b51e 100644 --- a/lib/shmem.cpp +++ b/lib/shmem.cpp @@ -44,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::getCachelineSize() * CEIL(SAMPLE_LENGTH(samplelen), kernel::getCachelineSize()) /* a memblock for each allocation (1 shmem_shared, 2 queues, 1 pool) */ + 4 * sizeof(struct memory_block) /* and some extra buffer for alignment */