Fixed new ABI method lookup function for +initialize safety.

sendmsg2.c

@@ -1,3 +1,7 @@
+#include "lock.h"
+#include <stdint.h>
+#include <dlfcn.h>
+
 __thread id objc_msg_sender;
 
 static struct objc_slot nil_slot = { Nil, Nil, "", 1, (IMP)nil_method };
@@ -23,9 +27,11 @@ Slot_t objc_msg_lookup_internal(id *receiver, SEL selector, id sender)
 		/* Install the dtable if it hasn't already been initialized. */
 		if ((*receiver)->class_pointer->dtable == __objc_uninstalled_dtable)
 		{
+			objc_mutex_lock(__objc_runtime_mutex);
 			__objc_init_install_dtable (*receiver, selector);
-			result = sarray_get_safe((*receiver)->class_pointer->dtable,
-				(sidx)selector->sel_id);
+			objc_mutex_unlock(__objc_runtime_mutex);
+			struct sarray *dtable = dtable_for_class((*receiver)->class_pointer);
+			result = sarray_get_safe(dtable, (sidx)selector->sel_id);
 		}
 		else
 		{
@@ -34,17 +40,20 @@ Slot_t objc_msg_lookup_internal(id *receiver, SEL selector, id sender)
 			result = sarray_get_safe((*receiver)->class_pointer->dtable,
 					(sidx)selector->sel_id);
 		}
-		id newReceiver = objc_proxy_lookup(*receiver, selector);
-		// If some other library wants us to play forwarding games, try again
-		// with the new object.
-		if (nil != newReceiver)
-		{
-			*receiver = newReceiver;
-			return objc_msg_lookup_sender(receiver, selector, sender);
-		}
 		if (0 == result)
 		{
-			result = objc_msg_forward3(*receiver, selector);
+			id newReceiver = objc_proxy_lookup(*receiver, selector);
+			// If some other library wants us to play forwarding games, try again
+			// with the new object.
+			if (nil != newReceiver)
+			{
+				*receiver = newReceiver;
+				return objc_msg_lookup_sender(receiver, selector, sender);
+			}
+			if (0 == result)
+			{
+				result = objc_msg_forward3(*receiver, selector);
+			}
 		}
 	}
 	return result;
@@ -84,3 +93,123 @@ Slot_t objc_msg_lookup_sender(id *receiver, SEL selector, id sender)
 	}
 	return objc_plane_lookup(receiver, selector, sender);
 }
+
+/**
+ * When profiling, the runtime writes out two files, one containing tuples of
+ * call sites and associated information, the other containing symbolic
+ * information for resolving these.  The loggedValues sparse array is used to prevent duplication of 
+ */
+static struct sarray *loggedValues;
+/**
+ * Mutex used to protect non-thread-safe parts of the profiling subsystem.
+ */
+static mutex_t profileLock;
+/**
+ * File used for writing the profiling symbol table.
+ */
+FILE *profileSymbols;
+/**
+ * File used for writing the profiling data.
+ */
+FILE *profileData;
+
+static char *objc_profile_resolve_symbol_null(void *addr) { return NULL; }
+/**
+ * Hook allowing JIT'd functions to be resolved.  Takes an address as an
+ * argument and returns the symbol name.
+ */
+char *(*objc_profile_resolve_symbol)(void *addr) =
+	objc_profile_resolve_symbol_null;
+
+
+// Don't enable profiling in the default build (yet)
+#ifdef PROFILE
+struct profile_info 
+{
+	const char *module;
+	int32_t callsite;
+	IMP method;
+	Class cls; 
+};
+
+static void __objc_profile_init(void)
+{
+	INIT_LOCK(profileLock);
+	loggedValues = sarray_new(128, 0);
+	profileSymbols = fopen("objc_profile.symbols", "a");
+	profileData = fopen("objc_profile.data", "a");
+	// Write markers indicating a new run.  
+	fprintf(profileSymbols, "=== NEW TRACE ===\n");
+	struct profile_info profile_data = { 0, 0, 0, 0};
+	fwrite(&profile_data, sizeof(profile_data), 1, profileData);
+}
+/**
+ * Profiling version of the slot lookup.  This takes a unique ID for the module
+ * and the callsite as extra arguments.  The type of the receiver and the
+ * address of the resulting function are then logged to a file.  These can then
+ * be used to determine whether adding slot caching is worthwhile, and whether
+ * any of the resulting methods should be speculatively inlined.
+ */
+Slot_t objc_msg_lookup_profile(id *receiver, SEL selector, id sender, 
+                               const char *module, int32_t callsite)
+{
+	// Initialize the logging lazily.  This prevents us from wasting any memory
+	// when we are not profiling.
+	if (NULL == loggedValues)
+	{
+		LOCK(__objc_runtime_mutex);
+		if (NULL == loggedValues)
+		{
+			__objc_profile_init();
+		}
+		UNLOCK(__objc_runtime_mutex);
+	}
+	// Look up the class if the receiver is not nil
+	Class cls = Nil;
+	if (nil != *receiver)
+	{
+		cls = (*receiver)->class_pointer;
+		if (!sarray_get_safe(loggedValues, (size_t)cls))
+		{
+			LOCK(&profileLock);
+			if (!sarray_get_safe(loggedValues, (size_t)cls))
+			{
+				fprintf(profileSymbols, "%zx %s\n", (size_t)cls, cls->name);
+			}
+			UNLOCK(&profileLock);
+		}
+	}
+	Slot_t slot = objc_msg_lookup_sender(receiver, selector, sender);
+	IMP method = (IMP)0;
+	if (0 != slot->version)
+	{
+		method = slot->method;
+		if (!sarray_get_safe(loggedValues, (size_t)method))
+		{
+			Dl_info info;
+			const char *symbolName;
+			if (dladdr((void*)method, &info))
+			{
+				symbolName = info.dli_sname;
+			}
+			else
+			{
+				symbolName = objc_profile_resolve_symbol((void*)method);
+			}
+			if (NULL != symbolName)
+			{
+				LOCK(&profileLock);
+				if (!sarray_get_safe(loggedValues, (size_t)method))
+				{
+					fprintf(profileSymbols, "%zx %s\n", (size_t)method, symbolName);
+				}
+				UNLOCK(&profileLock);
+				sarray_at_put_safe(loggedValues, (size_t)method, (void*)1);
+			}
+		}
+	}
+	struct profile_info profile_data = { module, callsite, method, cls };
+	fwrite(&profile_data, sizeof(profile_data), 1, profileData);
+	return slot;
+}
+#endif