thread: Replace #include of io_channel.h with thread.h

Change-Id: I6babd4cf990bf19b510db88bdfb0ca81e29d9252
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/414700
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Madhu Pai <mpai@netapp.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>

examples/bdev/fio_plugin/fio_plugin.c

@@ -37,7 +37,7 @@
 #include "spdk/copy_engine.h"
 #include "spdk/conf.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/string.h"
 #include "spdk/queue.h"

examples/bdev/hello_world/hello_bdev.c

@@ -32,7 +32,7 @@
  */
 
 #include "spdk/stdinc.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/bdev.h"
 #include "spdk/env.h"
 #include "spdk/event.h"

include/spdk/bdev_module.h

@@ -46,7 +46,7 @@
 #include "spdk/bdev.h"
 #include "spdk/queue.h"
 #include "spdk/scsi_spec.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/uuid.h"
 
 /** Block device module */

include/spdk_internal/virtio.h

@@ -44,7 +44,7 @@
 #include "spdk/likely.h"
 #include "spdk/queue.h"
 #include "spdk/json.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/pci_ids.h"
 #include "spdk/env.h"
 

lib/bdev/aio/bdev_aio.c

@@ -39,7 +39,7 @@
 #include "spdk/conf.h"
 #include "spdk/env.h"
 #include "spdk/fd.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/json.h"
 #include "spdk/util.h"
 #include "spdk/string.h"

lib/bdev/bdev.c

@@ -39,7 +39,7 @@
 
 #include "spdk/env.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/queue.h"
 #include "spdk/nvme_spec.h"

lib/bdev/gpt/vbdev_gpt.c

@@ -41,7 +41,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/rpc.h"
 #include "spdk/string.h"
 #include "spdk/util.h"

lib/bdev/iscsi/bdev_iscsi.c

@@ -37,7 +37,7 @@
 #include "spdk/conf.h"
 #include "spdk/env.h"
 #include "spdk/fd.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/json.h"
 #include "spdk/util.h"
 #include "spdk/rpc.h"

lib/bdev/malloc/bdev_malloc.c

@@ -41,7 +41,7 @@
 #include "spdk/env.h"
 #include "spdk/copy_engine.h"
 #include "spdk/json.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/queue.h"
 #include "spdk/string.h"
 

lib/bdev/null/bdev_null.c

@@ -36,7 +36,7 @@
 #include "spdk/bdev.h"
 #include "spdk/conf.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/json.h"
 
 #include "spdk/bdev_module.h"

lib/bdev/nvme/bdev_nvme.c

@@ -41,7 +41,7 @@
 #include "spdk/bdev.h"
 #include "spdk/json.h"
 #include "spdk/nvme.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/string.h"
 #include "spdk/likely.h"
 #include "spdk/util.h"

lib/bdev/passthru/vbdev_passthru.c

@@ -44,7 +44,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/string.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/util.h"
 
 #include "spdk/bdev_module.h"

lib/bdev/rbd/bdev_rbd.c

@@ -42,7 +42,7 @@
 #include "spdk/conf.h"
 #include "spdk/env.h"
 #include "spdk/bdev.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/json.h"
 #include "spdk/string.h"
 #include "spdk/util.h"

lib/bdev/split/vbdev_split.c

@@ -42,7 +42,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/string.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/util.h"
 
 #include "spdk/bdev_module.h"

lib/bdev/virtio/bdev_virtio_blk.c

@@ -37,7 +37,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
 #include "spdk/json.h"

lib/bdev/virtio/bdev_virtio_scsi.c

@@ -37,7 +37,7 @@
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/scsi_spec.h"
 #include "spdk/string.h"
 #include "spdk/util.h"

lib/blob/bdev/blob_bdev.c

@@ -35,7 +35,7 @@
 
 #include "spdk/blob_bdev.h"
 #include "spdk/blob.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/endian.h"
 #include "spdk/bdev_module.h"

