Move iossim to DVTiPhoneSimulatorRemoteClient.

testing/iossim/iossim.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Foundation/Foundation.h>
 #include <asl.h>
 #include <libgen.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ skipping 10 matching lines @@
 // However, there are some forward declarations required to get things to
 // compile. Also, the DTiPhoneSimulatorSessionDelegate protocol is referenced
 // by the iPhoneSimulatorRemoteClient framework, but not defined in the object
 // file, so it must be defined here before importing the generated
 // iPhoneSimulatorRemoteClient.h file.
 
 @class DTiPhoneSimulatorApplicationSpecifier;
 @class DTiPhoneSimulatorSession;
 @class DTiPhoneSimulatorSessionConfig;
 @class DTiPhoneSimulatorSystemRoot;
+@class DVTiPhoneSimulatorMessenger;
+
+@interface DVTPlatform : NSObject
++ (BOOL)loadAllPlatformsReturningError:(id *)arg1;
+@end
+
+@protocol OS_dispatch_source
+@end
+@protocol OS_dispatch_queue
+@end
+@class DVTDispatchLock;
+@class DVTConfinementServiceConnection;
+@class DVTTask;
 
 @protocol DTiPhoneSimulatorSessionDelegate
 - (void)session:(DTiPhoneSimulatorSession*)session
     didEndWithError:(NSError*)error;
 - (void)session:(DTiPhoneSimulatorSession*)session
        didStart:(BOOL)started
       withError:(NSError*)error;
 @end
 
