X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Feal_common_log.c;h=8af86a9f38bfddcef403528f6ae544e567dc0a5a;hb=f831c63cbe86c3025bc9eeccd329c1d2a6275dd5;hp=b93311e4ebb6c979573253c534e84c30fe22850b;hpb=94bc87febf5a6640fb8e96c5d49084f1cebb42ef;p=dpdk.git

diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c
index b93311e4eb..8af86a9f38 100644
--- 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
-#define LOG_BUF_SIZE     (LOG_ELT_SIZE - sizeof(struct 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;
+	static const unsigned hist_buf_size = LOG_ELT_SIZE - sizeof(*hist_buf);
 	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 */
-	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;
@@ -204,9 +204,10 @@ rte_log_add_in_history(const char *buf, size_t 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);
+	log_history_size++;
 	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 */
-	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);
-	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;