/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * version: DPDK.L.1.2.3-3
*/
#include <string.h>
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)
}
/* not enough room for msg, buffer go back in mempool */
- if (size >= (LOG_ELT_SIZE - sizeof(*hist_buf))) {
+ if (size >= hist_buf_size) {
rte_mempool_mp_put(log_history_mp, hist_buf);
rte_spinlock_unlock(&log_list_lock);
return -ENOBUFS;
/* add in history */
memcpy(hist_buf->buf, buf, size);
- hist_buf->buf[LOG_ELT_SIZE-1] = '\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;
/* 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;