default to bsd names on ioservice input, optional long disknames

git-svn-id: https://svn.code.sf.net/p/bwmng/code/trunk@115 9d038f78-4a1f-0410-99f9-a7e0acc80b06

Author: vgropp

bwm-ng.1

@@ -218,6 +218,9 @@ or 1 (on), if the value is not given '1' is used.
 .TP
 .BI "-N, --ansiout "
 disable ANSI Codes for Plain output.
+.TP
+.BI "    --longdisknames "
+show long realnames of disks in Darwin (ioservice input)
 
 .SS OTHER
 These options specify the general behavior of \fBbwm-ng\fP.

bwm-ng.conf-example

@@ -3,6 +3,7 @@ UNIT=bits
 PROCFILE=/proc/net/dev
 DISKSTATSFILE=/proc/diskstats
 PARTITIONSFILE=/proc/partitions
+LONGDISKNAMES=0
 ANSIOUT=0
 OUTPUT=plain
 TIMEOUT=666

src/bwm-ng.c

@@ -173,6 +173,10 @@ inline void init() {
    strncpy(PROC_PARTITIONS_FILE,PROC_PARTITIONS,PATH_MAX);
 #endif
 
+#if IOSERVICE_IN
+	long_darwin_disk_names = 0;
+#endif
+
 }
 
 /* do the main thing */

src/global_vars.h

@@ -85,6 +85,10 @@ EXTERN int html_header;
 EXTERN int skfd;
 #endif
 
+#if IOSERVICE_IN
+EXTERN char long_darwin_disk_names;
+#endif
+
 EXTERN t_iface_stats *if_stats;
 /* total struct */
 EXTERN t_iface_stats if_stats_total;

src/options.c

