From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <cliang18@shecgisg004.sh.intel.com>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
by dpdk.org (Postfix) with ESMTP id B6BB537C4
for <dev@dpdk.org>; Mon, 2 Feb 2015 03:03:17 +0100 (CET)
Received: from orsmga002.jf.intel.com ([10.7.209.21])
by orsmga101.jf.intel.com with ESMTP; 01 Feb 2015 18:03:17 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.09,503,1418112000"; d="scan'208";a="679459165"
Received: from shvmail01.sh.intel.com ([10.239.29.42])
by orsmga002.jf.intel.com with ESMTP; 01 Feb 2015 18:03:16 -0800
Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com
[10.239.29.89])
by shvmail01.sh.intel.com with ESMTP id t1223DpU014422;
Mon, 2 Feb 2015 10:03:13 +0800
Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1])
by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id
t12239qe013742; Mon, 2 Feb 2015 10:03:11 +0800
Received: (from cliang18@localhost)
by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t12239A2013738;
Mon, 2 Feb 2015 10:03:09 +0800
From: Cunming Liang <cunming.liang@intel.com>
To: dev@dpdk.org
Date: Mon, 2 Feb 2015 10:02:32 +0800
Message-Id: <1422842559-13617-11-git-send-email-cunming.liang@intel.com>
X-Mailer: git-send-email 1.7.4.1
In-Reply-To: <1422842559-13617-1-git-send-email-cunming.liang@intel.com>
References: <1422491072-5114-1-git-send-email-cunming.liang@intel.com>
<1422842559-13617-1-git-send-email-cunming.liang@intel.com>
Subject: [dpdk-dev] [PATCH v4 10/17] malloc: fix the issue of SOCKET_ID_ANY
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2015 02:03:18 -0000
Add check for rte_socket_id(), avoid get unexpected return like (-1).
Signed-off-by: Cunming Liang <cunming.liang@intel.com>
---
lib/librte_malloc/malloc_heap.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/librte_malloc/malloc_heap.h b/lib/librte_malloc/malloc_heap.h
index b4aec45..a47136d 100644
--- a/lib/librte_malloc/malloc_heap.h
+++ b/lib/librte_malloc/malloc_heap.h
@@ -44,7 +44,12 @@ extern "C" {
static inline unsigned
malloc_get_numa_socket(void)
{
- return rte_socket_id();
+ unsigned socket_id = rte_socket_id();
+
+ if (socket_id == (unsigned)SOCKET_ID_ANY)
+ return 0;
+
+ return socket_id;
}
void *
--
1.8.1.4