diff options
| -rw-r--r-- | cmake/Package.cmake | 4 | ||||
| -rw-r--r-- | tools/dlogreader/CMakeLists.txt | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/dlogreader/dlogreader.py | 20 | ||||
| -rw-r--r-- | tools/monit_device/CMakeLists.txt | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/monit_device/monit_device.py | 2 | ||||
| -rw-r--r-- | tools/monit_stream/CMakeLists.txt | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/monit_stream/monit_stream.py | 2 | ||||
| -rw-r--r-- | tools/pagstat/CMakeLists.txt | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/pagstat/pagstat.py | 28 |
9 files changed, 36 insertions, 84 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index b741720..30f6eae 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -28,9 +28,9 @@ set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.i # Must uninstall the debug package before install release package if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd") + set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd-${MACHINE}") else() - set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd-debug") + set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd-debug-${MACHINE}") endif() # setup %config(noreplace) diff --git a/tools/dlogreader/CMakeLists.txt b/tools/dlogreader/CMakeLists.txt index 7a4c8af..63c2f94 100644 --- a/tools/dlogreader/CMakeLists.txt +++ b/tools/dlogreader/CMakeLists.txt @@ -1,14 +1,2 @@ - -set(PI_DIST_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_dist) -set(PI_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_build) -set(PI_SPEC_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_spec) - -add_custom_command(OUTPUT ${PI_DIST_PATH}/dlogreader - COMMAND pyinstaller -F -y --distpath ${PI_DIST_PATH} - --workpath ${PI_BUILD_PATH} - --specpath ${PI_SPEC_PATH} - --noconsole ${CMAKE_CURRENT_SOURCE_DIR}/dlogreader.py - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dlogreader.py) - -add_custom_target(dlogreader ALL DEPENDS ${PI_DIST_PATH}/dlogreader) -install(PROGRAMS ${PI_DIST_PATH}/dlogreader DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program) +configure_file(dlogreader.py dlogreader) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/dlogreader DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program) diff --git a/tools/dlogreader/dlogreader.py b/tools/dlogreader/dlogreader.py index 29b7580..6bf217d 100644..100755 --- a/tools/dlogreader/dlogreader.py +++ b/tools/dlogreader/dlogreader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2 import argparse import json @@ -51,7 +51,7 @@ def app_stat_read(json_fp, item): def app_json_load(appsym): with open(G_APP_JSON_PATH % appsym) as json_fp: - return json.load(json_fp) + return json.load(json_fp) def trans_to_human_readable(value): if value > TBPS: @@ -78,28 +78,28 @@ def dump_physical_devices(json_fp, phydev_user_list): phydev_value_read(json_fp, devsym, 'imissed'), "%7.2f%c" % trans_to_human_readable(phydev_speed_read(json_fp, devsym, 'ipackets')), "%7.2f%c" % trans_to_human_readable(phydev_speed_read(json_fp, devsym, 'ibytes')))) - + print("TX: packets%20lu | bytes:%20lu | dropped: %10lu | fps:%s | bps: %s" % (phydev_value_read(json_fp, devsym, 'opackets'), phydev_value_read(json_fp, devsym, 'obytes'), phydev_value_read(json_fp, devsym, 'usertxdrop'), "%7.2f%c" % trans_to_human_readable(phydev_speed_read(json_fp, devsym, 'opackets')), "%7.2f%c" % trans_to_human_readable(phydev_speed_read(json_fp, devsym, 'obytes')))) - + return - + def dump_app_status(json_fp): print("------------------------------------------------------------------------------------------------------------------------") print(" Worker(Client Process) Statistics ") print("------------------------------------------------------------------------------------------------------------------------") - + nr_thread = len(app_stat_read(json_fp, 'packet_recv_count')) for thread_id in range(nr_thread): print("WORKER %2d | packets %20lu | bytes: %20lu | dropped: %12lu | runtime %7.2f" % \ (thread_id, app_stat_read(json_fp, 'packet_recv_count')[thread_id], app_stat_read(json_fp, 'packet_recv_length')[thread_id], - app_stat_read(json_fp, 'packet_recv_drop')[thread_id] + + app_stat_read(json_fp, 'packet_recv_drop')[thread_id] + app_stat_read(json_fp, 'packet_send_drop')[thread_id], 0)) return @@ -115,7 +115,7 @@ def setup_argv_parser(phydev_list): type=int, default = 1) parser.add_argument('-l', '--loop', help = 'print loop, exit when recv a signal', action='store_true', default = 0) - parser.add_argument('--clear-screen', help = 'clear screen at start of loop', + parser.add_argument('--clear-screen', help = 'clear screen at start of loop', action='store_true', default = 1) parser.add_argument('-a', '--app', help = 'application symbol', type=str, default = 'sapp') return parser.parse_args() @@ -125,7 +125,7 @@ def phydev_json_load(): return json.load(json_fp) def sigint_handler(handler, frame): - sys.exit(0) + sys.exit(0) def main(): signal.signal(signal.SIGINT, sigint_handler) @@ -161,4 +161,4 @@ def main(): return 0 if __name__ == '__main__': - main()
\ No newline at end of file + main() diff --git a/tools/monit_device/CMakeLists.txt b/tools/monit_device/CMakeLists.txt index 2238fc8..56ffdfc 100644 --- a/tools/monit_device/CMakeLists.txt +++ b/tools/monit_device/CMakeLists.txt @@ -1,14 +1,2 @@ - -set(PI_DIST_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_dist) -set(PI_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_build) -set(PI_SPEC_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_spec) - -add_custom_command(OUTPUT ${PI_DIST_PATH}/monit_device - COMMAND pyinstaller -F -y --distpath ${PI_DIST_PATH} - --workpath ${PI_BUILD_PATH} - --specpath ${PI_SPEC_PATH} - --noconsole ${CMAKE_CURRENT_SOURCE_DIR}/monit_device.py - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/monit_device.py) - -add_custom_target(monit_device ALL DEPENDS ${PI_DIST_PATH}/monit_device) -install(PROGRAMS ${PI_DIST_PATH}/monit_device DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program) +configure_file(monit_device.py monit_device) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/monit_device DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program) diff --git a/tools/monit_device/monit_device.py b/tools/monit_device/monit_device.py index 57279d8..0f8d7e6 100644..100755 --- a/tools/monit_device/monit_device.py +++ b/tools/monit_device/monit_device.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2 import prettytable import argparse diff --git a/tools/monit_stream/CMakeLists.txt b/tools/monit_stream/CMakeLists.txt index bcf004c..c68acc1 100644 --- a/tools/monit_stream/CMakeLists.txt +++ b/tools/monit_stream/CMakeLists.txt @@ -1,14 +1,2 @@ - -set(PI_DIST_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_dist) -set(PI_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_build) -set(PI_SPEC_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_spec) - -add_custom_command(OUTPUT ${PI_DIST_PATH}/monit_stream - COMMAND pyinstaller -F -y --distpath ${PI_DIST_PATH} - --workpath ${PI_BUILD_PATH} - --specpath ${PI_SPEC_PATH} - --noconsole ${CMAKE_CURRENT_SOURCE_DIR}/monit_stream.py - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/monit_stream.py) - -add_custom_target(monit_stream ALL DEPENDS ${PI_DIST_PATH}/monit_stream) -install(PROGRAMS ${PI_DIST_PATH}/monit_stream DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program) +configure_file(monit_stream.py monit_stream) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/monit_stream DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program) diff --git a/tools/monit_stream/monit_stream.py b/tools/monit_stream/monit_stream.py index 1d2fe2c..f98e35c 100644..100755 --- a/tools/monit_stream/monit_stream.py +++ b/tools/monit_stream/monit_stream.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2 import argparse import json diff --git a/tools/pagstat/CMakeLists.txt b/tools/pagstat/CMakeLists.txt index 6c184f4..7a96050 100644 --- a/tools/pagstat/CMakeLists.txt +++ b/tools/pagstat/CMakeLists.txt @@ -1,14 +1,2 @@ - -set(PI_DIST_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_dist) -set(PI_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_build) -set(PI_SPEC_PATH ${CMAKE_CURRENT_BINARY_DIR}/pi_spec) - -add_custom_command(OUTPUT ${PI_DIST_PATH}/pagstat - COMMAND pyinstaller -F -y --distpath ${PI_DIST_PATH} - --workpath ${PI_BUILD_PATH} - --specpath ${PI_SPEC_PATH} - --noconsole ${CMAKE_CURRENT_SOURCE_DIR}/pagstat.py - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pagstat.py) - -add_custom_target(pagstat ALL DEPENDS ${PI_DIST_PATH}/pagstat) -install(PROGRAMS ${PI_DIST_PATH}/pagstat DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program) +configure_file(pagstat.py pagstat) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pagstat DESTINATION ${MR_INSTALL_BINDIR_RELATIVE_PATH} COMPONENT Program) diff --git a/tools/pagstat/pagstat.py b/tools/pagstat/pagstat.py index d0f2875..ce8eb89 100644..100755 --- a/tools/pagstat/pagstat.py +++ b/tools/pagstat/pagstat.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2 import argparse import json @@ -60,17 +60,17 @@ def trans_to_human_readable(value): def dump_human_table(json_fp, devsym, is_human_number = 0): - print("%16s %16s %16s %16s %16s %16s %16s %16s %16s %16s %16s" % - ("rx_total_packets", "rx_total_bytes", "rx_packets", "rx_bytes", - "tx_packets","tx_bytes", "port_dropped", "rx_dropped", + print("%16s %16s %16s %16s %16s %16s %16s %16s %16s %16s %16s" % + ("rx_total_packets", "rx_total_bytes", "rx_packets", "rx_bytes", + "tx_packets","tx_bytes", "port_dropped", "rx_dropped", "rx_errors", "ring_tx_packets", "ring_tx_bytes")) - + print("%16u %16u %16u %16u %16u %16u %16u %16u %16u %16u %16u" % ( phydev_value_read(json_fp, devsym, 'ipackets'), phydev_value_read(json_fp, devsym, 'ibytes') / 8, phydev_value_read(json_fp, devsym, 'ipackets'), phydev_value_read(json_fp, devsym, 'ibytes') / 8, phydev_value_read(json_fp, devsym, 'opackets'), phydev_value_read(json_fp, devsym, 'obytes') / 8, phydev_value_read(json_fp, devsym, 'imissed'), 0, 0, 0, 0)) - + # APM sendlog format def dump_apm_sendlog(json_fp, telegraf_client, devsym): @@ -81,7 +81,7 @@ def dump_apm_sendlog(json_fp, telegraf_client, devsym): for item in TITLE_VECTOR: value = phydev_speed_read(json_fp, devsym, TITLE_MAP[item]) __metric_dict_speed[item] = value - + for item in TITLE_VECTOR: value = phydev_value_read(json_fp, devsym, TITLE_MAP[item]) __metric_dict_value[item] = value @@ -103,7 +103,7 @@ def setup_argv_parser(phydev_list): action = 'store_true', default = 0) parser.add_argument('-i', '--interface', help = 'the name of network interface', action = 'append', choices=phydev_list) - parser.add_argument('--clear-screen', help = 'clear screen at start of loop', + parser.add_argument('--clear-screen', help = 'clear screen at start of loop', action='store_true', default = 0) # APM sendlog options @@ -111,7 +111,7 @@ def setup_argv_parser(phydev_list): action='store_true', default = 0) parser.add_argument('--sendlog-apm-cfg', help = 'send log configure file', type=str, default = '/opt/mrzcpd/etc/mrsendlog.conf') - + return parser.parse_args() def phydev_json_load(): @@ -121,7 +121,7 @@ def phydev_json_load(): def sendlog_hostname(test_hostname, test_port): import socket - + hostname = socket.gethostname() s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) try: @@ -148,12 +148,12 @@ def sendlog_apm_init(r_option): hostname, local_ip_addr = sendlog_hostname(url_host, url_port) sendlog_tags = {'host' : hostname, 'local_ip_addr': local_ip_addr} - + if url_proto == 'udp': - telegraf_client = telegraf.TelegrafClient(host = url_host, + telegraf_client = telegraf.TelegrafClient(host = url_host, port = int(url_port), tags = sendlog_tags) elif url_proto == 'http': - telegraf_client = telegraf.HttpClient(host = url_host, + telegraf_client = telegraf.HttpClient(host = url_host, port = int(url_port), tags = sendlog_tags) return telegraf_client @@ -202,4 +202,4 @@ def main(): return 0 if __name__ == '__main__': - main()
\ No newline at end of file + main() |