@@ -235,6 +235,10 @@ char *token, *value;
         if (value) daemonize=value[0]=='0' ? 0 : 1;
     } else if( strcasecmp( token, "SUMHIDDEN" ) == 0 ) {
         if (value) sumhidden=value[0]=='0' ? 0 : 1;
+#if IOSERVICE_IN
+	 } else if( strcasecmp( token, "LONGDISKNAMES" ) == 0) {
+		 if (value) long_darwin_disk_names=value[0]=='0' ? 0 : 1;
+#endif
 #ifdef HTML
     } else if( strcasecmp( token, "HTMLREFRESH" ) == 0 ) {
         if (value && atol(value)>0) { html_refresh=atol(value); }
@@ -271,14 +275,17 @@ void get_cmdln_options(int argc, char *argv[]) {
 #endif		  
 #if NETSTAT && ALLOW_NETSTATPATH
         {"netstat",1,0,'n'},
+#endif
+#if IOSERVICE_IN
+		  {"longdisknames",0,0,1002},
 #endif
         {"input",1,0,'i'},
         {"dynamic",1,0,'d'},
         {"help", 0, 0, 'h'},
         {"version",0,0,'V'},
         {"allif",1,0,'a'},
         {"unit",1,0,'u'},
-		  {"ansiout",1,0,'N'},
+		  {"ansiout",0,0,'N'},
 #if EXTENDED_STATS        
         {"type",1,0,'T'},
         {"avglength",1,0,'A'},
@@ -362,10 +369,17 @@ void get_cmdln_options(int argc, char *argv[]) {
 			case 1000:
 				if (strlen(optarg)<PATH_MAX) 
 					strcpy(PROC_DISKSTATS_FILE,optarg);
+				break;
          case 1001:
             if (strlen(optarg)<PATH_MAX)
                strcpy(PROC_PARTITIONS_FILE,optarg);
-#endif							 
+				break;
+#endif				
+#if IOSERVICE_IN
+			case 1002:
+				long_darwin_disk_names=!long_darwin_disk_names;
+				break;
+#endif
 			case 'D':
 				if (optarg) daemonize=atoi(optarg);
 				break;

src/retrieve.c

@@ -927,65 +927,86 @@ void get_disk_stats_ioservice (char verbose) {
 	io_iterator_t dlist  = 0;
 	mach_port_t port = 0;
 	io_registry_entry_t disk = 0; 
-	io_registry_entry_t name_plane = 0;
 	CFDictionaryRef props = 0;
+	CFDictionaryRef props2 = 0;
 	CFDictionaryRef dstats = 0;
 	CFNumberRef value = NULL;
-	io_name_t name;
+	CFMutableDictionaryRef match;
+	io_registry_entry_t parent;
+	io_name_t name; 
+	char deviceFilePath[MAXPATHLEN]; //MAXPATHLEN is defined in sys/param.h
+	CFStringRef name_str;
 
    t_iface_speed_stats stats; /* local struct, used to calc total values */
    t_iface_speed_stats tmp_if_stats;
    memset(&stats,0,(size_t)sizeof(t_iface_speed_stats)); /* init it */
 
 	if (IOMasterPort(MACH_PORT_NULL, &port)) 
 		deinit(1,"failure while initializing disk port\n");
-	
-	if (IOServiceGetMatchingServices(port,IOServiceMatching("IOBlockStorageDriver"),&dlist))
+	match = IOServiceMatching("IOMedia");
+	CFDictionaryAddValue(match, CFSTR(kIOMediaWholeKey), kCFBooleanTrue);	
+	if (IOServiceGetMatchingServices(port, match, &dlist)!=KERN_SUCCESS)
 		deinit(1,"failure while getting disk list\n");
-	
 	while ( (disk = IOIteratorNext(dlist)) ) {
 		IORegistryEntryCreateCFProperties (disk,(CFMutableDictionaryRef *) &props,kCFAllocatorDefault,kNilOptions);
 		if (props) {
-			dstats = CFDictionaryGetValue(props, CFSTR(kIOBlockStorageDriverStatisticsKey));
-			if (dstats) {
-				value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsBytesReadKey));
-				if (value)
-					CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.bytes.in);
-				value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsBytesWrittenKey));
-				if (value)
-					CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.bytes.out);
-				value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsReadsKey));
-				if (value)
-					CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.packets.in);
-				value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsWritesKey));
-				if (value)
-					CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.packets.out);
-				value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsReadErrorsKey));
-				if (value)
-					CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.errors.in);
-				value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsWriteErrorsKey));
-				if (value)
-					CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.errors.out);
-				if (IORegistryEntryGetChildEntry(disk, kIOServicePlane, &name_plane ) || IORegistryEntryGetName(name_plane, name )) {
-					strncpy((char *)name,(char *)"unknown",sizeof(name)-1);
-					name[sizeof(name)-1]=0;
+			if (!long_darwin_disk_names) {
+				name_str = (CFStringRef)CFDictionaryGetValue(props, CFSTR(kIOBSDNameKey));
+				if (name_str) {
+					CFStringGetCString(name_str, deviceFilePath, MAXPATHLEN-1, CFStringGetSystemEncoding());
 				} else {
-					if (name_plane) {
-						IOObjectRelease(name_plane);
-						name_plane = 0;
-					}
+					snprintf((char *)deviceFilePath,MAXPATHLEN-1,"unknown%i",current_if_num);
+               deviceFilePath[MAXPATHLEN-1]=0;
+				}
+			} else {
+				if (IORegistryEntryGetName(disk, name )!=KERN_SUCCESS) {
+					snprintf((char *)name,sizeof(name)-1,"unknown%i",current_if_num);
+					name[sizeof(name)-1]=0;
+				}
+			}
+			if (IORegistryEntryGetParentEntry(disk, kIOServicePlane, &parent)!=KERN_SUCCESS) {
+				CFRelease(props);
+				IOObjectRelease(disk);
+				IOIteratorReset(dlist);
+				deinit(1,"disk has no parent\n");
+			}
+			IORegistryEntryCreateCFProperties(parent, (CFMutableDictionaryRef *)&props2,kCFAllocatorDefault, kNilOptions);
+			if (props2) {
+				dstats = CFDictionaryGetValue(props2, CFSTR(kIOBlockStorageDriverStatisticsKey));
+				if (dstats) {
+					value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsBytesReadKey));
+					if (value)
+						CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.bytes.in);
+					value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsBytesWrittenKey));
+					if (value)
+						CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.bytes.out);
+					value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsReadsKey));
+					if (value)
+						CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.packets.in);
+					value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsWritesKey));
+					if (value)
+						CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.packets.out);
+					value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsReadErrorsKey));
+					if (value)
+						CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.errors.in);
+					value = CFDictionaryGetValue (dstats,CFSTR(kIOBlockStorageDriverStatisticsWriteErrorsKey));
+					if (value)
+						CFNumberGetValue(value, kCFNumberSInt64Type, &tmp_if_stats.errors.out);
+					hidden_if = process_if_data (hidden_if, tmp_if_stats, &stats, long_darwin_disk_names ?	(char *)name :	deviceFilePath
+							, current_if_num, verbose,(tmp_if_stats.bytes.in != 0 || tmp_if_stats.bytes.out != 0));
+					current_if_num++;
 				}
-				hidden_if = process_if_data (hidden_if, tmp_if_stats, &stats, name, current_if_num, verbose,(tmp_if_stats.bytes.in != 0 || tmp_if_stats.bytes.out != 0));
-				current_if_num++;
+				CFRelease(props2);
 			}
+			IOObjectRelease(parent);
 			CFRelease(props); 
 			props = 0;
 		}
 		IOObjectRelease(disk);
 		disk = 0;
 	}
 	finish_iface_stats (verbose, stats, hidden_if,current_if_num);
-	IOIteratorReset(dlist);
+	IOObjectRelease(dlist);
 }
 #endif
 

src/retrieve.h

@@ -89,6 +89,11 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/storage/IOBlockStorageDriver.h>
+#include <IOKit/storage/IOMedia.h>
+#ifndef LONG_DARWIN_DEV_NAMES
+#include <IOKit/IOBSD.h>
+#include <paths.h>
+#endif
 #endif