Commit 535827c5 authored by Ben Walker's avatar Ben Walker Committed by Daniel Verkamp
Browse files

env: Eliminate remaining usage of rte_memzone 



This was only used for debugging. Everywhere else
used the spdk_memzone abstraction.

Change-Id: I8a828ea3c7abccb66c8a027cb13de43c560ff7a1
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 7f5b671d

app/iscsi_tgt/iscsi_tgt.c

+2 −2
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ 
#include <stdlib.h>



#include <rte_config.h>

#include <rte_memzone.h>

#include <rte_eal.h>

#include <rte_lcore.h>



#include "spdk/env.h"

#include "spdk/event.h"

#include "iscsi/iscsi.h"

#include "spdk/log.h"
@@ -85,7 +85,7 @@ static void 
spdk_startup(spdk_event_t event)

{

	if (getenv("MEMZONE_DUMP") != NULL) {

		rte_memzone_dump(stdout);

		spdk_memzone_dump(stdout);

		fflush(stdout);

	}

}

app/nvmf_tgt/nvmf_tgt.c

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <signal.h>



#include <rte_config.h>

#include <rte_memzone.h>

#include <rte_lcore.h>



#include "nvmf_tgt.h"
@@ -337,7 +336,7 @@ spdk_nvmf_startup(spdk_event_t event) 
	SPDK_NOTICELOG("Acceptor running on core %u\n", g_spdk_nvmf_tgt_conf.acceptor_lcore);



	if (getenv("MEMZONE_DUMP") != NULL) {

		rte_memzone_dump(stdout);

		spdk_memzone_dump(stdout);

		fflush(stdout);

	}

include/spdk/env.h

+7 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ extern "C" { 
#include <stdbool.h>

#include <stddef.h>

#include <stdint.h>

#include <stdio.h>



struct spdk_pci_device;
@@ -85,6 +86,12 @@ spdk_memzone_lookup(const char *name); 
int

spdk_memzone_free(const char *name);



/**

 * Dump debug information about all memzones.

 */

void

spdk_memzone_dump(FILE *f);



struct spdk_mempool;



/**

lib/env/env.c

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,12 @@ spdk_memzone_free(const char *name) 
	return -1;

}



void

spdk_memzone_dump(FILE *f)

{

	rte_memzone_dump(f);

}



struct spdk_mempool *

spdk_mempool_create(const char *name, size_t count,

		    size_t ele_size, size_t cache_size)

lib/iscsi/iscsi.c

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
#include <rte_common.h>

#include <rte_log.h>

#include <rte_memcpy.h>

#include <rte_memzone.h>

#include <rte_tailq.h>

#include <rte_eal.h>

#include <rte_per_lcore.h>