DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpufreq: add support for macOS

Browse Source 
The frequency on my test laptop seems stuck to a specific frequency.
This commit is contained in:
Pierre Pronchery 2022-05-14 00:01:48 +02:00
parent 8dc628b6c0
commit 18a96b7e61
1 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/applets/cpufreq.c
View File

@ -16,11 +16,15 @@
#include <sys/time.h> #include <sys/time.h>
#include <inttypes.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__APPLE__)
# include <sys/param.h>
# include <sys/sysctl.h>
#elif defined(__FreeBSD__) || defined(__NetBSD__)
# include <sys/param.h> # include <sys/param.h>
# include <sys/sched.h> # include <sys/sched.h>
# include <sys/sysctl.h> # include <sys/sysctl.h>
@ -45,7 +49,7 @@ typedef struct _PanelApplet
int64_t max; int64_t max;
int64_t current; int64_t current;
int64_t step; int64_t step;
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
char const * name; char const * name;
#endif #endif
} Cpufreq; } Cpufreq;
@ -56,7 +60,7 @@ static Cpufreq * _cpufreq_init(PanelAppletHelper * helper, GtkWidget ** widget);
static void _cpufreq_destroy(Cpufreq * cpufreq); static void _cpufreq_destroy(Cpufreq * cpufreq);
/* callbacks */ /* callbacks */
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
static gboolean _cpufreq_on_timeout(gpointer data); static gboolean _cpufreq_on_timeout(gpointer data);
#endif #endif
@ -82,19 +86,38 @@ PanelAppletDefinition applet =
static Cpufreq * _cpufreq_init(PanelAppletHelper * helper, GtkWidget ** widget) static Cpufreq * _cpufreq_init(PanelAppletHelper * helper, GtkWidget ** widget)
{ {
const int timeout = 1000; const int timeout = 1000;
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
Cpufreq * cpufreq; Cpufreq * cpufreq;
PangoFontDescription * desc; PangoFontDescription * desc;
GtkWidget * image; GtkWidget * image;
GtkWidget * label; GtkWidget * label;
char const * p;
#if defined(__APPLE__)
int64_t i;
int64_t imin;
int64_t imax;
size_t isize = sizeof(i);
p = "hw.cpufrequency";
if(sysctlbyname(p, &i, &isize, NULL, 0) != 0
|| sysctlbyname("hw.cpufrequency_min", &imin, &isize,
NULL, 0) != 0
|| sysctlbyname("hw.cpufrequency_max", &imax, &isize,
NULL, 0) != 0)
{
error_set("%s: %s", applet.name, _("No support detected"));
return NULL;
}
#else
char freq[256]; char freq[256];
size_t freqsize = sizeof(freq); size_t freqsize = sizeof(freq);
char const * p;
char const * q; char const * q;
/* detect the correct sysctl */ /* detect the correct sysctl */
if(sysctlbyname("hw.clockrate", &freq, &freqsize, NULL, 0) == 0) if(sysctlbyname("hw.clockrate", &freq, &freqsize, NULL, 0) == 0)
p = "hw.clockrate"; p = "hw.clockrate";
else if(sysctlbyname("hw.cpufrequency", &i, &isize, NULL, 0) == 0)
p = "hw.cpufrequency";
else if(sysctlbyname("machdep.est.frequency.available", &freq, else if(sysctlbyname("machdep.est.frequency.available", &freq,
&freqsize, NULL, 0) == 0) &freqsize, NULL, 0) == 0)
p = "machdep.est.frequency.current"; p = "machdep.est.frequency.current";
@ -112,6 +135,7 @@ static Cpufreq * _cpufreq_init(PanelAppletHelper * helper, GtkWidget ** widget)
error_set("%s: %s", applet.name, _("No support detected")); error_set("%s: %s", applet.name, _("No support detected"));
return NULL; return NULL;
} }
#endif
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__, p); fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__, p);
#endif #endif
@ -132,9 +156,14 @@ static Cpufreq * _cpufreq_init(PanelAppletHelper * helper, GtkWidget ** widget)
image = gtk_image_new_from_icon_name(applet.icon, image = gtk_image_new_from_icon_name(applet.icon,
panel_window_get_icon_size(helper->window)); panel_window_get_icon_size(helper->window));
gtk_box_pack_start(GTK_BOX(cpufreq->hbox), image, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(cpufreq->hbox), image, FALSE, TRUE, 0);
#if defined(__APPLE__)
cpufreq->max = imax / 1000000;
cpufreq->min = imin / 1000000;
#else
cpufreq->max = atoll(freq); cpufreq->max = atoll(freq);
cpufreq->min = (q = strrchr(freq, ' ')) != NULL ? atoll(q) cpufreq->min = (q = strrchr(freq, ' ')) != NULL ? atoll(q)
: cpufreq->max; : cpufreq->max;
#endif
cpufreq->current = -1; cpufreq->current = -1;
cpufreq->step = 1; cpufreq->step = 1;
cpufreq->name = p; cpufreq->name = p;
@ -172,17 +201,28 @@ static void _cpufreq_destroy(Cpufreq * cpufreq)
/* callbacks */ /* callbacks */
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
/* cpufreq_on_timeout */ /* cpufreq_on_timeout */
static gboolean _cpufreq_on_timeout(gpointer data) static gboolean _cpufreq_on_timeout(gpointer data)
{ {
Cpufreq * cpufreq = data; Cpufreq * cpufreq = data;
PanelAppletHelper * helper = cpufreq->helper; PanelAppletHelper * helper = cpufreq->helper;
int freq;
size_t freqsize = sizeof(freq);
char buf[256]; char buf[256];
int64_t freq;
# if defined(__APPLE__)
size_t freqsize = sizeof(freqsize);
if(sysctlbyname(cpufreq->name, &freq, &freqsize, NULL, 0) < 0) if(sysctlbyname(cpufreq->name, &freq, &freqsize, NULL, 0) == 0)
freq /= 1000000;
else
# else
int i;
size_t isize = sizeof(i);
if(sysctlbyname(cpufreq->name, &i, &isize, NULL, 0) == 0)
freq = i;
else
# endif
{ {
error_set("%s: %s: %s", applet.name, cpufreq->name, error_set("%s: %s: %s", applet.name, cpufreq->name,
strerror(errno)); strerror(errno));
@ -191,7 +231,9 @@ static gboolean _cpufreq_on_timeout(gpointer data)
} }
if(freq < 0) if(freq < 0)
{ {
helper->error(NULL, strerror(ERANGE), 1); error_set("%s: %s: %s", applet.name, cpufreq->name,
strerror(ERANGE));
helper->error(NULL, error_get(NULL), 1);
return TRUE; return TRUE;
} }
if(cpufreq->current == freq) if(cpufreq->current == freq)