always display frequency in MHz #20

rgouicem · 2020-08-28T10:24:06Z

Change the displaying of the frequency to be consistent and always use the same unit, ie. MHz.

I think it is disturbing to have the unit change from MHz to GHz, and it makes it hard to read. Additionally, I don't think it is useful to have a precision higher than 1 MHz.

With this commit, the number of characters used is the same as before while keeping a single display unit (MHz).

cgzones · 2020-08-31T10:37:50Z

CPUMeter.c

@@ -65,18 +65,13 @@ static void CPUMeter_updateValues(Meter* this, char* buffer, int size) {
   memset(this->values, 0, sizeof(double) * CPU_METER_ITEMCOUNT);
   double percent = Platform_setCPUValues(this, cpu);
   if (this->pl->settings->showCPUFrequency) {
-      /* Initial frequency is in MHz. Emit it as GHz if it's larger than 1000MHz */
      double cpuFrequency = this->values[CPU_METER_FREQUENCY];
      char unit = 'M';


Please remove the now useless variable unit.

My bad. Done 👍

cgzones · 2020-08-31T11:58:46Z

CPUMeter.c

-            unit = 'G';
-         }
-         xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%.3f%cHz", cpuFrequency, unit);
+         xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%.0fGHz", cpuFrequency);


Isn't the frequency now display in Megahertz ?

My bad. Again...
Should be good this time.
Sorry.

ProcessList.c:242:36: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' #0 0x561cfec000a8 in ProcessList_buildTreeBranch ProcessList.c:242:36 #1 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #2 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#3 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#4 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#5 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#6 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#7 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#8 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#9 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#10 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#11 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#12 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#13 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#14 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#15 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#16 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#17 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#18 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#19 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#20 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#21 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#22 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#23 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#24 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#25 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#26 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#27 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#28 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#29 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#30 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#31 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#32 0x561cfebfb734 in ProcessList_buildTree ProcessList.c:312:10 htop-dev#33 0x561cfebfb050 in ProcessList_updateDisplayList ProcessList.c:326:10 htop-dev#34 0x561cfebfc58b in ProcessList_rebuildPanel ProcessList.c:374:4 htop-dev#35 0x561cfec07953 in checkRecalculation ScreenManager.c:139:7 htop-dev#36 0x561cfec07953 in ScreenManager_run ScreenManager.c:226:10 htop-dev#37 0x561cfeb8899a in CommandLine_run CommandLine.c:378:4 htop-dev#38 0x561cfeb6d6d4 in main htop.c:15:11 htop-dev#39 0x7f14860291e9 in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16 htop-dev#40 0x7f148602929b in __libc_start_main csu/../csu/libc-start.c:392:3 htop-dev#41 0x561cfeaafb20 in _start (htop+0x105b20) (BuildId: fc4b9e52ffc111ca8b4cd53136a238414120a858)

Also increase the limit for nesting by using 64 bit integers. ProcessList.c:242:36: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' #0 0x561cfec000a8 in ProcessList_buildTreeBranch ProcessList.c:242:36 #1 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #2 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#3 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#4 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#5 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#6 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#7 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#8 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#9 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#10 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#11 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#12 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#13 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#14 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#15 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#16 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#17 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#18 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#19 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#20 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#21 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#22 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#23 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#24 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#25 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#26 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#27 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#28 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#29 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#30 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#31 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 htop-dev#32 0x561cfebfb734 in ProcessList_buildTree ProcessList.c:312:10 htop-dev#33 0x561cfebfb050 in ProcessList_updateDisplayList ProcessList.c:326:10 htop-dev#34 0x561cfebfc58b in ProcessList_rebuildPanel ProcessList.c:374:4 htop-dev#35 0x561cfec07953 in checkRecalculation ScreenManager.c:139:7 htop-dev#36 0x561cfec07953 in ScreenManager_run ScreenManager.c:226:10 htop-dev#37 0x561cfeb8899a in CommandLine_run CommandLine.c:378:4 htop-dev#38 0x561cfeb6d6d4 in main htop.c:15:11 htop-dev#39 0x7f14860291e9 in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16 htop-dev#40 0x7f148602929b in __libc_start_main csu/../csu/libc-start.c:392:3 htop-dev#41 0x561cfeaafb20 in _start (htop+0x105b20) (BuildId: fc4b9e52ffc111ca8b4cd53136a238414120a858)

Also increase the limit for nesting by using 64 bit integers. ProcessList.c:242:36: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' #0 0x561cfec000a8 in ProcessList_buildTreeBranch ProcessList.c:242:36 #1 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #2 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #3 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #4 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #5 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #6 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #7 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #8 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #9 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #10 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #11 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #12 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #13 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #14 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #15 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #16 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #17 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #18 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #19 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #20 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #21 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #22 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #23 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #24 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #25 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #26 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #27 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #28 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #29 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #30 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #31 0x561cfebffec2 in ProcessList_buildTreeBranch ProcessList.c:243:7 #32 0x561cfebfb734 in ProcessList_buildTree ProcessList.c:312:10 #33 0x561cfebfb050 in ProcessList_updateDisplayList ProcessList.c:326:10 #34 0x561cfebfc58b in ProcessList_rebuildPanel ProcessList.c:374:4 #35 0x561cfec07953 in checkRecalculation ScreenManager.c:139:7 #36 0x561cfec07953 in ScreenManager_run ScreenManager.c:226:10 #37 0x561cfeb8899a in CommandLine_run CommandLine.c:378:4 #38 0x561cfeb6d6d4 in main htop.c:15:11 #39 0x7f14860291e9 in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16 #40 0x7f148602929b in __libc_start_main csu/../csu/libc-start.c:392:3 #41 0x561cfeaafb20 in _start (htop+0x105b20) (BuildId: fc4b9e52ffc111ca8b4cd53136a238414120a858)

always display frequency in MHz

3ef5df2

cgzones requested changes Aug 31, 2020

View reviewed changes

rgouicem added 2 commits August 31, 2020 13:29

remove unused variable

293e3a2

fixed compilation error

0f5d2cd

cgzones reviewed Aug 31, 2020

View reviewed changes

fix unit (GHz -> MHz)

d0e8ff9

cgzones approved these changes Sep 8, 2020

View reviewed changes

natoscott merged commit 4d6e4ef into htop-dev:master Sep 9, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

always display frequency in MHz #20

always display frequency in MHz #20

rgouicem commented Aug 28, 2020

cgzones Aug 31, 2020

rgouicem Aug 31, 2020

cgzones Aug 31, 2020

rgouicem Aug 31, 2020

always display frequency in MHz #20

always display frequency in MHz #20

Conversation

rgouicem commented Aug 28, 2020

cgzones Aug 31, 2020

Choose a reason for hiding this comment

rgouicem Aug 31, 2020

Choose a reason for hiding this comment

cgzones Aug 31, 2020

Choose a reason for hiding this comment

rgouicem Aug 31, 2020

Choose a reason for hiding this comment