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
ethdev: minor changes
[dpdk.git]
/
lib
/
librte_eal
/
common
/
eal_common_log.c
diff --git
a/lib/librte_eal/common/eal_common_log.c
b/lib/librte_eal/common/eal_common_log.c
index
b93311e
..
8af86a9
100644
(file)
--- a/
lib/librte_eal/common/eal_common_log.c
+++ b/
lib/librte_eal/common/eal_common_log.c
@@
-63,7
+63,6
@@
#include "eal_private.h"
#define LOG_ELT_SIZE 2048
#include "eal_private.h"
#define LOG_ELT_SIZE 2048
-#define LOG_BUF_SIZE (LOG_ELT_SIZE - sizeof(struct log_history))
#define LOG_HISTORY_MP_NAME "log_history"
#define LOG_HISTORY_MP_NAME "log_history"
@@
-171,6
+170,7
@@
int
rte_log_add_in_history(const char *buf, size_t size)
{
struct log_history *hist_buf = NULL;
rte_log_add_in_history(const char *buf, size_t size)
{
struct log_history *hist_buf = NULL;
+ static const unsigned hist_buf_size = LOG_ELT_SIZE - sizeof(*hist_buf);
void *obj;
if (history_enabled == 0)
void *obj;
if (history_enabled == 0)
@@
-196,7
+196,7
@@
rte_log_add_in_history(const char *buf, size_t size)
}
/* not enough room for msg, buffer go back in mempool */
}
/* not enough room for msg, buffer go back in mempool */
- if (size >=
LOG_BUF_SIZE - 1
) {
+ if (size >=
hist_buf_size
) {
rte_mempool_mp_put(log_history_mp, hist_buf);
rte_spinlock_unlock(&log_list_lock);
return -ENOBUFS;
rte_mempool_mp_put(log_history_mp, hist_buf);
rte_spinlock_unlock(&log_list_lock);
return -ENOBUFS;
@@
-204,9
+204,10
@@
rte_log_add_in_history(const char *buf, size_t size)
/* add in history */
memcpy(hist_buf->buf, buf, size);
/* add in history */
memcpy(hist_buf->buf, buf, size);
- hist_buf->buf[size] = '\0';
+ hist_buf->buf[size] =
hist_buf->buf[hist_buf_size-1] =
'\0';
hist_buf->size = size;
STAILQ_INSERT_TAIL(&log_history, hist_buf, next);
hist_buf->size = size;
STAILQ_INSERT_TAIL(&log_history, hist_buf, next);
+ log_history_size++;
rte_spinlock_unlock(&log_list_lock);
return 0;
rte_spinlock_unlock(&log_list_lock);
return 0;
@@
-369,15
+370,14
@@
rte_eal_common_log_init(FILE *default_log)
/* reserve RTE_LOG_HISTORY*2 elements, so we can dump and
* keep logging during this time */
/* reserve RTE_LOG_HISTORY*2 elements, so we can dump and
* keep logging during this time */
- if (rte_eal_process_type() == RTE_PROC_PRIMARY)
- log_history_mp = rte_mempool_create(LOG_HISTORY_MP_NAME, RTE_LOG_HISTORY*2,
+ log_history_mp = rte_mempool_create(LOG_HISTORY_MP_NAME, RTE_LOG_HISTORY*2,
LOG_ELT_SIZE, 0, 0,
NULL, NULL,
NULL, NULL,
SOCKET_ID_ANY, 0);
LOG_ELT_SIZE, 0, 0,
NULL, NULL,
NULL, NULL,
SOCKET_ID_ANY, 0);
- else
- log_history_mp = rte_mempool_lookup(LOG_HISTORY_MP_NAME);
-
if (log_history_mp == NULL)
{
+
+ if ((log_history_mp == NULL) &&
+
((log_history_mp = rte_mempool_lookup(LOG_HISTORY_MP_NAME)) == NULL))
{
RTE_LOG(ERR, EAL, "%s(): cannot create log_history mempool\n",
__func__);
return -1;
RTE_LOG(ERR, EAL, "%s(): cannot create log_history mempool\n",
__func__);
return -1;