lib/blob/blobstore.c

@@ -37,7 +37,7 @@
 #include "spdk/crc32.h"
 #include "spdk/env.h"
 #include "spdk/queue.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/bit_array.h"
 #include "spdk/likely.h"
 

lib/blob/request.c

@@ -36,7 +36,7 @@
 #include "blobstore.h"
 #include "request.h"
 
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/queue.h"
 
 #include "spdk_internal/log.h"

lib/blobfs/blobfs.c

@@ -38,7 +38,7 @@
 #include "blobfs_internal.h"
 
 #include "spdk/queue.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/assert.h"
 #include "spdk/env.h"
 #include "spdk/util.h"

lib/copy/copy_engine.c

@@ -38,7 +38,7 @@
 #include "spdk/env.h"
 #include "spdk/event.h"
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 static size_t g_max_copy_module_size = 0;
 

lib/copy/ioat/copy_engine_ioat.c

@@ -39,7 +39,7 @@
 #include "spdk/env.h"
 #include "spdk/conf.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/ioat.h"
 
 #define IOAT_MAX_CHANNELS		64

lib/event/reactor.c

@@ -38,7 +38,7 @@
 #include "spdk_internal/log.h"
 
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/env.h"
 #include "spdk/util.h"
 

lib/event/rpc.c

@@ -35,7 +35,7 @@
 
 #include "spdk/conf.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/rpc.h"
 

lib/event/subsystems/bdev/bdev.c

@@ -35,7 +35,7 @@
 
 #include "spdk/bdev.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 #include "spdk_internal/event.h"
 #include "spdk/env.h"

lib/event/subsystems/nvmf/nvmf_tgt.c

@@ -35,7 +35,7 @@
 
 #include "spdk/bdev.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/nvme.h"
 #include "spdk/util.h"

lib/iscsi/acceptor.c

@@ -35,7 +35,7 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/sock.h"
 #include "spdk/string.h"

lib/iscsi/conn.c

@@ -37,7 +37,7 @@
 #include "spdk/endian.h"
 #include "spdk/env.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/queue.h"
 #include "spdk/trace.h"
 #include "spdk/net.h"

lib/iscsi/iscsi.h

@@ -40,7 +40,7 @@
 #include "spdk/bdev.h"
 #include "spdk/iscsi_spec.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 #include "iscsi/param.h"
 #include "iscsi/tgt_node.h"

lib/lvol/lvol.c

@@ -34,7 +34,7 @@
 #include "spdk_internal/lvolstore.h"
 #include "spdk_internal/log.h"
 #include "spdk/string.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/blob_bdev.h"
 #include "spdk/util.h"
 

lib/nbd/nbd.c

@@ -43,7 +43,7 @@
 #include "spdk/env.h"
 #include "spdk/log.h"
 #include "spdk/util.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/event.h"
 
 #include "spdk_internal/log.h"

lib/nvmf/ctrlr.c

@@ -38,7 +38,7 @@
 
 #include "spdk/bit_array.h"
 #include "spdk/endian.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/trace.h"
 #include "spdk/nvme_spec.h"
 #include "spdk/string.h"

lib/nvmf/ctrlr_bdev.c

@@ -37,7 +37,7 @@
 
 #include "spdk/bdev.h"
 #include "spdk/endian.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/nvme.h"
 #include "spdk/nvmf_spec.h"

lib/nvmf/nvmf.c

@@ -35,7 +35,7 @@
 
 #include "spdk/bdev.h"
 #include "spdk/conf.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/nvmf.h"
 #include "spdk/trace.h"
 

lib/nvmf/rdma.c

@@ -41,7 +41,7 @@
 #include "transport.h"
 
 #include "spdk/assert.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/nvmf.h"
 #include "spdk/nvmf_spec.h"
 #include "spdk/string.h"

lib/nvmf/request.c

