Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f93bbf authored by Tony Jones's avatar Tony Jones Committed by Arnaldo Carvalho de Melo
Browse files

perf script python: Add printdate function to SQL exporters 



Introduce a printdate function to eliminate the repetitive use of
datetime.datetime.today() in the SQL exporting scripts.

Signed-off-by: default avatarTony Jones <tonyj@suse.de>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: http://lkml.kernel.org/r/20190309000518.2438-5-tonyj@suse.de


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ebf6c5c1

tools/perf/scripts/python/export-to-postgresql.py

+11 −8
Original line number Original line Diff line number Diff line
@@ -251,6 +251,9 @@ perf_db_export_callchains = False 
def printerr(*args, **kw_args):

def printerr(*args, **kw_args):

	print(*args, file=sys.stderr, **kw_args)

	print(*args, file=sys.stderr, **kw_args)





def printdate(*args, **kw_args):

        print(datetime.datetime.today(), *args, sep=' ', **kw_args)



def usage():

def usage():

	printerr("Usage is: export-to-postgresql.py <database name> [<columns>] [<calls>] [<callchains>]")

	printerr("Usage is: export-to-postgresql.py <database name> [<columns>] [<calls>] [<callchains>]")

	printerr("where:	columns		'all' or 'branches'")

	printerr("where:	columns		'all' or 'branches'")
@@ -289,7 +292,7 @@ def do_query(q, s): 
		return

		return

	raise Exception("Query failed: " + q.lastError().text())

	raise Exception("Query failed: " + q.lastError().text())





print(datetime.datetime.today(), "Creating database...")

printdate("Creating database...")





db = QSqlDatabase.addDatabase('QPSQL')

db = QSqlDatabase.addDatabase('QPSQL')

query = QSqlQuery(db)

query = QSqlQuery(db)
@@ -582,7 +585,7 @@ if perf_db_export_calls: 
	call_file		= open_output_file("call_table.bin")

	call_file		= open_output_file("call_table.bin")





def trace_begin():

def trace_begin():

	print(datetime.datetime.today(), "Writing to intermediate files...")

	printdate("Writing to intermediate files...")

	# id == 0 means unknown.  It is easier to create records for them than replace the zeroes with NULLs

	# id == 0 means unknown.  It is easier to create records for them than replace the zeroes with NULLs

	evsel_table(0, "unknown")

	evsel_table(0, "unknown")

	machine_table(0, 0, "unknown")

	machine_table(0, 0, "unknown")
@@ -598,7 +601,7 @@ def trace_begin(): 
unhandled_count = 0

unhandled_count = 0





def trace_end():

def trace_end():

	print(datetime.datetime.today(), "Copying to database...")

	printdate("Copying to database...")

	copy_output_file(evsel_file,		"selected_events")

	copy_output_file(evsel_file,		"selected_events")

	copy_output_file(machine_file,		"machines")

	copy_output_file(machine_file,		"machines")

	copy_output_file(thread_file,		"threads")

	copy_output_file(thread_file,		"threads")
@@ -613,7 +616,7 @@ def trace_end(): 
	if perf_db_export_calls:

	if perf_db_export_calls:

		copy_output_file(call_file,		"calls")

		copy_output_file(call_file,		"calls")





	print(datetime.datetime.today(), "Removing intermediate files...")

	printdate("Removing intermediate files...")

	remove_output_file(evsel_file)

	remove_output_file(evsel_file)

	remove_output_file(machine_file)

	remove_output_file(machine_file)

	remove_output_file(thread_file)

	remove_output_file(thread_file)
@@ -628,7 +631,7 @@ def trace_end(): 
	if perf_db_export_calls:

	if perf_db_export_calls:

		remove_output_file(call_file)

		remove_output_file(call_file)

	os.rmdir(output_dir_name)

	os.rmdir(output_dir_name)

	print(datetime.datetime.today(), "Adding primary keys")

	printdate("Adding primary keys")

	do_query(query, 'ALTER TABLE selected_events ADD PRIMARY KEY (id)')

	do_query(query, 'ALTER TABLE selected_events ADD PRIMARY KEY (id)')

	do_query(query, 'ALTER TABLE machines        ADD PRIMARY KEY (id)')

	do_query(query, 'ALTER TABLE machines        ADD PRIMARY KEY (id)')

	do_query(query, 'ALTER TABLE threads         ADD PRIMARY KEY (id)')

	do_query(query, 'ALTER TABLE threads         ADD PRIMARY KEY (id)')
