From: Siraaj Khandkar Date: Sun, 3 Feb 2019 23:41:20 +0000 (-0500) Subject: Improve overview and experiment naming X-Git-Url: https://git.xandkar.net/?a=commitdiff_plain;h=499c58a269a00e031302938b5a8f006f23aae451;p=khatus.git Improve overview and experiment naming --- diff --git a/README.md b/README.md index d74a10b..fcc7dbb 100644 --- a/README.md +++ b/README.md @@ -7,16 +7,13 @@ Experimental system-monitor and status (bar) reporter I use with ![screenshot](screenshot.jpg) -The approaches experimented-with so far, numbered in chronological order of -origin (i.e. later versions do not _necessarily_ obsolete earlier ones, they're -just different): +Experiments +----------- +The approaches experimented-with so far (later versions do not _necessarily_ +obsolete earlier ones, they're just different): -### v1 -A single, synchronous script, saving state in text files (Bash and AWK). - -### v2 -Parallel processes: collectors, cacher and reporters; passing messages over pipes -(Bash and AWK). - -### v3 -Clean-up, polish and further development of main ideas learned in v2. +| Name | Status | Language | Tested-on | Description | +|--------|--------|-----------|-------------------------|-------------| +| __x1__ | Works | Bash, AWK | Ubuntu 16.04 | Single, synchronous script, saving state in text files | +| __x2__ | Works | Bash, AWK | Ubuntu 16.04, Debian 10 | Parallel processes: collectors, cache and reporters; passing messages over pipes | +| __x3__ | In dev | OCaml | Debian 10 | Re-write and refinement of __x2__ | diff --git a/v1/README.md b/x1/README.md similarity index 100% rename from v1/README.md rename to x1/README.md diff --git a/v1/bin/khatus_cpu_usage_from_proc_since_last_check b/x1/bin/khatus_cpu_usage_from_proc_since_last_check similarity index 100% rename from v1/bin/khatus_cpu_usage_from_proc_since_last_check rename to x1/bin/khatus_cpu_usage_from_proc_since_last_check diff --git a/v1/bin/khatus_show b/x1/bin/khatus_show similarity index 100% rename from v1/bin/khatus_show rename to x1/bin/khatus_show diff --git a/v1/bin/khatus_update_network b/x1/bin/khatus_update_network similarity index 100% rename from v1/bin/khatus_update_network rename to x1/bin/khatus_update_network diff --git a/v1/bin/khatus_update_weather b/x1/bin/khatus_update_weather similarity index 100% rename from v1/bin/khatus_update_weather rename to x1/bin/khatus_update_weather diff --git a/v1/install b/x1/install similarity index 100% rename from v1/install rename to x1/install diff --git a/v2/.gitignore b/x2/.gitignore similarity index 100% rename from v2/.gitignore rename to x2/.gitignore diff --git a/v2/Makefile b/x2/Makefile similarity index 100% rename from v2/Makefile rename to x2/Makefile diff --git a/v2/README.md b/x2/README.md similarity index 100% rename from v2/README.md rename to x2/README.md diff --git a/v2/sanity_check b/x2/sanity_check similarity index 100% rename from v2/sanity_check rename to x2/sanity_check diff --git a/v2/screenshot-self-error-propagation.jpg b/x2/screenshot-self-error-propagation.jpg similarity index 100% rename from v2/screenshot-self-error-propagation.jpg rename to x2/screenshot-self-error-propagation.jpg diff --git a/v2/src/awk/exe/actuate_alert_to_notify_send.awk b/x2/src/awk/exe/actuate_alert_to_notify_send.awk similarity index 100% rename from v2/src/awk/exe/actuate_alert_to_notify_send.awk rename to x2/src/awk/exe/actuate_alert_to_notify_send.awk diff --git a/v2/src/awk/exe/actuate_device_add_to_automount.awk b/x2/src/awk/exe/actuate_device_add_to_automount.awk similarity index 100% rename from v2/src/awk/exe/actuate_device_add_to_automount.awk rename to x2/src/awk/exe/actuate_device_add_to_automount.awk diff --git a/v2/src/awk/exe/actuate_status_bar_to_xsetroot_name.awk b/x2/src/awk/exe/actuate_status_bar_to_xsetroot_name.awk similarity index 100% rename from v2/src/awk/exe/actuate_status_bar_to_xsetroot_name.awk rename to x2/src/awk/exe/actuate_status_bar_to_xsetroot_name.awk diff --git a/v2/src/awk/exe/bar.awk b/x2/src/awk/exe/bar.awk similarity index 100% rename from v2/src/awk/exe/bar.awk rename to x2/src/awk/exe/bar.awk diff --git a/v2/src/awk/exe/gen_bar_make_status.awk b/x2/src/awk/exe/gen_bar_make_status.awk similarity index 100% rename from v2/src/awk/exe/gen_bar_make_status.awk rename to x2/src/awk/exe/gen_bar_make_status.awk diff --git a/v2/src/awk/exe/monitor_devices.awk b/x2/src/awk/exe/monitor_devices.awk similarity index 100% rename from v2/src/awk/exe/monitor_devices.awk rename to x2/src/awk/exe/monitor_devices.awk diff --git a/v2/src/awk/exe/monitor_energy.awk b/x2/src/awk/exe/monitor_energy.awk similarity index 100% rename from v2/src/awk/exe/monitor_energy.awk rename to x2/src/awk/exe/monitor_energy.awk diff --git a/v2/src/awk/exe/monitor_errors.awk b/x2/src/awk/exe/monitor_errors.awk similarity index 100% rename from v2/src/awk/exe/monitor_errors.awk rename to x2/src/awk/exe/monitor_errors.awk diff --git a/v2/src/awk/exe/parse_bluetoothctl_show.awk b/x2/src/awk/exe/parse_bluetoothctl_show.awk similarity index 100% rename from v2/src/awk/exe/parse_bluetoothctl_show.awk rename to x2/src/awk/exe/parse_bluetoothctl_show.awk diff --git a/v2/src/awk/exe/parse_df_pcent.awk b/x2/src/awk/exe/parse_df_pcent.awk similarity index 100% rename from v2/src/awk/exe/parse_df_pcent.awk rename to x2/src/awk/exe/parse_df_pcent.awk diff --git a/v2/src/awk/exe/parse_fan_file.awk b/x2/src/awk/exe/parse_fan_file.awk similarity index 100% rename from v2/src/awk/exe/parse_fan_file.awk rename to x2/src/awk/exe/parse_fan_file.awk diff --git a/v2/src/awk/exe/parse_free.awk b/x2/src/awk/exe/parse_free.awk similarity index 100% rename from v2/src/awk/exe/parse_free.awk rename to x2/src/awk/exe/parse_free.awk diff --git a/v2/src/awk/exe/parse_ip_addr.awk b/x2/src/awk/exe/parse_ip_addr.awk similarity index 100% rename from v2/src/awk/exe/parse_ip_addr.awk rename to x2/src/awk/exe/parse_ip_addr.awk diff --git a/v2/src/awk/exe/parse_iwconfig.awk b/x2/src/awk/exe/parse_iwconfig.awk similarity index 100% rename from v2/src/awk/exe/parse_iwconfig.awk rename to x2/src/awk/exe/parse_iwconfig.awk diff --git a/v2/src/awk/exe/parse_loadavg_file.awk b/x2/src/awk/exe/parse_loadavg_file.awk similarity index 100% rename from v2/src/awk/exe/parse_loadavg_file.awk rename to x2/src/awk/exe/parse_loadavg_file.awk diff --git a/v2/src/awk/exe/parse_metar_d_output.awk b/x2/src/awk/exe/parse_metar_d_output.awk similarity index 100% rename from v2/src/awk/exe/parse_metar_d_output.awk rename to x2/src/awk/exe/parse_metar_d_output.awk diff --git a/v2/src/awk/exe/parse_mpd_status_currentsong.awk b/x2/src/awk/exe/parse_mpd_status_currentsong.awk similarity index 100% rename from v2/src/awk/exe/parse_mpd_status_currentsong.awk rename to x2/src/awk/exe/parse_mpd_status_currentsong.awk diff --git a/v2/src/awk/exe/parse_pactl_list_sinks.awk b/x2/src/awk/exe/parse_pactl_list_sinks.awk similarity index 100% rename from v2/src/awk/exe/parse_pactl_list_sinks.awk rename to x2/src/awk/exe/parse_pactl_list_sinks.awk diff --git a/v2/src/awk/exe/parse_ps.awk b/x2/src/awk/exe/parse_ps.awk similarity index 100% rename from v2/src/awk/exe/parse_ps.awk rename to x2/src/awk/exe/parse_ps.awk diff --git a/v2/src/awk/exe/parse_sys_block_stat.awk b/x2/src/awk/exe/parse_sys_block_stat.awk similarity index 100% rename from v2/src/awk/exe/parse_sys_block_stat.awk rename to x2/src/awk/exe/parse_sys_block_stat.awk diff --git a/v2/src/awk/exe/parse_udevadm_monitor_block.awk b/x2/src/awk/exe/parse_udevadm_monitor_block.awk similarity index 100% rename from v2/src/awk/exe/parse_udevadm_monitor_block.awk rename to x2/src/awk/exe/parse_udevadm_monitor_block.awk diff --git a/v2/src/awk/exe/parse_upower.awk b/x2/src/awk/exe/parse_upower.awk similarity index 100% rename from v2/src/awk/exe/parse_upower.awk rename to x2/src/awk/exe/parse_upower.awk diff --git a/v2/src/awk/lib/cache.awk b/x2/src/awk/lib/cache.awk similarity index 100% rename from v2/src/awk/lib/cache.awk rename to x2/src/awk/lib/cache.awk diff --git a/v2/src/awk/lib/msg.awk b/x2/src/awk/lib/msg.awk similarity index 100% rename from v2/src/awk/lib/msg.awk rename to x2/src/awk/lib/msg.awk diff --git a/v2/src/awk/lib/num.awk b/x2/src/awk/lib/num.awk similarity index 100% rename from v2/src/awk/lib/num.awk rename to x2/src/awk/lib/num.awk diff --git a/v2/src/awk/lib/str.awk b/x2/src/awk/lib/str.awk similarity index 100% rename from v2/src/awk/lib/str.awk rename to x2/src/awk/lib/str.awk diff --git a/v2/src/bash/exe/khatus.sh b/x2/src/bash/exe/khatus.sh similarity index 100% rename from v2/src/bash/exe/khatus.sh rename to x2/src/bash/exe/khatus.sh diff --git a/v2/src/bash/exe/khatus_sensor_bluetooth_power.sh b/x2/src/bash/exe/khatus_sensor_bluetooth_power.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_bluetooth_power.sh rename to x2/src/bash/exe/khatus_sensor_bluetooth_power.sh diff --git a/v2/src/bash/exe/khatus_sensor_datetime.sh b/x2/src/bash/exe/khatus_sensor_datetime.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_datetime.sh rename to x2/src/bash/exe/khatus_sensor_datetime.sh diff --git a/v2/src/bash/exe/khatus_sensor_devices.sh b/x2/src/bash/exe/khatus_sensor_devices.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_devices.sh rename to x2/src/bash/exe/khatus_sensor_devices.sh diff --git a/v2/src/bash/exe/khatus_sensor_disk_io.sh b/x2/src/bash/exe/khatus_sensor_disk_io.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_disk_io.sh rename to x2/src/bash/exe/khatus_sensor_disk_io.sh diff --git a/v2/src/bash/exe/khatus_sensor_disk_space.sh b/x2/src/bash/exe/khatus_sensor_disk_space.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_disk_space.sh rename to x2/src/bash/exe/khatus_sensor_disk_space.sh diff --git a/v2/src/bash/exe/khatus_sensor_energy.sh b/x2/src/bash/exe/khatus_sensor_energy.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_energy.sh rename to x2/src/bash/exe/khatus_sensor_energy.sh diff --git a/v2/src/bash/exe/khatus_sensor_fan.sh b/x2/src/bash/exe/khatus_sensor_fan.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_fan.sh rename to x2/src/bash/exe/khatus_sensor_fan.sh diff --git a/v2/src/bash/exe/khatus_sensor_loadavg.sh b/x2/src/bash/exe/khatus_sensor_loadavg.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_loadavg.sh rename to x2/src/bash/exe/khatus_sensor_loadavg.sh diff --git a/v2/src/bash/exe/khatus_sensor_memory.sh b/x2/src/bash/exe/khatus_sensor_memory.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_memory.sh rename to x2/src/bash/exe/khatus_sensor_memory.sh diff --git a/v2/src/bash/exe/khatus_sensor_mpd.sh b/x2/src/bash/exe/khatus_sensor_mpd.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_mpd.sh rename to x2/src/bash/exe/khatus_sensor_mpd.sh diff --git a/v2/src/bash/exe/khatus_sensor_net_addr_io.sh b/x2/src/bash/exe/khatus_sensor_net_addr_io.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_net_addr_io.sh rename to x2/src/bash/exe/khatus_sensor_net_addr_io.sh diff --git a/v2/src/bash/exe/khatus_sensor_net_wifi_status.sh b/x2/src/bash/exe/khatus_sensor_net_wifi_status.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_net_wifi_status.sh rename to x2/src/bash/exe/khatus_sensor_net_wifi_status.sh diff --git a/v2/src/bash/exe/khatus_sensor_procs.sh b/x2/src/bash/exe/khatus_sensor_procs.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_procs.sh rename to x2/src/bash/exe/khatus_sensor_procs.sh diff --git a/v2/src/bash/exe/khatus_sensor_screen_brightness.sh b/x2/src/bash/exe/khatus_sensor_screen_brightness.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_screen_brightness.sh rename to x2/src/bash/exe/khatus_sensor_screen_brightness.sh diff --git a/v2/src/bash/exe/khatus_sensor_temperature.sh b/x2/src/bash/exe/khatus_sensor_temperature.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_temperature.sh rename to x2/src/bash/exe/khatus_sensor_temperature.sh diff --git a/v2/src/bash/exe/khatus_sensor_volume.sh b/x2/src/bash/exe/khatus_sensor_volume.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_volume.sh rename to x2/src/bash/exe/khatus_sensor_volume.sh diff --git a/v2/src/bash/exe/khatus_sensor_weather.sh b/x2/src/bash/exe/khatus_sensor_weather.sh similarity index 100% rename from v2/src/bash/exe/khatus_sensor_weather.sh rename to x2/src/bash/exe/khatus_sensor_weather.sh diff --git a/v3/.gitignore b/x3/.gitignore similarity index 100% rename from v3/.gitignore rename to x3/.gitignore diff --git a/v3/Makefile b/x3/Makefile similarity index 100% rename from v3/Makefile rename to x3/Makefile diff --git a/v3/README.md b/x3/README.md similarity index 100% rename from v3/README.md rename to x3/README.md diff --git a/v3/src/exe/khatus_cache_dumper.ml b/x3/src/exe/khatus_cache_dumper.ml similarity index 100% rename from v3/src/exe/khatus_cache_dumper.ml rename to x3/src/exe/khatus_cache_dumper.ml diff --git a/v3/src/exe/khatus_cache_dumper.mli b/x3/src/exe/khatus_cache_dumper.mli similarity index 100% rename from v3/src/exe/khatus_cache_dumper.mli rename to x3/src/exe/khatus_cache_dumper.mli diff --git a/v3/src/lib/khatus.ml b/x3/src/lib/khatus.ml similarity index 100% rename from v3/src/lib/khatus.ml rename to x3/src/lib/khatus.ml diff --git a/v3/src/lib/khatus_cache.ml b/x3/src/lib/khatus_cache.ml similarity index 100% rename from v3/src/lib/khatus_cache.ml rename to x3/src/lib/khatus_cache.ml diff --git a/v3/src/lib/khatus_cache.mli b/x3/src/lib/khatus_cache.mli similarity index 100% rename from v3/src/lib/khatus_cache.mli rename to x3/src/lib/khatus_cache.mli diff --git a/v3/src/lib/khatus_msg.ml b/x3/src/lib/khatus_msg.ml similarity index 100% rename from v3/src/lib/khatus_msg.ml rename to x3/src/lib/khatus_msg.ml diff --git a/v3/src/lib/khatus_msg.mli b/x3/src/lib/khatus_msg.mli similarity index 100% rename from v3/src/lib/khatus_msg.mli rename to x3/src/lib/khatus_msg.mli diff --git a/v3/src/lib/khatus_msg_parser.mli b/x3/src/lib/khatus_msg_parser.mli similarity index 100% rename from v3/src/lib/khatus_msg_parser.mli rename to x3/src/lib/khatus_msg_parser.mli diff --git a/v3/src/lib/khatus_msg_parser.mll b/x3/src/lib/khatus_msg_parser.mll similarity index 100% rename from v3/src/lib/khatus_msg_parser.mll rename to x3/src/lib/khatus_msg_parser.mll diff --git a/v3/src/lib/khatus_msg_stream.ml b/x3/src/lib/khatus_msg_stream.ml similarity index 100% rename from v3/src/lib/khatus_msg_stream.ml rename to x3/src/lib/khatus_msg_stream.ml diff --git a/v3/src/lib/khatus_msg_stream.mli b/x3/src/lib/khatus_msg_stream.mli similarity index 100% rename from v3/src/lib/khatus_msg_stream.mli rename to x3/src/lib/khatus_msg_stream.mli diff --git a/v3/src/lib/khatus_state.ml b/x3/src/lib/khatus_state.ml similarity index 100% rename from v3/src/lib/khatus_state.ml rename to x3/src/lib/khatus_state.ml diff --git a/v3/src/lib/khatus_state.mli b/x3/src/lib/khatus_state.mli similarity index 100% rename from v3/src/lib/khatus_state.mli rename to x3/src/lib/khatus_state.mli diff --git a/v3/src/lib/khatus_time.ml b/x3/src/lib/khatus_time.ml similarity index 100% rename from v3/src/lib/khatus_time.ml rename to x3/src/lib/khatus_time.ml diff --git a/v3/src/lib/khatus_time.mli b/x3/src/lib/khatus_time.mli similarity index 100% rename from v3/src/lib/khatus_time.mli rename to x3/src/lib/khatus_time.mli