summaryrefslogtreecommitdiff
path: root/examples/vm_power_manager
diff options
context:
space:
mode:
authorSergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>2014-11-19 12:26:06 +0000
committerThomas Monjalon <thomas.monjalon@6wind.com>2014-11-27 16:21:11 +0100
commitfdf20fa7bee9df9037116318a87080e1eb7e757e (patch)
tree555c742ef267d7d6b1b60aeaad00f9f1407a62f2 /examples/vm_power_manager
parentbe04c7072745e0471fc185c31c2a2df835ee4e06 (diff)
downloaddpdk-fdf20fa7bee9df9037116318a87080e1eb7e757e.zip
dpdk-fdf20fa7bee9df9037116318a87080e1eb7e757e.tar.gz
dpdk-fdf20fa7bee9df9037116318a87080e1eb7e757e.tar.xz
add prefix to cache line macros
CACHE_LINE_SIZE is a macro defined in machine/param.h in FreeBSD and conflicts with DPDK macro version. Adding RTE_ prefix to avoid conflicts. CACHE_LINE_MASK and CACHE_LINE_ROUNDUP are also prefixed. Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com> [Thomas: updated on HEAD, including PPC]
Diffstat (limited to 'examples/vm_power_manager')
-rw-r--r--examples/vm_power_manager/channel_manager.c10
-rw-r--r--examples/vm_power_manager/channel_monitor.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
index 9968ed9..7828be7 100644
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -408,7 +408,7 @@ add_all_channels(const char *vm_name)
continue;
chan_info = rte_malloc(NULL, sizeof(*chan_info),
- CACHE_LINE_SIZE);
+ RTE_CACHE_LINE_SIZE);
if (chan_info == NULL) {
RTE_LOG(ERR, CHANNEL_MANAGER, "Error allocating memory for "
"channel '%s%s'\n", CHANNEL_MGR_SOCKET_PATH, dir->d_name);
@@ -476,7 +476,7 @@ add_channels(const char *vm_name, unsigned *channel_list,
continue;
}
chan_info = rte_malloc(NULL, sizeof(*chan_info),
- CACHE_LINE_SIZE);
+ RTE_CACHE_LINE_SIZE);
if (chan_info == NULL) {
RTE_LOG(ERR, CHANNEL_MANAGER, "Error allocating memory for "
"channel '%s'\n", socket_path);
@@ -639,7 +639,7 @@ add_vm(const char *vm_name)
}
new_domain = rte_malloc("virtual_machine_info", sizeof(*new_domain),
- CACHE_LINE_SIZE);
+ RTE_CACHE_LINE_SIZE);
if (new_domain == NULL) {
RTE_LOG(ERR, CHANNEL_MANAGER, "Unable to allocate memory for VM "
"info\n");
@@ -745,13 +745,13 @@ channel_manager_init(const char *path)
global_maplen = VIR_CPU_MAPLEN(CHANNEL_CMDS_MAX_CPUS);
global_vircpuinfo = rte_zmalloc(NULL, sizeof(*global_vircpuinfo) *
- CHANNEL_CMDS_MAX_CPUS, CACHE_LINE_SIZE);
+ CHANNEL_CMDS_MAX_CPUS, RTE_CACHE_LINE_SIZE);
if (global_vircpuinfo == NULL) {
RTE_LOG(ERR, CHANNEL_MANAGER, "Error allocating memory for CPU Info\n");
goto error;
}
global_cpumaps = rte_zmalloc(NULL, CHANNEL_CMDS_MAX_CPUS * global_maplen,
- CACHE_LINE_SIZE);
+ RTE_CACHE_LINE_SIZE);
if (global_cpumaps == NULL) {
goto error;
}
diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c
index 08b4137..7003ddf 100644
--- a/examples/vm_power_manager/channel_monitor.c
+++ b/examples/vm_power_manager/channel_monitor.c
@@ -175,7 +175,7 @@ channel_monitor_init(void)
return -1;
}
global_events_list = rte_malloc("epoll_events", sizeof(*global_events_list)
- * MAX_EVENTS, CACHE_LINE_SIZE);
+ * MAX_EVENTS, RTE_CACHE_LINE_SIZE);
if (global_events_list == NULL) {
RTE_LOG(ERR, CHANNEL_MONITOR, "Unable to rte_malloc for "
"epoll events\n");