Commit c3c69229 authored Nov 16, 2018 by Tomasz Zawadzki Committed by Jim Harris Nov 19, 2018

app/trace: fix app_name dereference on init



In case when only file_name was provided,
app_name was still dereferenced.

Change-Id: Ica948e072ef02a8daadf303b3e2a004640d19000
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/433609


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

parent 3126157a

app/trace/trace.cpp

+5 −6

Original line number	Diff line number	Diff line
		@@ -341,15 +341,14 @@ int main(int argc, char **argv)
		exit(1);
		}

		if (file_name) {
		fd = open(file_name, O_RDONLY);
		} else {
		if (shm_id >= 0) {
		snprintf(shm_name, sizeof(shm_name), "/%s_trace.%d", app_name, shm_id);
		} else {
		snprintf(shm_name, sizeof(shm_name), "/%s_trace.pid%d", app_name, shm_pid);
		}

		if (file_name) {
		fd = open(file_name, O_RDONLY);
		} else {
		fd = shm_open(shm_name, O_RDONLY, 0600);
		}
		if (fd < 0) {