Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

Merge pull request #81 from troxor/disk-by-label

Browse Source 
Specify diskio by device label
This commit is contained in:
Brenden Matthews 2015-02-25 13:23:26 -08:00
commit 348e5e7390
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/variables.xml
View File

@ -881,8 +881,9 @@
<option>(device)</option>
</term>
<listitem>Displays current disk IO. Device is optional, and
takes the form of sda for /dev/sda. Individual partitions
are allowed.
takes the form of sda for /dev/sda. A block device label can
be specified with label:foo. Individual partitions are also
allowed.
<para /></listitem>
</varlistentry>
<varlistentry>

32
src/diskio.cc
View File

@ -58,19 +58,33 @@ void clear_diskio_stats(void)
struct diskio_stat *prepare_diskio_stat(const char *s)
{
struct stat sb;
std::vector<char> stat_name(text_buffer_size.get(*state)), device_name(text_buffer_size.get(*state));
std::vector<char> stat_name(text_buffer_size.get(*state)), device_name(text_buffer_size.get(*state)), device_s(text_buffer_size.get(*state));
struct diskio_stat *cur = &stats;
if (!s)
if (!s) {
return &stats;
} else {
strncpy(&(device_s[0]), s, text_buffer_size.get(*state));
}
#if defined(__FreeBSD__) || defined(__DragonFly__)
if (strncmp(s, "/dev/", 5) == 0) {
// supplied a /dev/device arg, so cut off the /dev part
strncpy(&(device_name[0]), s + 5, text_buffer_size.get(*state));
} else
if (strncmp(&(device_s[0]), "label:", 6) == 0) {
snprintf(&(device_name[0]), text_buffer_size.get(*state), "/dev/disk/by-label/%s", &(device_s[6]));
char * rpbuf;
rpbuf = realpath(&device_name[0], NULL);
strncpy(&device_s[0], rpbuf, text_buffer_size.get(*state));
free(rpbuf);
} else {
strncpy(&device_s[0], s, text_buffer_size.get(*state));
}
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__linux__)
if (strncmp(&device_s[0], "/dev/", 5) == 0) {
device_s.erase(device_s.begin(), device_s.begin()+5);
}
#endif
strncpy(&(device_name[0]), s, text_buffer_size.get(*state));
strncpy(&(device_name[0]), &device_s[0], text_buffer_size.get(*state));
snprintf(&(stat_name[0]), text_buffer_size.get(*state), "/dev/%s", &(device_name[0]));
@ -89,7 +103,7 @@ struct diskio_stat *prepare_diskio_stat(const char *s)
/* no existing found, make a new one */
cur->next = new diskio_stat;
cur = cur->next;
cur->dev = strndup(&(device_name[0]), text_buffer_size.get(*state));
cur->dev = strndup(&(device_s[0]), text_buffer_size.get(*state));
cur->last = UINT_MAX;
cur->last_read = UINT_MAX;
cur->last_write = UINT_MAX;