ROCm SMI Python CLI: Add Json Functionality to showPids
The purpose of this patch is to add Json functionality to showPids
by modifying the print2DArray function to use printSysLog.
Change-Id: Ie834d209b29332777c3f13f776f81c37d94b01b6
Signed-off-by: Ori Messinger <Ori.Messinger@amd.com>
[ROCm/rocm_smi_lib commit: d9da490214]
This commit is contained in:
@@ -377,8 +377,11 @@ def getVersion(deviceList, component):
|
|||||||
|
|
||||||
def print2DArray(dataArray):
|
def print2DArray(dataArray):
|
||||||
""" Print 2D Array with uniform spacing """
|
""" Print 2D Array with uniform spacing """
|
||||||
# TODO: Add --json/--csv support
|
global PRINT_JSON
|
||||||
dataArrayLength = []
|
dataArrayLength = []
|
||||||
|
isPid = False
|
||||||
|
if str(dataArray[0][0]) == 'PID':
|
||||||
|
isPid = True
|
||||||
for position in range(len(dataArray[0])):
|
for position in range(len(dataArray[0])):
|
||||||
dataArrayLength.append(len(dataArray[0][position]))
|
dataArrayLength.append(len(dataArray[0][position]))
|
||||||
for position in range(len(dataArray)):
|
for position in range(len(dataArray)):
|
||||||
@@ -389,7 +392,18 @@ def print2DArray(dataArray):
|
|||||||
printString = ''
|
printString = ''
|
||||||
for cell in range(len(dataArray[0])):
|
for cell in range(len(dataArray[0])):
|
||||||
printString += str(dataArray[position][cell]).ljust(dataArrayLength[cell], ' ') + '\t'
|
printString += str(dataArray[position][cell]).ljust(dataArrayLength[cell], ' ') + '\t'
|
||||||
printLog(None, printString, None)
|
if PRINT_JSON:
|
||||||
|
printString = ' '.join(printString.split()).lower()
|
||||||
|
firstElement = printString.split(' ', 1)[0]
|
||||||
|
printString = printString.split(' ', 1)[1]
|
||||||
|
printString = printString.replace(' ', ', ')
|
||||||
|
if (position > 0):
|
||||||
|
if isPid:
|
||||||
|
printSysLog('PID%s' % (firstElement), printString)
|
||||||
|
else:
|
||||||
|
printSysLog(firstElement, printString)
|
||||||
|
else:
|
||||||
|
printLog(None, printString, None)
|
||||||
|
|
||||||
|
|
||||||
def printEmptyLine():
|
def printEmptyLine():
|
||||||
|
|||||||
Reference in New Issue
Block a user