[Cpufreqd-devel] sources2/src Makefile.am,1.1.1.1,1.2 config_parser.c,1.4,1.5 cpufreq_utils.c,1.2,1.
Brought to you by:
mattia-san
Menu
▾
▴
[Cpufreqd-devel] sources2/src Makefile.am,1.1.1.1,1.2 config_parser.c,1.4,1.5 cpufreq_utils.c,1.2,1.3 cpufreq_utils.h,1.2,1.3 cpufreqd.conf,1.1.1.1,1.2 cpufreqd.h,1.1.1.1,1.2 cpufreqd_acpi_ac.c,1.2,1.3 cpufreqd_acpi_battery.c,1.2,1.3 cpufreqd_acpi_temperature.c,1.1.1.1,1.2 cpufreqd_apm.c,1.1.1.1,1.2 cpufreqd_cpu.c,1.1.1.1,1.2 cpufreqd_log.c,1.1.1.1,1.2 cpufreqd_log.h,1.1.1.1,1.2 cpufreqd_plugin.h,1.1.1.1,1.2 cpufreqd_programs.c,1.2,1.3 daemon_utils.c,1.1.1.1,1.2 daemon_utils.h,1.1.1.1,1.2 list.c,1.1.1.1,1.2 list.h,1.1.1.1,1.2 main.c,1.4,1.5 main.h,1.1.1.1,1.2 plugin_utils.c,1.1.1.1,1.2 plugin_utils.h,1.1.1.1,1.2
Update of /cvsroot/cpufreqd/sources2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4020/src Modified Files: Makefile.am config_parser.c cpufreq_utils.c cpufreq_utils.h cpufreqd.conf cpufreqd.h cpufreqd_acpi_ac.c cpufreqd_acpi_battery.c cpufreqd_acpi_temperature.c cpufreqd_apm.c cpufreqd_cpu.c cpufreqd_log.c cpufreqd_log.h cpufreqd_plugin.h cpufreqd_programs.c daemon_utils.c daemon_utils.h list.c list.h main.c main.h plugin_utils.c plugin_utils.h Log Message: - added Copyright statements in every file - implemented a preliminary apm support (needs testing) - fixed 2 mem leaks in acpi_ac plugin init Index: cpufreqd_apm.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_apm.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cpufreqd_apm.c 19 Dec 2004 20:06:09 -0000 1.1.1.1 --- cpufreqd_apm.c 11 May 2005 21:33:35 -0000 1.2 *************** *** 0 **** --- 1,220 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + #include <stdlib.h> + #include <stdio.h> + #include <dirent.h> + #include <string.h> + #include <errno.h> + #include "cpufreqd_plugin.h" + #include "cpufreqd.h" + + #define APM_FILE "/proc/apm" + + struct battery_interval { + int min, max; + }; + + static int battery_present; + static int battery_percent; + static int ac_state; + + static int apm_init(void); + static int apm_exit(void); + static int apm_update(void); + static int apm_ac_parse(const char *ev, void **obj); + static int apm_ac_evaluate(const void *s); + static int apm_bat_parse(const char *ev, void **obj); + static int apm_bat_evaluate(const void *s); + + static struct cpufreqd_keyword kw[] = { + { .word = "ac", .parse = &apm_ac_parse, .evaluate = &apm_ac_evaluate }, + { .word = "battery", .parse = &apm_bat_parse, .evaluate = &apm_bat_evaluate }, + { .word = NULL, .parse = NULL, .evaluate = NULL } + }; + + static struct cpufreqd_plugin apm = { + .plugin_name = "apm_plugin", /* plugin_name */ + .keywords = kw, /* config_keywords */ + .poll_interval = 1000, /* poll_interval (1 second) */ + .plugin_init = &apm_init, /* plugin_init */ + .plugin_exit = &apm_exit, /* plugin_exit */ + .plugin_update = &apm_update, /* plugin_update */ + .cfdprint = NULL + }; + + /* static int apm_init(void) + * + * test if apm file id present + */ + static int apm_init(void) { + struct stat sb; + int rc; + + rc = stat(APM_PROC_FILE, &sb); + if (rc < 0) { + apm.cfdprint(LOG_ERR, "apm_init(): %s: %s\n", APM_PROC_FILE, strerror(errno)); + return -1; + } + return 0; + } + + static int apm_exit(void) { + return 0; + } + + /* static int apm_ac_update(void) + * + * reads temperature valuse ant compute a medium value + */ + static int apm_update(void) { + FILE *fp; + char buf[101]; + + /***** APM SCAN *****/ + char ignore3[101]; + int ignore; + unsigned int ignore2; + unsigned int batt_flag; + + apm.cfdprint(LOG_DEBUG, "%s - update() called\n", apm.plugin_name); + + fp = fopen(APM_PROC_FILE , "r"); + if (!fp) { + cp_log(LOG_ERR, "scan_system_info(): %s: %s\n", APM_PROC_FILE, strerror(errno)); + return -1; + } + + if (!fgets(buf, 100, fp)) { + fclose(fp); + cp_log(LOG_ERR, "scan_system_info(): %s: %s\n", APM_PROC_FILE, strerror(errno)); + return -1; + } + + sscanf(buf, "%s %d.%d %x %x %x %x %d%% %d %s\n", + ignore3, &ignore, &ignore, &ignore, ac_state, &ignore2, + &batt_flag, battery_percent, &ignore, ignore3); + + if (battery_percent > 100) { + battery_percent = -1; + } + + battery_present = batt_flag < 128; + + fclose(fp); + + cp_log(LOG_INFO, "scan_system_info(): battery %s - %d - ac: %s\n", + battery_present?"present":"absent", + battery_percent, + ac_state?"on-line":"off-line"); + return 0; + } + + /* + * parse the 'ac' keywork + */ + static int apm_ac_parse(const char *ev, void **obj) { + int *ret = malloc(sizeof(int)); + if (ret == NULL) { + apm.cfdprint(LOG_ERR, + "%s - apm_ac_parse() couldn't make enough room for ac_status (%s)\n", + strerror(errno)); + return -1; + } + + *ret = 0; + + apm.cfdprint(LOG_DEBUG, "%s - apm_ac_parse() called with: %s\n", + apm.plugin_name, ev); + + if (strncmp(ev, "on", 2) == 0) { + *ret = PLUGGED; + } else if (strncmp(ev, "off", 3) == 0) { + *ret = UNPLUGGED; + } else { + apm.cfdprint(LOG_ERR, "%s - apm_parse() couldn't parse %s\n", ev); + free(ret); + return -1; + } + + apm.cfdprint(LOG_INFO, "%s - apm_ac_parse() parsed: %s\n", + apm.plugin_name, *ret==PLUGGED ? "on" : "off"); + + *obj = ret; + return 0; + } + + /* + * evaluate the 'ac' keywork + */ + static int apm_ac_evaluate(const void *s) { + const int *ac = (const int *)s; + + apm.cfdprint(LOG_DEBUG, "%s - evaluate() called: %s [%s]\n", + apm.plugin_name, *ac==PLUGGED ? "on" : "off", ac_state==PLUGGED ? "on" : "off"); + + return (*ac == ac_state) ? MATCH : DONT_MATCH; + } + + /* + * parse the 'battery' keywork + */ + static int apm_bat_parse(const char *ev, void **obj) { + struct battery_interval *ret = malloc(sizeof(struct battery_interval)); + if (ret == NULL) { + apm.cfdprint(LOG_ERR, + "%s - apm_bat_parse() couldn't make enough room for battery_interval (%s)\n", + strerror(errno)); + return -1; + } + + ret->min = ret->max = 0; + + apm.cfdprint(LOG_DEBUG, "%s - apm_bat_parse() called with: %s\n", + apm.plugin_name, ev); + + if (sscanf(ev, "%d-%d", &(ret->min), &(ret->max)) != 2) { + apm.cfdprint(LOG_ERR, "%s - apm_bat_parse() wrong parameter: %s\n", + apm.plugin_name, ev); + free(ret); + return -1; + } + + apm.cfdprint(LOG_INFO, "%s - apm_bat_parse() parsed: %d-%d\n", + apm.plugin_name, ret->min, ret->max); + + *obj = ret; + return 0; + } + + /* + * evaluate the 'battery' keywork + */ + static int apm_bat_evaluate(const void *s) { + const struct battery_interval *bi = (const struct battery_interval *)s; + + apm.cfdprint(LOG_DEBUG, "%s - apm_bat_evaluate() called: %d-%d [%d]\n", + apm.plugin_name, bi->min, bi->max, battery_level); + + return (battery_level>=bi->min && battery_level<=bi->max) ? MATCH : DONT_MATCH; + } + + struct cpufreqd_plugin *create_plugin (void) { + return &apm; + } Index: cpufreq_utils.h =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreq_utils.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cpufreq_utils.h 3 May 2005 20:40:49 -0000 1.2 --- cpufreq_utils.h 11 May 2005 21:33:05 -0000 1.3 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <cpufreq.h> #include "config_parser.h" *************** *** 4,8 **** #define CPUINFO_PROC "/proc/cpuinfo" ! int cpufreqd_set_profile (struct profile *p); unsigned long normalize_frequency (struct cpufreq_limits *limits, struct cpufreq_available_frequencies *freqs, --- 23,27 ---- #define CPUINFO_PROC "/proc/cpuinfo" ! void cpufreqd_set_profile (struct profile *p); unsigned long normalize_frequency (struct cpufreq_limits *limits, struct cpufreq_available_frequencies *freqs, Index: cpufreq_utils.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreq_utils.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cpufreq_utils.c 3 May 2005 20:40:49 -0000 1.2 --- cpufreq_utils.c 11 May 2005 21:33:05 -0000 1.3 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <stdlib.h> #include <stdio.h> *************** *** 10,18 **** /* sets the input policy */ ! int cpufreqd_set_profile (struct profile *p) { unsigned int i; /* int cpufreq_set_policy(unsigned int cpu, struct cpufreq_policy *policy) */ for (i=0; i<configuration.cpu_num; i++) { - /* TODO: check return value */ if (cpufreq_set_policy(i, &(p->policy))) cpufreqd_log(LOG_INFO, "Profile \"%s\" set for cpu%d\n", p->name, i); --- 29,36 ---- /* sets the input policy */ ! void cpufreqd_set_profile (struct profile *p) { unsigned int i; /* int cpufreq_set_policy(unsigned int cpu, struct cpufreq_policy *policy) */ for (i=0; i<configuration.cpu_num; i++) { if (cpufreq_set_policy(i, &(p->policy))) cpufreqd_log(LOG_INFO, "Profile \"%s\" set for cpu%d\n", p->name, i); *************** *** 20,25 **** cpufreqd_log(LOG_WARNING, "Couldn't set profile \"%s\" set for cpu%d\n", p->name, i); } - - return 0; } --- 38,41 ---- Index: cpufreqd_acpi_ac.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_acpi_ac.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cpufreqd_acpi_ac.c 25 Apr 2005 17:02:27 -0000 1.2 --- cpufreqd_acpi_ac.c 11 May 2005 21:33:05 -0000 1.3 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <stdlib.h> #include <stdio.h> *************** *** 21,27 **** static int acpi_ac_init(void); static int acpi_ac_exit(void); static int acpi_ac_parse(const char *ev, void **obj); static int acpi_ac_evaluate(const void *s); - static int acpi_ac_update(void); static struct cpufreqd_keyword kw[] = { --- 40,46 ---- static int acpi_ac_init(void); static int acpi_ac_exit(void); + static int acpi_ac_update(void); static int acpi_ac_parse(const char *ev, void **obj); static int acpi_ac_evaluate(const void *s); static struct cpufreqd_keyword kw[] = { *************** *** 84,87 **** --- 103,139 ---- } + /* static int acpi_ac_update(void) + * + * reads temperature valuse ant compute a medium value + */ + static int acpi_ac_update(void) { + char temp[50]; + int i=0; + FILE *fp = NULL; + + ac_state = UNPLUGGED; + acpi_ac.cfdprint(LOG_DEBUG, "%s - update() called\n", acpi_ac.plugin_name); + for (i=0; i<ac_dir_num; i++) { + fp = fopen(ac_filelist[i], "r"); + if (!fp) { + acpi_ac.cfdprint(LOG_ERR, "acpi_ac_update(): %s: %s\n", + ac_filelist[i], strerror(errno)); + return -1; + } + fscanf(fp, ACPI_AC_FORMAT, temp); + fclose(fp); + + acpi_ac.cfdprint(LOG_DEBUG, "acpi_ac_update(): read %s\n", temp); + ac_state |= (strncmp(temp, "on-line", 7)==0 ? PLUGGED : UNPLUGGED); + } + + acpi_ac.cfdprint(LOG_INFO, "acpi_ac_update(): ac_adapter is %s\n", + ac_state==PLUGGED ? "on-line" : "off-line"); + return 0; + } + + /* + * parse the 'ac' keywork + */ static int acpi_ac_parse(const char *ev, void **obj) { int *ret = malloc(sizeof(int)); *************** *** 90,94 **** "%s - acpi_ac_parse() couldn't make enough room for ac_status (%s)\n", strerror(errno)); - /*free(ret);*/ return -1; } --- 142,145 ---- *************** *** 105,109 **** } else { acpi_ac.cfdprint(LOG_ERR, "%s - acpi_ac_parse() couldn't parse %s\n", ev); ! /*free(ret);*/ return -1; } --- 156,160 ---- } else { acpi_ac.cfdprint(LOG_ERR, "%s - acpi_ac_parse() couldn't parse %s\n", ev); ! free(ret); return -1; } *************** *** 116,119 **** --- 167,173 ---- } + /* + * evaluate the 'ac' keywork + */ static int acpi_ac_evaluate(const void *s) { const int *ac = (const int *)s; *************** *** 125,158 **** } - /* static int acpi_ac_update(void) - * - * reads temperature valuse ant compute a medium value - */ - static int acpi_ac_update(void) { - char temp[50]; - int i=0; - FILE *fp = NULL; - - ac_state = UNPLUGGED; - acpi_ac.cfdprint(LOG_DEBUG, "%s - update() called\n", acpi_ac.plugin_name); - for (i=0; i<ac_dir_num; i++) { - fp = fopen(ac_filelist[i], "r"); - if (!fp) { - acpi_ac.cfdprint(LOG_ERR, "acpi_ac_update(): %s: %s\n", - ac_filelist[i], strerror(errno)); - return -1; - } - fscanf(fp, ACPI_AC_FORMAT, temp); - fclose(fp); - - acpi_ac.cfdprint(LOG_DEBUG, "acpi_ac_update(): read %s\n", temp); - ac_state |= (strncmp(temp, "on-line", 7)==0 ? PLUGGED : UNPLUGGED); - } - - acpi_ac.cfdprint(LOG_INFO, "acpi_ac_update(): ac_adapter is %s\n", - ac_state==PLUGGED ? "on-line" : "off-line"); - return 0; - } - struct cpufreqd_plugin *create_plugin (void) { return &acpi_ac; --- 179,182 ---- Index: main.h =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/main.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** main.h 19 Dec 2004 20:06:40 -0000 1.1.1.1 --- main.h 11 May 2005 21:33:37 -0000 1.2 *************** *** 1,5 **** /* ! * Copyright (C) 2002,2003,2004 Mattia Dongili<do...@su...> ! * George Staikos <st...@0w...> * * This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* ! * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> ! * George Staikos <st...@0w...> * * This program is free software; you can redistribute it and/or modify *************** *** 17,20 **** --- 17,21 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include "list.h" Index: cpufreqd_acpi_battery.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_acpi_battery.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cpufreqd_acpi_battery.c 3 May 2005 20:40:49 -0000 1.2 --- cpufreqd_acpi_battery.c 11 May 2005 21:33:06 -0000 1.3 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <stdlib.h> #include <stdio.h> *************** *** 181,185 **** const struct battery_interval *bi = (const struct battery_interval *)s; ! acpi_battery.cfdprint(LOG_DEBUG, "%s - evaluate() called: %d-%d [%d]\n", acpi_battery.plugin_name, bi->min, bi->max, battery_level); --- 200,204 ---- const struct battery_interval *bi = (const struct battery_interval *)s; ! acpi_battery.cfdprint(LOG_DEBUG, "%s - acpi_battery_evaluate() called: %d-%d [%d]\n", acpi_battery.plugin_name, bi->min, bi->max, battery_level); Index: main.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** main.c 3 May 2005 20:40:49 -0000 1.4 --- main.c 11 May 2005 21:33:37 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2005 Mattia Dongili<do...@su...> * George Staikos <st...@0w...> * --- 1,4 ---- /* ! * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> * George Staikos <st...@0w...> * *************** *** 544,553 **** /* set the policy associated with the highest score */ ! if (tmp_profile==NULL) cpufreqd_log(LOG_WARNING, "No Rule matches current system status.\n"); ! else if (tmp_profile == current_profile) cpufreqd_log(LOG_DEBUG, "Profile unchanged (\"%s\"-\"%s\"), doing nothing.\n", current_profile->name, tmp_profile->name); ! else { current_profile = tmp_profile; cpufreqd_set_profile(current_profile); --- 544,553 ---- /* set the policy associated with the highest score */ ! if (tmp_profile==NULL) { cpufreqd_log(LOG_WARNING, "No Rule matches current system status.\n"); ! } else if (tmp_profile == current_profile) { cpufreqd_log(LOG_DEBUG, "Profile unchanged (\"%s\"-\"%s\"), doing nothing.\n", current_profile->name, tmp_profile->name); ! } else { current_profile = tmp_profile; cpufreqd_set_profile(current_profile); Index: plugin_utils.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/plugin_utils.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** plugin_utils.c 19 Dec 2004 20:06:09 -0000 1.1.1.1 --- plugin_utils.c 11 May 2005 21:33:37 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <stdio.h> #include <dlfcn.h> Index: cpufreqd_log.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_log.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cpufreqd_log.c 19 Dec 2004 20:06:11 -0000 1.1.1.1 --- cpufreqd_log.c 11 May 2005 21:33:36 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <stdarg.h> #include <syslog.h> Index: cpufreqd.conf =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd.conf,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cpufreqd.conf 19 Dec 2004 20:06:18 -0000 1.1.1.1 --- cpufreqd.conf 11 May 2005 21:33:05 -0000 1.2 *************** *** 28,32 **** poll_interval=2 pm_type=acpi # (apm/acpi) (default: apm) ! enable_plugins= programs , acpi_ac ,, quaquiqo , cpu , #acpi_battery,,, acpi_temperature [/General] --- 28,32 ---- poll_interval=2 pm_type=acpi # (apm/acpi) (default: apm) ! enable_plugins= programs , acpi_ac ,, quaquiqo , cpu , , , apm #,acpi_battery,,, acpi_temperature [/General] Index: list.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/list.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** list.c 19 Dec 2004 20:06:27 -0000 1.1.1.1 --- list.c 11 May 2005 21:33:37 -0000 1.2 *************** *** 1,5 **** /* ! * Copyright (C) 2002,2003,2004 Mattia Dongili<do...@su...> ! * George Staikos <st...@0w...> * * This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* ! * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> ! * George Staikos <st...@0w...> * * This program is free software; you can redistribute it and/or modify *************** *** 17,20 **** --- 17,21 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include <string.h> #include "list.h" Index: cpufreqd_cpu.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_cpu.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cpufreqd_cpu.c 19 Dec 2004 20:06:10 -0000 1.1.1.1 --- cpufreqd_cpu.c 11 May 2005 21:33:35 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <stdlib.h> #include <string.h> Index: plugin_utils.h =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/plugin_utils.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** plugin_utils.h 19 Dec 2004 20:06:09 -0000 1.1.1.1 --- plugin_utils.h 11 May 2005 21:33:38 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include "cpufreqd_plugin.h" Index: list.h =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/list.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** list.h 19 Dec 2004 20:06:30 -0000 1.1.1.1 --- list.h 11 May 2005 21:33:37 -0000 1.2 *************** *** 1,5 **** /* ! * Copyright (C) 2002,2003,2004 Mattia Dongili<do...@su...> ! * George Staikos <st...@0w...> * * This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* ! * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> ! * George Staikos <st...@0w...> * * This program is free software; you can redistribute it and/or modify Index: daemon_utils.h =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/daemon_utils.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** daemon_utils.h 19 Dec 2004 20:06:20 -0000 1.1.1.1 --- daemon_utils.h 11 May 2005 21:33:37 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + int daemonize (void); int write_cpufreqd_pid (void); Index: cpufreqd.h =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cpufreqd.h 19 Dec 2004 20:06:20 -0000 1.1.1.1 --- cpufreqd.h 11 May 2005 21:33:05 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #ifndef __CPUFREQD_H__ #define __CPUFREQD_H__ Index: cpufreqd_programs.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_programs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cpufreqd_programs.c 21 Dec 2004 19:06:05 -0000 1.2 --- cpufreqd_programs.c 11 May 2005 21:33:37 -0000 1.3 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <stdlib.h> #include <stdio.h> Index: Makefile.am =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 19 Dec 2004 20:06:20 -0000 1.1.1.1 --- Makefile.am 11 May 2005 21:32:59 -0000 1.2 *************** *** 19,24 **** --- 19,28 ---- cpufreqd_acpi_temperature.la \ cpufreqd_acpi_ac.la \ + cpufreqd_apm.la \ cpufreqd_cpu.la + cpufreqd_apm_la_SOURCES = \ + cpufreqd_apm.c + cpufreqd_acpi_ac_la_SOURCES = \ cpufreqd_acpi_ac.c Index: cpufreqd_plugin.h =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_plugin.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cpufreqd_plugin.h 19 Dec 2004 20:06:46 -0000 1.1.1.1 --- cpufreqd_plugin.h 11 May 2005 21:33:36 -0000 1.2 *************** *** 1,4 **** ! /* Note: gestione della riga di una regola?? Ogni plugin deve fornire * le keyword associate ad esso. Deve inoltre fornire essere in grado * di dire se il valore attuale letto e' confacente la regola che il --- 1,23 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ ! /* ...Sorry... notes in italian. ! * Note: gestione della riga di una regola?? Ogni plugin deve fornire * le keyword associate ad esso. Deve inoltre fornire essere in grado * di dire se il valore attuale letto e' confacente la regola che il *************** *** 48,52 **** /* ! * A cpufreqd plugin is a collection of function and setting able to * monitor some kind of system resource/state and tell if the present * state is conformant to the one configured. --- 67,71 ---- /* ! * A cpufreqd plugin is a collection of functions and settings able to * monitor some kind of system resource/state and tell if the present * state is conformant to the one configured. *************** *** 58,65 **** * PLUGIN IDENTIFICATION AND SETTINGS * ****************************************/ ! /* plugin name, must be unique (see README.plugins) */ const char *plugin_name; ! /* char array of keywords triggering the parse function */ struct cpufreqd_keyword *keywords; --- 77,84 ---- * PLUGIN IDENTIFICATION AND SETTINGS * ****************************************/ ! /* plugin name, must be unique (see README.plugins?) */ const char *plugin_name; ! /* array of keywords handled by this plugin */ struct cpufreqd_keyword *keywords; *************** *** 82,89 **** int (*plugin_exit) (void); ! /* Update plugin data. Must return either ! * CPUFREQD_SYS_STATUS_UNCHANGED or CPUFREQD_SYS_STATUS_CHANGED. The ! * return value will eventually trigger a CPUFREQD_EVENT_SYS_CHANGE ! * event */ int (*plugin_update) (void); --- 101,105 ---- int (*plugin_exit) (void); ! /* Update plugin data */ int (*plugin_update) (void); *************** *** 100,104 **** /* * A cpufreqd plugin MUST define the following function to provide the ! * core cpufred with the correct struct cpufreqd_plugin structure */ struct cpufreqd_plugin *create_plugin(void); --- 116,120 ---- /* * A cpufreqd plugin MUST define the following function to provide the ! * core cpufreqd with the correct struct cpufreqd_plugin structure */ struct cpufreqd_plugin *create_plugin(void); Index: cpufreqd_acpi_temperature.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_acpi_temperature.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cpufreqd_acpi_temperature.c 19 Dec 2004 20:06:09 -0000 1.1.1.1 --- cpufreqd_acpi_temperature.c 11 May 2005 21:33:30 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <stdlib.h> #include <stdio.h> Index: daemon_utils.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/daemon_utils.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** daemon_utils.c 19 Dec 2004 20:06:20 -0000 1.1.1.1 --- daemon_utils.c 11 May 2005 21:33:37 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <sys/types.h> #include <sys/stat.h> Index: config_parser.c =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/config_parser.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config_parser.c 3 May 2005 20:40:49 -0000 1.4 --- config_parser.c 11 May 2005 21:32:59 -0000 1.5 *************** *** 1,5 **** /* ! * Copyright (C) 2002,2003,2004 Mattia Dongili<do...@su...> ! * George Staikos <st...@0w...> * 2004.10.12 * - reworked to support new plugin architecture --- 1,5 ---- /* ! * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> ! * George Staikos <st...@0w...> * 2004.10.12 * - reworked to support new plugin architecture Index: cpufreqd_log.h =================================================================== RCS file: /cvsroot/cpufreqd/sources2/src/cpufreqd_log.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cpufreqd_log.h 19 Dec 2004 20:06:11 -0000 1.1.1.1 --- cpufreqd_log.h 11 May 2005 21:33:36 -0000 1.2 *************** *** 1 **** --- 1,20 ---- + /* + * Copyright (C) 2002-2005 Mattia Dongili <mal...@gm...> + * George Staikos <st...@0w...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + void cpufreqd_log (const int prio, const char *fmt, ...); |