/*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
+#define _LARGEFILE_SOURCE 1
+#include "config.h"
+
#include <locale.h>
#include <libintl.h>
#define _(str) gettext(str)
#include "pio.h"
#include "hdd.h"
-#include "log.h"
+#include <plog.h>
static int filter_sd(const char *p)
{
create_sensor(char *id, char *name, SkDisk *disk, int values_max_length)
{
struct psensor *s;
+ int t;
+
+ t = SENSOR_TYPE_ATASMART | SENSOR_TYPE_HDD | SENSOR_TYPE_TEMP;
+
s = psensor_create(id,
strdup(name),
- SENSOR_TYPE_HDD_TEMP_ATASMART,
+ strdup("HDD"),
+ t,
values_max_length);
s->disk = disk;
return s;
}
+/*
+ * Performs the same tests than sk_disk_open and outputs the result.
+ */
static void analyze_disk(const char *dname)
{
int f;
f = open(dname, O_RDONLY|O_NOCTTY|O_NONBLOCK|O_CLOEXEC);
if (f < 0) {
- log_debug("Could not open file %s: %s", dname, strerror(errno));
+ log_debug("analyze_disk(hdd_atasmart): Could not open file %s: %s",
+ dname,
+ strerror(errno));
goto fail;
}
if (fstat(f, &st) < 0) {
- log_debug("fstat fails %s: %s", dname, strerror(errno));
+ log_debug("analyze_disk(hdd_atasmart): fstat fails %s: %s",
+ dname,
+ strerror(errno));
goto fail;
}
if (!S_ISBLK(st.st_mode)) {
- log_debug("!S_ISBLK fails %s", dname);
+ log_debug("analyze_disk(hdd_atasmart): !S_ISBLK fails %s",
+ dname);
goto fail;
}
size = (uint64_t)-1;
/* So, it's a block device. Let's make sure the ioctls work */
if (ioctl(f, BLKGETSIZE64, &size) < 0) {
- log_debug("ioctl fails %s: %s", dname, strerror(errno));
+ log_debug("analyze_disk(hdd_atasmart): ioctl fails %s: %s",
+ dname,
+ strerror(errno));
goto fail;
}
if (size <= 0 || size == (uint64_t) -1) {
- log_debug("ioctl wrong size %s: %ld", dname, size);
+ log_debug("analyze_disk(hdd_atasmart): ioctl wrong size %s: %ld",
+ dname,
+ size);
goto fail;
}
close(f);
}
-
struct psensor **hdd_psensor_list_add(struct psensor **sensors,
int values_max_length)
{
result = tmp_sensors;
} else {
- log_err("sk_disk_open %s failure", *tmp);
+ log_err(_("atasmart: sk_disk_open() failure: %s."),
+ *tmp);
analyze_disk(*tmp);
}
cur = sensors;
while (*cur) {
s = *cur;
- if (s->type == SENSOR_TYPE_HDD_TEMP_ATASMART) {
+ if (!(s->type & SENSOR_TYPE_REMOTE)
+ && s->type & SENSOR_TYPE_ATASMART) {
ret = sk_disk_smart_read_data(s->disk);
if (!ret) {