Navigation

← Previous Changeset
Next Changeset →

Changeset 4668

Timestamp:

08/13/07 22:19:44 (1 year ago)

Author:

khali

Message:

Pass structures by reference in sensors and sensord, again for a
small performance gain and better consistency with the new
libsensors API.

Files:

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c (modified) (1 diff)
lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.c (modified) (5 diffs)
lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.h (modified) (1 diff)
lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c

r4666	r4668
158	158	char *label = NULL;
159	159	int valid = 0;
160		if (getValid (*chip, labelNumber, &valid)) {
	160	if (getValid (chip, labelNumber, &valid)) {
161	161	sensorLog (LOG_ERR, "Error getting sensor validity: %s/#%d", chip->prefix, labelNumber);
162	162	ret = -1;
163		} else if (getRawLabel (*chip, labelNumber, &rawLabel)) {
	163	} else if (getRawLabel (chip, labelNumber, &rawLabel)) {
164	164	sensorLog (LOG_ERR, "Error getting raw sensor label: %s/#%d", chip->prefix, labelNumber);
165	165	ret = -1;
166		} else if (getLabel (*chip, labelNumber, &label)) {
	166	} else if (getLabel (chip, labelNumber, &label)) {
167	167	sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
168	168	ret = -1;

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.c

r4666	r4668
36	36	int
37	37	getValid
38		(~~sensors_chip_name~~ name, int feature, int *valid) {
	38	(const sensors_chip_name name, int feature, int valid) {
39	39	int err;
40	40	err = sensors_get_ignored (name, feature);
…	…
48	48	int
49	49	getLabel
50		(~~sensors_chip_name~~ name, int feature, char **label) {
	50	(const sensors_chip_name name, int feature, char *label) {
51	51	int err;
52		err = sensors_get_label (&name, feature, label);
	52	err = sensors_get_label (name, feature, label);
53	53	return err;
54	54	}
…	…
56	56	int
57	57	getRawLabel
58		(~~sensors_chip_name~~ name, int feature, const char **label) {
	58	(const sensors_chip_name name, int feature, const char *label) {
59	59	const sensors_feature_data *rawFeature;
60	60	int nr1 = 0, nr2 = 0, err = 0;
61	61	do {
62		rawFeature = sensors_get_all_features (&name, &nr1, &nr2);
	62	rawFeature = sensors_get_all_features (name, &nr1, &nr2);
63	63	} while (rawFeature && (rawFeature->number != feature));
64	64	/* TODO: Ensure labels match RRD construct and are not repeated! */
…	…
111	111	double value;
112	112
113		if (getValid (*chip, sensor->number, &valid)) {
	113	if (getValid (chip, sensor->number, &valid)) {
114	114	sensorLog (LOG_ERR, "Error getting sensor validity: %s/%s", chip->prefix, sensor->name);
115	115	ret = 20;
116		} else if (getLabel (*chip, sensor->number, &label)) {
	116	} else if (getLabel (chip, sensor->number, &label)) {
117	117	sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, sensor->name);
118	118	ret = 21;
…	…
171	171	if ((action == DO_SCAN) && !alarm) {
172	172	continue;
173		} else if (getValid (*chip, labelNumber, &valid)) {
	173	} else if (getValid (chip, labelNumber, &valid)) {
174	174	sensorLog (LOG_ERR, "Error getting sensor validity: %s/#%d", chip->prefix, labelNumber);
175	175	ret = 22;
176		} else if (getLabel (*chip, labelNumber, &label)) {
	176	} else if (getLabel (chip, labelNumber, &label)) {
177	177	sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
178	178	ret = 22;

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.h

r2503	r4668
59	59	/* from sense.c */
60	60
61		extern int getValid (~~sensors_chip_name~~ name, int feature, int *valid);
62		extern int getLabel (~~sensors_chip_name~~ name, int feature, char **label);
63		extern int getRawLabel (~~sensors_chip_name~~ name, int feature, const char **label);
	61	extern int getValid (const sensors_chip_name name, int feature, int valid);
	62	extern int getLabel (const sensors_chip_name name, int feature, char *label);
	63	extern int getRawLabel (const sensors_chip_name name, int feature, const char *label);
64	64
65	65	extern int readChips (void);

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c

r4666	r4668
47	47	static void print_long_help(void);
48	48	static void print_version(void);
49		static void do_a_print(~~sensors_chip_name~~ name);
50		static int do_a_set(~~sensors_chip_name~~ name);
	49	static void do_a_print(const sensors_chip_name *name);
	50	static int do_a_set(const sensors_chip_name *name);
51	51	static int do_the_real_work(int *error);
52		static const char *sprintf_chip_name(~~sensors_chip_name~~ name);
	52	static const char sprintf_chip_name(const sensors_chip_name name);
53	53
54	54	#define CHIPS_MAX 20
…	…
262	262	if (sensors_match_chip(chip, &chips[i])) {
263	263	if(do_sets) {
264		if (do_a_set(*chip))
	264	if (do_a_set(chip))
265	265	*error = 1;
266	266	} else
267		do_a_print(*chip);
	267	do_a_print(chip);
268	268	i = chips_count;
269	269	cnt++;
…	…
273	273
274	274	/* returns 1 on error */
275		int do_a_set(~~sensors_chip_name~~ name)
	275	int do_a_set(const sensors_chip_name *name)
276	276	{
277	277	int res;
278	278
279		if ((res = sensors_do_chip_sets(&name))) {
	279	if ((res = sensors_do_chip_sets(name))) {
280	280	if (res == -SENSORS_ERR_PROC) {
281	281	fprintf(stderr,"%s: %s for writing;\n",sprintf_chip_name(name),
…	…
294	294	}
295	295
296		const char *sprintf_chip_name(~~sensors_chip_name~~ name)
	296	const char sprintf_chip_name(const sensors_chip_name name)
297	297	{
298	298	#define BUF_SIZE 200
299	299	static char buf[BUF_SIZE];
300	300
301		if (name.bus == SENSORS_CHIP_NAME_BUS_ISA)
302		snprintf(buf,BUF_SIZE,"%s-isa-%04x",name.prefix,name.addr);
303		else if (name.bus == SENSORS_CHIP_NAME_BUS_PCI)
304		snprintf(buf,BUF_SIZE,"%s-pci-%04x",name.prefix,name.addr);
305		else if (name.bus == SENSORS_CHIP_NAME_BUS_DUMMY)
306		snprintf(buf,BUF_SIZE,"%s-%s-%04x",name.prefix,name.busname,name.addr);
	301	if (name->bus == SENSORS_CHIP_NAME_BUS_ISA)
	302	snprintf(buf, BUF_SIZE, "%s-isa-%04x", name->prefix, name->addr);
	303	else if (name->bus == SENSORS_CHIP_NAME_BUS_PCI)
	304	snprintf(buf, BUF_SIZE, "%s-pci-%04x", name->prefix, name->addr);
	305	else if (name->bus == SENSORS_CHIP_NAME_BUS_DUMMY)
	306	snprintf(buf, BUF_SIZE, "%s-%s-%04x", name->prefix, name->busname,
	307	name->addr);
307	308	else
308		snprintf(buf,BUF_SIZE,"%s-i2c-%d-%02x",name.prefix,name.bus,name.addr);
	309	snprintf(buf, BUF_SIZE, "%s-i2c-%d-%02x", name->prefix, name->bus,
	310	name->addr);
309	311	return buf;
310	312	}
311	313
312		void do_a_print(~~sensors_chip_name~~ name)
	314	void do_a_print(const sensors_chip_name *name)
313	315	{
314	316	if (hide_unknown)
…	…
317	319	printf("%s\n",sprintf_chip_name(name));
318	320	if (!hide_adapter) {
319		const char *adap = sensors_get_adapter_name(name.bus);
	321	const char *adap = sensors_get_adapter_name(name->bus);
320	322	if (adap)
321	323	printf("Adapter: %s\n", adap);
322	324	else
323		fprintf(stderr, "Can't get adapter name for bus %d\n", name.bus);
	325	fprintf(stderr, "Can't get adapter name for bus %d\n", name->bus);
324	326	}
325	327	if (do_unknown)
326		print_unknown_chip(&name);
	328	print_unknown_chip(name);
327	329	else
328		print_generic_chip(&name);
	330	print_generic_chip(name);
329	331	printf("\n");
330	332	}