Commit d87afb4c authored by Konrad Sztyber's avatar Konrad Sztyber
Browse files

thread: remove io_device name from ioch tracepoints 



These tracepoints don't include this parameter in their definitions.
This patch fixes the following assertion when the traces are enabled in
the thread library:

```
_spdk_trace_record: Assertion `0 && "Unexpected number of tracepoint arguments"' failed
```

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I5159dbafd25c3150c90fa26c966dadb1fe239953
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11159


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent a7d61bef

lib/thread/thread.c

+3 −3
Original line number Diff line number Diff line
@@ -2139,7 +2139,7 @@ spdk_get_io_channel(void *io_device) 
		 */

		pthread_mutex_unlock(&g_devlist_mutex);

		spdk_trace_record(TRACE_THREAD_IOCH_GET, 0, 0,

				  (uint64_t)spdk_io_channel_get_ctx(ch), ch->ref, dev->name);

				  (uint64_t)spdk_io_channel_get_ctx(ch), ch->ref);

		return ch;

	}
@@ -2174,7 +2174,7 @@ spdk_get_io_channel(void *io_device) 
		return NULL;

	}



	spdk_trace_record(TRACE_THREAD_IOCH_GET, 0, 0, (uint64_t)spdk_io_channel_get_ctx(ch), 1, dev->name);

	spdk_trace_record(TRACE_THREAD_IOCH_GET, 0, 0, (uint64_t)spdk_io_channel_get_ctx(ch), 1);

	return ch;

}
@@ -2242,7 +2242,7 @@ spdk_put_io_channel(struct spdk_io_channel *ch) 
	int rc __attribute__((unused));



	spdk_trace_record(TRACE_THREAD_IOCH_PUT, 0, 0,

			  (uint64_t)spdk_io_channel_get_ctx(ch), ch->ref, ch->dev->name);

			  (uint64_t)spdk_io_channel_get_ctx(ch), ch->ref);



	thread = spdk_get_thread();

	if (!thread) {