@@ -36,7 +36,7 @@
 #include "nvmf_internal.h"
 #include "transport.h"
 
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/nvme.h"
 #include "spdk/nvmf_spec.h"

lib/rocksdb/env_spdk.cc

@@ -43,7 +43,7 @@ extern "C" {
 #include "spdk/blobfs.h"
 #include "spdk/blob_bdev.h"
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/bdev.h"
 }
 

lib/scsi/lun.c

@@ -35,7 +35,7 @@
 #include "scsi_internal.h"
 #include "spdk/endian.h"
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/event.h"
 #include "spdk/util.h"
 

lib/thread/thread.c

@@ -33,7 +33,7 @@
 
 #include "spdk/stdinc.h"
 
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/log.h"
 
 #ifdef __linux__

lib/vhost/vhost_blk.c

@@ -36,7 +36,7 @@
 #include "spdk/env.h"
 #include "spdk/bdev.h"
 #include "spdk/conf.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/string.h"
 #include "spdk/util.h"

lib/vhost/vhost_nvme.c

@@ -38,7 +38,7 @@
 #include "spdk/conf.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/barrier.h"
 #include "spdk/vhost.h"
 #include "spdk/bdev.h"

lib/vhost/vhost_scsi.c

@@ -36,7 +36,7 @@
 #include <linux/virtio_scsi.h>
 
 #include "spdk/env.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/scsi.h"
 #include "spdk/scsi_spec.h"
 #include "spdk/conf.h"

test/bdev/bdevio/bdevio.c

@@ -38,7 +38,7 @@
 #include "spdk/copy_engine.h"
 #include "spdk/env.h"
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 #include "CUnit/Basic.h"
 

test/bdev/bdevperf/bdevperf.c

@@ -41,7 +41,7 @@
 #include "spdk/event.h"
 #include "spdk/log.h"
 #include "spdk/util.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/string.h"
 
 struct bdevperf_task {

test/blobfs/fuse/fuse.c

@@ -40,7 +40,7 @@
 #include "spdk/blobfs.h"
 #include "spdk/bdev.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/blob_bdev.h"
 #include "spdk/log.h"
 

test/common/lib/ut_multithread.c

@@ -32,7 +32,7 @@
  */
 
 #include "spdk_cunit.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk_internal/mock.h"
 
 static uint32_t g_ut_num_threads;

test/event/reactor/reactor.c

@@ -34,7 +34,7 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 static int g_time_in_sec;
 static struct spdk_poller *test_end_poller;

test/event/reactor_perf/reactor_perf.c

@@ -35,7 +35,7 @@
 
 #include "spdk/env.h"
 #include "spdk/event.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 static int g_time_in_sec;
 static int g_queue_depth;

test/unit/lib/blob/bs_dev_common.c

@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "bs_scheduler.c"
 
 

test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c

@@ -36,7 +36,7 @@
 #include "spdk/blobfs.h"
 #include "spdk/env.h"
 #include "spdk/log.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/barrier.h"
 
 #include "spdk_cunit.h"

test/unit/lib/lvol/lvol.c/lvol_ut.c

@@ -33,7 +33,7 @@
 
 #include "spdk_cunit.h"
 #include "spdk/blob.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk/util.h"
 
 #include "common/lib/test_env.c"

test/unit/lib/vhost/test_vhost.c

@@ -36,7 +36,7 @@
 #include "CUnit/Basic.h"
 #include "spdk_cunit.h"
 #include "spdk_internal/mock.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 
 #include "unit/lib/json_mock.c"
 

test/unit/lib/vhost/vhost.c/vhost_ut.c

@@ -35,7 +35,7 @@
 
 #include "CUnit/Basic.h"
 #include "spdk_cunit.h"
-#include "spdk/io_channel.h"
+#include "spdk/thread.h"
 #include "spdk_internal/mock.h"
 #include "common/lib/test_env.c"
 #include "unit/lib/json_mock.c"