1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00

kernel: refactor naming style

This commit is contained in:
Steffen Vogel 2021-05-20 06:21:33 -04:00
parent 8caa81802f
commit 21f1def3a8
7 changed files with 11 additions and 11 deletions

2
common

@ -1 +1 @@
Subproject commit 74d5ca76144d2faa7d7d0c0c6d5d8d94f9597fb2
Subproject commit 6fb725374693af9cc8ac831bd12b3b504c391ca8

View file

@ -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");

View file

@ -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);

View file

@ -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)

View file

@ -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;

View file

@ -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;

View file

@ -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 */