@@ -643,7 +646,7 @@ def trace_end(): 
	if perf_db_export_calls:

	if perf_db_export_calls:

		do_query(query, 'ALTER TABLE calls           ADD PRIMARY KEY (id)')

		do_query(query, 'ALTER TABLE calls           ADD PRIMARY KEY (id)')





	print(datetime.datetime.today(), "Adding foreign keys")

	printdate("Adding foreign keys")

	do_query(query, 'ALTER TABLE threads '

	do_query(query, 'ALTER TABLE threads '

					'ADD CONSTRAINT machinefk  FOREIGN KEY (machine_id)   REFERENCES machines   (id),'

					'ADD CONSTRAINT machinefk  FOREIGN KEY (machine_id)   REFERENCES machines   (id),'

					'ADD CONSTRAINT processfk  FOREIGN KEY (process_id)   REFERENCES threads    (id)')

					'ADD CONSTRAINT processfk  FOREIGN KEY (process_id)   REFERENCES threads    (id)')
@@ -679,8 +682,8 @@ def trace_end(): 
		do_query(query, 'CREATE INDEX pid_idx ON calls (parent_id)')

		do_query(query, 'CREATE INDEX pid_idx ON calls (parent_id)')





	if (unhandled_count):

	if (unhandled_count):

		print(datetime.datetime.today(), "Warning: ", unhandled_count, " unhandled events")

		printdate("Warning: ", unhandled_count, " unhandled events")

	print(datetime.datetime.today(), "Done")

	printdate("Done")





def trace_unhandled(event_name, context, event_fields_dict):

def trace_unhandled(event_name, context, event_fields_dict):

	global unhandled_count

	global unhandled_count

tools/perf/scripts/python/export-to-sqlite.py

+8 −5
Original line number Original line Diff line number Diff line
@@ -65,6 +65,9 @@ perf_db_export_callchains = False 
def printerr(*args, **keyword_args):

def printerr(*args, **keyword_args):

	print(*args, file=sys.stderr, **keyword_args)

	print(*args, file=sys.stderr, **keyword_args)





def printdate(*args, **kw_args):

        print(datetime.datetime.today(), *args, sep=' ', **kw_args)



def usage():

def usage():

	printerr("Usage is: export-to-sqlite.py <database name> [<columns>] [<calls>] [<callchains>]");

	printerr("Usage is: export-to-sqlite.py <database name> [<columns>] [<calls>] [<callchains>]");

	printerr("where:	columns		'all' or 'branches'");

	printerr("where:	columns		'all' or 'branches'");
@@ -105,7 +108,7 @@ def do_query_(q): 
		return

		return

	raise Exception("Query failed: " + q.lastError().text())

	raise Exception("Query failed: " + q.lastError().text())





print(datetime.datetime.today(), "Creating database ...")

printdate("Creating database ...")





db_exists = False

db_exists = False

try:

try:
@@ -383,7 +386,7 @@ if perf_db_export_calls: 
	call_query.prepare("INSERT INTO calls VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")

	call_query.prepare("INSERT INTO calls VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")





def trace_begin():

def trace_begin():

	print(datetime.datetime.today(), "Writing records...")

	printdate("Writing records...")

	do_query(query, 'BEGIN TRANSACTION')

	do_query(query, 'BEGIN TRANSACTION')

	# id == 0 means unknown.  It is easier to create records for them than replace the zeroes with NULLs

	# id == 0 means unknown.  It is easier to create records for them than replace the zeroes with NULLs

	evsel_table(0, "unknown")

	evsel_table(0, "unknown")
@@ -402,14 +405,14 @@ unhandled_count = 0 
def trace_end():

def trace_end():

	do_query(query, 'END TRANSACTION')

	do_query(query, 'END TRANSACTION')





	print(datetime.datetime.today(), "Adding indexes")

	printdate("Adding indexes")

	if perf_db_export_calls:

	if perf_db_export_calls:

		do_query(query, 'CREATE INDEX pcpid_idx ON calls (parent_call_path_id)')

		do_query(query, 'CREATE INDEX pcpid_idx ON calls (parent_call_path_id)')

		do_query(query, 'CREATE INDEX pid_idx ON calls (parent_id)')

		do_query(query, 'CREATE INDEX pid_idx ON calls (parent_id)')





	if (unhandled_count):

	if (unhandled_count):

		print(datetime.datetime.today(), "Warning: ", unhandled_count, " unhandled events")

		printdate("Warning: ", unhandled_count, " unhandled events")

	print(datetime.datetime.today(), "Done")

	printdate("Done")





def trace_unhandled(event_name, context, event_fields_dict):

def trace_unhandled(event_name, context, event_fields_dict):

	global unhandled_count

	global unhandled_count