system_cmds-880.100.5.tar.gz

[apple/system_cmds.git] / iosim.tproj / iosim.c

diff --git a/iosim.tproj/iosim.c b/iosim.tproj/iosim.c
index 3fde5d1cbd42950582a74483799bf7df18b7340c..7a0efce7ea8c81551b546679c9a0452864c1ad67 100644 (file)
--- a/iosim.tproj/iosim.c
+++ b/iosim.tproj/iosim.c
@@ -17,6 +17,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include "panic.h"
 #include <IOKit/IOKitLib.h>
+#include <spawn.h>
 
 #define IO_MODE_SEQ            0
 #define IO_MODE_RANDOM         1
@@ -37,8 +38,9 @@
 #define BLOCKSIZE              1024
 #define MAX_CMD_SIZE           256
 #define PG_MASK                        ~(0xFFF)
-#define kIONVMeANS2ControllerString     "AppleANS2Controller"
-#define kIONVMeControllerString        "AppleNVMeController"
+#define kIONVMeANS2ControllerString         "AppleANS2Controller"
+#define kIONVMeANS2EmbeddedControllerString "AppleANS2NVMeController"
+#define kIONVMeControllerString             "AppleNVMeController"
 
 typedef enum {
        kDefaultDevice    = 0,
@@ -92,6 +94,7 @@ void print_test_setup(int value, char *option, char *units, char *comment);
 void setup_process_io_policy(int io_tier);
 void setup_qos_device(void);
 void print_latency_histogram(int64_t *data, int latency_bins, int latency_bin_size, double io_count);
+int system_cmd(char *command);
 
 void
 print_usage(void)
@@ -215,22 +218,34 @@ void setup_qos_device(void)
        if ( iterator != IO_OBJECT_NULL ) {
                printf ( "Found NVMe ANS2 Device \n" );
                qos_device = kNVMeDeviceANS2;
-       } else {
+               return;
+       }
 
-               status= IOServiceGetMatchingServices ( kIOMasterPortDefault, IOServiceMatching ( kIONVMeControllerString ), &iterator );
+       status = IOServiceGetMatchingServices ( kIOMasterPortDefault, IOServiceMatching ( kIONVMeANS2EmbeddedControllerString ), &iterator );
 
-               if ( status != kIOReturnSuccess )
-                       return;
+       if ( status != kIOReturnSuccess )
+               return;
 
-               if ( iterator != IO_OBJECT_NULL ) {
-                       printf ( "Found NVMe Device \n" );
-                       qos_device = kNVMeDevice;
-               }
-               else {
-                       printf ( "NVMe Device not found, not setting qos timeout\n" );
-                       qos_device = kDefaultDevice;
-               }
+       if ( iterator != IO_OBJECT_NULL ) {
+               printf ( "Found NVMe ANS2 Embedded Device \n" );
+               qos_device = kNVMeDeviceANS2;
+               return;
        }
+
+       status= IOServiceGetMatchingServices ( kIOMasterPortDefault, IOServiceMatching ( kIONVMeControllerString ), &iterator );
+
+       if ( status != kIOReturnSuccess )
+               return;
+
+       if ( iterator != IO_OBJECT_NULL ) {
+               printf ( "Found NVMe Device \n" );
+               qos_device = kNVMeDevice;
+               return;
+       }
+
+       printf ( "NVMe Device not found, not setting qos timeout\n" );
+       qos_device = kDefaultDevice;
+       return;
 }
 
 void assertASP(CFRunLoopTimerRef timer, void *info )
@@ -254,7 +269,7 @@ void assertASP(CFRunLoopTimerRef timer, void *info )
 
        // Assert ASP
        printf("Command : %s\n", command);
-       system(command);
+       system_cmd(command);
 
        // Panic the system as well
        panic("IO time > QoS timeout");
@@ -583,12 +598,12 @@ int main(int argc, char *argv[])
                        snprintf(fname, MAX_FILENAME, "iosim-%d-%d", (int)getpid(), i);
                        snprintf(dd_command, MAX_CMD_SIZE, "dd if=/dev/urandom of=%s bs=4096 count=%d", fname, file_size);
                        printf("Creating file %s of size %lld...\n", fname, ((int64_t)file_size * 4096));
-                       system(dd_command);
+                       system_cmd(dd_command);
                }
        } else {
                printf("Using user specified file %s for all threads...\n", user_fname);
        }
-       system("purge");
+       system_cmd("purge");
        setup_process_io_policy(io_tier);
 
        setup_qos_device();
@@ -637,3 +652,22 @@ int main(int argc, char *argv[])
 
        pthread_exit(0);
 }
+
+extern char **environ;
+
+int system_cmd(char *command)
+{
+    // workaround for rdar://problem/53281655
+    pid_t pid;
+    char *argv[] = {"sh", "-c", command, NULL};
+    int status;
+    status = posix_spawn(&pid, "/bin/sh", NULL, NULL, argv, environ);
+    if (status == 0) {
+        if (waitpid(pid, &status, 0) != -1) {
+            return status;
+        } else {
+            perror("waitpid");
+        }
+    }
+    return -1;
+}