git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add prefix to cache line macros
[dpdk.git]
/
lib
/
librte_eal
/
common
/
eal_common_memzone.c
diff --git
a/lib/librte_eal/common/eal_common_memzone.c
b/lib/librte_eal/common/eal_common_memzone.c
index
f1fc4a7
..
b5a5d72
100644
(file)
--- a/
lib/librte_eal/common/eal_common_memzone.c
+++ b/
lib/librte_eal/common/eal_common_memzone.c
@@
-86,7
+86,7
@@
rte_memzone_reserve(const char *name, size_t len, int socket_id,
unsigned flags)
{
return rte_memzone_reserve_aligned(name,
unsigned flags)
{
return rte_memzone_reserve_aligned(name,
- len, socket_id, flags, CACHE_LINE_SIZE);
+ len, socket_id, flags,
RTE_
CACHE_LINE_SIZE);
}
/*
}
/*
@@
-164,21
+164,21
@@
memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
}
/* alignment less than cache size is not allowed */
}
/* alignment less than cache size is not allowed */
- if (align < CACHE_LINE_SIZE)
- align = CACHE_LINE_SIZE;
+ if (align <
RTE_
CACHE_LINE_SIZE)
+ align =
RTE_
CACHE_LINE_SIZE;
/* align length on cache boundary. Check for overflow before doing so */
/* align length on cache boundary. Check for overflow before doing so */
- if (len > SIZE_MAX - CACHE_LINE_MASK) {
+ if (len > SIZE_MAX -
RTE_
CACHE_LINE_MASK) {
rte_errno = EINVAL; /* requested size too big */
return NULL;
}
rte_errno = EINVAL; /* requested size too big */
return NULL;
}
- len += CACHE_LINE_MASK;
- len &= ~((size_t) CACHE_LINE_MASK);
+ len +=
RTE_
CACHE_LINE_MASK;
+ len &= ~((size_t)
RTE_
CACHE_LINE_MASK);
/* save minimal requested length */
/* save minimal requested length */
- requested_len = RTE_MAX((size_t)CACHE_LINE_SIZE, len);
+ requested_len = RTE_MAX((size_t)
RTE_
CACHE_LINE_SIZE, len);
/* check that boundary condition is valid */
if (bound != 0 &&
/* check that boundary condition is valid */
if (bound != 0 &&
@@
-430,8
+430,8
@@
memseg_sanitize(struct rte_memseg *memseg)
unsigned virt_align;
unsigned off;
unsigned virt_align;
unsigned off;
- phys_align = memseg->phys_addr & CACHE_LINE_MASK;
- virt_align = (unsigned long)memseg->addr & CACHE_LINE_MASK;
+ phys_align = memseg->phys_addr &
RTE_
CACHE_LINE_MASK;
+ virt_align = (unsigned long)memseg->addr &
RTE_
CACHE_LINE_MASK;
/*
* sanity check: phys_addr and addr must have the same
/*
* sanity check: phys_addr and addr must have the same
@@
-441,19
+441,19
@@
memseg_sanitize(struct rte_memseg *memseg)
return -1;
/* memseg is really too small, don't bother with it */
return -1;
/* memseg is really too small, don't bother with it */
- if (memseg->len < (2 * CACHE_LINE_SIZE)) {
+ if (memseg->len < (2 *
RTE_
CACHE_LINE_SIZE)) {
memseg->len = 0;
return 0;
}
/* align start address */
memseg->len = 0;
return 0;
}
/* align start address */
- off = (
CACHE_LINE_SIZE - phys_align) &
CACHE_LINE_MASK;
+ off = (
RTE_CACHE_LINE_SIZE - phys_align) & RTE_
CACHE_LINE_MASK;
memseg->phys_addr += off;
memseg->addr = (char *)memseg->addr + off;
memseg->len -= off;
/* align end address */
memseg->phys_addr += off;
memseg->addr = (char *)memseg->addr + off;
memseg->len -= off;
/* align end address */
- memseg->len &= ~((uint64_t)CACHE_LINE_MASK);
+ memseg->len &= ~((uint64_t)
RTE_
CACHE_LINE_MASK);
return 0;
}
return 0;
}