-#import "iPhoneSimulatorRemoteClient.h"
+#import "DVTiPhoneSimulatorRemoteClient.h"
 
 // An undocumented system log key included in messages from launchd. The value
 // is the PID of the process the message is about (as opposed to launchd's PID).
 #define ASL_KEY_REF_PID "RefPID"
 
 namespace {
 
 // Name of environment variables that control the user's home directory in the
 // simulator.
 const char* const kUserHomeEnvVariable = "CFFIXED_USER_HOME";
@@ skipping 15 matching lines @@
 const NSTimeInterval kDefaultSessionStartTimeoutSeconds = 30;
 
 // While the simulated app is running, its stdout is redirected to a file which
 // is polled by iossim and written to iossim's stdout using the following
 // polling interval.
 const NSTimeInterval kOutputPollIntervalSeconds = 0.1;
 
 // The path within the developer dir of the private Simulator frameworks.
 NSString* const kSimulatorFrameworkRelativePath =
     @"Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/"
-    @"iPhoneSimulatorRemoteClient.framework";
+    @"DVTiPhoneSimulatorRemoteClient.framework";
+NSString* const kDVTFoundationRelativePath =
+    @"../SharedFrameworks/DVTFoundation.framework";
 NSString* const kDevToolsFoundationRelativePath =
     @"../OtherFrameworks/DevToolsFoundation.framework";
 NSString* const kSimulatorRelativePath =
     @"Platforms/iPhoneSimulator.platform/Developer/Applications/"
     @"iPhone Simulator.app";
 
 // Simulator Error String Key. This can be found by looking in the Simulator's
 // Localizable.strings files.
 NSString* const kSimulatorAppQuitErrorKey = @"The simulated application quit.";
 
@@ skipping 206 matching lines @@
       objectAtIndex:0] intValue];
   if (majorVersion <= 6) {
     // In iOS 6 and before, logging from the simulated apps went to the main
     // system logs, so use ASL to check if the simulated app exited abnormally
     // by looking for system log messages from launchd that refer to the
     // simulated app's PID. Limit query to messages in the last minute since
     // PIDs are cyclical.
     aslmsg query = asl_new(ASL_TYPE_QUERY);
     asl_set_query(query, ASL_KEY_SENDER, "launchd",
                   ASL_QUERY_OP_EQUAL | ASL_QUERY_OP_SUBSTRING);
-    asl_set_query(query, ASL_KEY_REF_PID,
-                  [[[session simulatedApplicationPID] stringValue] UTF8String],
-                  ASL_QUERY_OP_EQUAL);
+    asl_set_query(
+        query,
+        ASL_KEY_REF_PID,
+        [[NSString stringWithFormat:@"%d", [session simulatedApplicationPID]]

[lliabraa, 2013/12/12 15:01:15]

why change from stringValue to stringWithFormat? 

[justincohen, 2013/12/12 15:02:03]

Because it's not a NSNumber anymore, it's an int.

On 2013/12/12 15:01:15, lliabraa wrote:

[TVL, 2013/12/12 16:08:27]

This whole thing would be less scary with a char[20] on the stack and snprintf. 
Right now it needs things to live in the autorelease pool while the query runs.

[justincohen, 2013/12/16 18:44:37]

Done, converted to snprintf.

On 2013/12/12 16:08:27, TVL wrote:

+            UTF8String],
+        ASL_QUERY_OP_EQUAL);
     asl_set_query(query, ASL_KEY_TIME, "-1m", ASL_QUERY_OP_GREATER_EQUAL);
 
     // Log any messages found, and take note of any messages that may indicate
     // the app crashed or did not exit cleanly.
     aslresponse response = asl_search(NULL, query);
     aslmsg entry;
     while ((entry = aslresponse_next(response)) != NULL) {
       const char* message = asl_get(entry, ASL_KEY_MSG);
       LogWarning(@"Console message: %s", message);
       // Some messages are harmless, so don't trigger a failure for them.
@@ skipping 70 matching lines @@
   NSString* output =
       [[[NSString alloc] initWithData:outputData
                              encoding:NSUTF8StringEncoding] autorelease];
   output = [output stringByTrimmingCharactersInSet:
       [NSCharacterSet whitespaceAndNewlineCharacterSet]];
   if ([output length] == 0)
     output = nil;
   return output;
 }
 
+// Helper to find a class by name and die if it isn't found.

[TVL, 2013/12/12 16:08:27]

any reason this got moved?

[justincohen, 2013/12/16 18:44:37]

Forward declaration.

On 2013/12/12 16:08:27, TVL wrote:

+Class FindClassByName(NSString* nameOfClass) {
+  Class theClass = NSClassFromString(nameOfClass);
+  if (!theClass) {
+    LogError(@"Failed to find class %@ at runtime.", nameOfClass);
+    exit(kExitInitializationFailure);
+  }
+  return theClass;
+}
+
 // Loads the Simulator framework from the given developer dir.
 NSBundle* LoadSimulatorFramework(NSString* developerDir) {
   // The Simulator framework depends on some of the other Xcode private
   // frameworks; manually load them first so everything can be linked up.
+  NSString* dvtFoundationPath = [developerDir
+      stringByAppendingPathComponent:kDVTFoundationRelativePath];
+  NSBundle* dvtFoundationBundle =
+      [NSBundle bundleWithPath:dvtFoundationPath];
+  if (![dvtFoundationBundle load])
+    return nil;
+
   NSString* devToolsFoundationPath = [developerDir
       stringByAppendingPathComponent:kDevToolsFoundationRelativePath];
   NSBundle* devToolsFoundationBundle =
       [NSBundle bundleWithPath:devToolsFoundationPath];
   if (![devToolsFoundationBundle load])
     return nil;
+
+  // Prime DVTPlatform.
+  Class DVTPlatformClass = FindClassByName(@"DVTPlatform");
+  [DVTPlatformClass loadAllPlatformsReturningError:nil];

[TVL, 2013/12/12 16:08:27]

You should check the bool return result, and wouldn't hurt to collect the error
so you can log if it does fail to start up.

[justincohen, 2013/12/16 18:44:37]

Done.

+
   NSString* simBundlePath = [developerDir
       stringByAppendingPathComponent:kSimulatorFrameworkRelativePath];
   NSBundle* simBundle = [NSBundle bundleWithPath:simBundlePath];
   if (![simBundle load])
     return nil;
   return simBundle;
 }
 
-// Helper to find a class by name and die if it isn't found.
-Class FindClassByName(NSString* nameOfClass) {
-  Class theClass = NSClassFromString(nameOfClass);
-  if (!theClass) {
-    LogError(@"Failed to find class %@ at runtime.", nameOfClass);
-    exit(kExitInitializationFailure);
-  }
-  return theClass;
-}
-
 // Converts the given app path to an application spec, which requires an
 // absolute path.
 DTiPhoneSimulatorApplicationSpecifier* BuildAppSpec(NSString* appPath) {
   Class applicationSpecifierClass =
       FindClassByName(@"DTiPhoneSimulatorApplicationSpecifier");
   if (![appPath isAbsolutePath]) {
     NSString* cwd = [[NSFileManager defaultManager] currentDirectoryPath];
     appPath = [cwd stringByAppendingPathComponent:appPath];
   }
   appPath = [appPath stringByStandardizingPath];
@@ skipping 13 matching lines @@
 }
 
 // Builds a config object for starting the specified app.
 DTiPhoneSimulatorSessionConfig* BuildSessionConfig(
     DTiPhoneSimulatorApplicationSpecifier* appSpec,
     DTiPhoneSimulatorSystemRoot* systemRoot,
     NSString* stdoutPath,
     NSString* stderrPath,
     NSArray* appArgs,
     NSDictionary* appEnv,
-    NSNumber* deviceFamily) {
+    NSNumber* deviceFamily,
+    NSString* deviceName) {
   Class sessionConfigClass = FindClassByName(@"DTiPhoneSimulatorSessionConfig");
   DTiPhoneSimulatorSessionConfig* sessionConfig =
       [[[sessionConfigClass alloc] init] autorelease];
   sessionConfig.applicationToSimulateOnStart = appSpec;
   sessionConfig.simulatedSystemRoot = systemRoot;
   sessionConfig.localizedClientName = @"chromium";
   sessionConfig.simulatedApplicationStdErrPath = stderrPath;
   sessionConfig.simulatedApplicationStdOutPath = stdoutPath;
   sessionConfig.simulatedApplicationLaunchArgs = appArgs;
   sessionConfig.simulatedApplicationLaunchEnvironment = appEnv;
+  sessionConfig.simulatedDeviceInfoName = deviceName;
   sessionConfig.simulatedDeviceFamily = deviceFamily;
   return sessionConfig;
 }
 
 // Builds a simulator session that will use the given delegate.
 DTiPhoneSimulatorSession* BuildSession(SimulatorDelegate* delegate) {
   Class sessionClass = FindClassByName(@"DTiPhoneSimulatorSession");
   DTiPhoneSimulatorSession* session =
       [[[sessionClass alloc] init] autorelease];
   session.delegate = delegate;
@@ skipping 44 matching lines @@
     }
   }
 
   return YES;
 }
 
 // Creates the necessary directory structure under the given user home directory
 // path, then sets the path in the appropriate environment variable.
 // Returns YES if successful, NO if unable to create or initialize the given
 // directory.
-BOOL InitializeSimulatorUserHome(NSString* userHomePath, NSString* deviceName) {
+BOOL InitializeSimulatorUserHome(NSString* userHomePath) {
   if (!CreateHomeDirSubDirs(userHomePath))
     return NO;
 
-  // Set the device to simulate. Note that the iOS Simulator must not be running
-  // for this setting to take effect.
-  CFStringRef iPhoneSimulatorAppID = CFSTR("com.apple.iphonesimulator");
-  CFPreferencesSetAppValue(CFSTR("SimulateDevice"),
-                           deviceName,
-                           iPhoneSimulatorAppID);
-  CFPreferencesAppSynchronize(iPhoneSimulatorAppID);
-
   // Update the environment to use the specified directory as the user home
   // directory.
   // Note: the third param of setenv specifies whether or not to overwrite the
   // variable's value if it has already been set.
   if ((setenv(kUserHomeEnvVariable, [userHomePath UTF8String], YES) == -1) ||
       (setenv(kHomeEnvVariable, [userHomePath UTF8String], YES) == -1)) {
     LogError(@"Unable to set environment variables for home directory.");
     return NO;
   }
 
@@ skipping 167 matching lines @@
   if (!simHomePath) {
     NSString* dirNameTemplate =
         [NSString stringWithFormat:@"iossim-%@-%@-XXXXXX", appName, deviceName];
     simHomePath = CreateTempDirectory(dirNameTemplate);
     if (!simHomePath) {
       LogError(@"Unable to create unique directory for template %@",
                dirNameTemplate);
       exit(kExitInitializationFailure);
     }
   }
-  if (!InitializeSimulatorUserHome(simHomePath, deviceName)) {
+  if (!InitializeSimulatorUserHome(simHomePath)) {
     LogError(@"Unable to initialize home directory for simulator: %@",
              simHomePath);
     exit(kExitInitializationFailure);
   }
 
   // Create the config and simulator session.
   DTiPhoneSimulatorSessionConfig* config = BuildSessionConfig(appSpec,
                                                               systemRoot,
                                                               stdioPath,
                                                               stdioPath,
                                                               appArgs,
                                                               appEnv,
-                                                              deviceFamily);
+                                                              deviceFamily,
+                                                              deviceName);
   SimulatorDelegate* delegate =
       [[[SimulatorDelegate alloc] initWithStdioPath:stdioPath
                                        developerDir:developerDir
                                       simulatorHome:simHomePath] autorelease];
   DTiPhoneSimulatorSession* session = BuildSession(delegate);
 
   // Start the simulator session.
   NSError* error;
   BOOL started = [session requestStartWithConfig:config
                                          timeout:sessionStartTimeout
                                            error:&error];
 
   // Spin the runtime indefinitely. When the delegate gets the message that the
   // app has quit it will exit this program.
   if (started) {
     [[NSRunLoop mainRunLoop] run];
   } else {
     LogError(@"Simulator failed request to start:  \"%@\" (%@:%ld)",
              [error localizedDescription],
              [error domain], static_cast<long int>([error code]));
   }
 
   // Note that this code is only executed if the simulator fails to start
   // because once the main run loop is started, only the delegate calling
   // exit() will end the program.
   [pool drain];
   return kExitFailure;
 }