Loading...
--- dyld/dyld-551.4/src/dyld_process_info_notify.cpp
+++ dyld/dyld-421.2/src/dyld_process_info_notify.cpp
@@ -35,14 +35,8 @@
#include "dyld_images.h"
#include "dyld_priv.h"
-#include "LaunchCache.h"
-#include "Loading.h"
-#include "AllImages.h"
-
-
typedef void (^Notify)(bool unload, uint64_t timestamp, uint64_t machHeader, const uuid_t uuid, const char* path);
typedef void (^NotifyExit)();
-typedef void (^NotifyMain)();
//
@@ -51,16 +45,9 @@
struct __attribute__((visibility("hidden"))) dyld_process_info_notify_base
{
static dyld_process_info_notify_base* make(task_t task, dispatch_queue_t queue, Notify notify, NotifyExit notifyExit, kern_return_t* kr);
- ~dyld_process_info_notify_base();
-
- bool incRetainCount() const;
- bool decRetainCount() const;
-
- void setNotifyMain(NotifyMain notifyMain) const { _notifyMain = notifyMain; }
-
- // override new and delete so we don't need to link with libc++
- static void* operator new(size_t sz) { return malloc(sz); }
- static void operator delete(void* p) { return free(p); }
+ ~dyld_process_info_notify_base();
+
+ uint32_t& retainCount() const { return _retainCount; }
private:
dyld_process_info_notify_base(dispatch_queue_t queue, Notify notify, NotifyExit notifyExit, task_t task);
@@ -68,12 +55,12 @@
kern_return_t pokeSendPortIntoTarget();
kern_return_t unpokeSendPortInTarget();
void setMachSourceOnQueue();
-
- mutable int32_t _retainCount;
+ void* operator new (size_t, void* buf) { return buf; }
+
+ mutable uint32_t _retainCount;
dispatch_queue_t _queue;
Notify _notify;
NotifyExit _notifyExit;
- mutable NotifyMain _notifyMain;
task_t _targetTask;
dispatch_source_t _machSource;
uint64_t _portAddressInTarget;
@@ -83,7 +70,7 @@
dyld_process_info_notify_base::dyld_process_info_notify_base(dispatch_queue_t queue, Notify notify, NotifyExit notifyExit, task_t task)
- : _retainCount(1), _queue(queue), _notify(notify), _notifyExit(notifyExit), _notifyMain(NULL), _targetTask(task), _machSource(NULL), _portAddressInTarget(0), _sendPortInTarget(0), _receivePortInMonitor(0)
+ : _retainCount(1), _queue(queue), _notify(notify), _notifyExit(notifyExit), _targetTask(task), _machSource(NULL), _portAddressInTarget(0), _sendPortInTarget(0), _receivePortInMonitor(0)
{
dispatch_retain(_queue);
}
@@ -91,7 +78,6 @@
dyld_process_info_notify_base::~dyld_process_info_notify_base()
{
if ( _machSource ) {
- dispatch_source_cancel(_machSource);
dispatch_release(_machSource);
_machSource = NULL;
}
@@ -109,22 +95,11 @@
}
}
-bool dyld_process_info_notify_base::incRetainCount() const
-{
- int32_t newCount = OSAtomicIncrement32(&_retainCount);
- return ( newCount == 1 );
-}
-
-bool dyld_process_info_notify_base::decRetainCount() const
-{
- int32_t newCount = OSAtomicDecrement32(&_retainCount);
- return ( newCount == 0 );
-}
-
dyld_process_info_notify_base* dyld_process_info_notify_base::make(task_t task, dispatch_queue_t queue, Notify notify, NotifyExit notifyExit, kern_return_t* kr)
{
- dyld_process_info_notify_base* obj = new dyld_process_info_notify_base(queue, notify, notifyExit, task);
+ void* storage = malloc(sizeof(dyld_process_info_notify_base));
+ dyld_process_info_notify_base* obj = new (storage) dyld_process_info_notify_base(queue, notify, notifyExit, task);
if ( kern_return_t r = obj->makePorts() ) {
if ( kr != NULL )
@@ -145,7 +120,7 @@
return obj;
fail:
- delete obj;
+ free(obj);
return NULL;
}
@@ -188,10 +163,6 @@
NotifyExit exitHandler = _notifyExit;
_machSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, _receivePortInMonitor, 0, _queue);
dispatch_source_set_event_handler(_machSource, ^{
- // This event handler block has an implicit reference to "this"
- // if incrementing the count goes to one, that means the object may have already been destroyed
- if ( incRetainCount() )
- return;
uint8_t messageBuffer[DYLD_PROCESS_INFO_NOTIFY_MAX_BUFFER_SIZE];
mach_msg_header_t* h = (mach_msg_header_t*)messageBuffer;
@@ -206,20 +177,6 @@
for (unsigned i=0; i < header->imageCount; ++i) {
bool isUnload = (h->msgh_id == DYLD_PROCESS_INFO_NOTIFY_UNLOAD_ID);
_notify(isUnload, header->timestamp, entries[i].loadAddress, entries[i].uuid, stringPool + entries[i].pathStringOffset);
- }
- // reply to dyld, so it can continue
- mach_msg_header_t replyHeader;
- replyHeader.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, MACH_MSG_TYPE_MAKE_SEND);
- replyHeader.msgh_id = 0;
- replyHeader.msgh_local_port = MACH_PORT_NULL;
- replyHeader.msgh_remote_port = h->msgh_remote_port;
- replyHeader.msgh_reserved = 0;
- replyHeader.msgh_size = sizeof(replyHeader);
- mach_msg(&replyHeader, MACH_SEND_MSG | MACH_SEND_TIMEOUT, replyHeader.msgh_size, 0, MACH_PORT_NULL, 100, MACH_PORT_NULL);
- }
- else if ( h->msgh_id == DYLD_PROCESS_INFO_NOTIFY_MAIN_ID ) {
- if ( _notifyMain != NULL ) {
- _notifyMain();
}
// reply to dyld, so it can continue
mach_msg_header_t replyHeader;
@@ -248,9 +205,7 @@
fprintf(stderr, "received unknown message id=0x%X, size=%d\n", h->msgh_id, h->msgh_size);
}
}
- if ( decRetainCount() )
- delete this;
- });
+ });
dispatch_resume(_machSource);
}
@@ -337,192 +292,19 @@
return dyld_process_info_notify_base::make(task, queue, notify, notifyExit, kr);
}
-void _dyld_process_info_notify_main(dyld_process_info_notify object, void (^notifyMain)())
-{
- object->setNotifyMain(notifyMain);
-}
-
void _dyld_process_info_notify_retain(dyld_process_info_notify object)
{
- object->incRetainCount();
+ object->retainCount() += 1;
}
void _dyld_process_info_notify_release(dyld_process_info_notify object)
{
- // Note if _machSource is currently handling a message, the retain count will not be zero
- // and object will instead be deleted when handling is done.
- if ( object->decRetainCount() )
- delete object;
-}
-
-
-
-
-
-
-
-namespace dyld3 {
-
-
-static mach_port_t sNotifyReplyPorts[DYLD_MAX_PROCESS_INFO_NOTIFY_COUNT];
-static bool sZombieNotifiers[DYLD_MAX_PROCESS_INFO_NOTIFY_COUNT];
-
-static void notifyMonitoringDyld(bool unloading, unsigned portSlot, const launch_cache::DynArray<loader::ImageInfo>& imageInfos)
-{
- if ( sZombieNotifiers[portSlot] )
- return;
-
- unsigned entriesSize = (unsigned)imageInfos.count()*sizeof(dyld_process_info_image_entry);
- unsigned pathsSize = 0;
- for (uintptr_t i=0; i < imageInfos.count(); ++i) {
- launch_cache::Image image(imageInfos[i].imageData);
- pathsSize += (strlen(image.path()) + 1);
- }
- unsigned totalSize = (sizeof(dyld_process_info_notify_header) + MAX_TRAILER_SIZE + entriesSize + pathsSize + 127) & -128; // align
- if ( totalSize > DYLD_PROCESS_INFO_NOTIFY_MAX_BUFFER_SIZE ) {
- // Putting all image paths into one message would make buffer too big.
- // Instead split into two messages. Recurse as needed until paths fit in buffer.
- unsigned imageHalfCount = (unsigned)imageInfos.count()/2;
- const launch_cache::DynArray<loader::ImageInfo> firstHalf(imageHalfCount, (loader::ImageInfo*)&imageInfos[0]);
- const launch_cache::DynArray<loader::ImageInfo> secondHalf(imageInfos.count() - imageHalfCount, (loader::ImageInfo*)&imageInfos[imageHalfCount]);
- notifyMonitoringDyld(unloading, portSlot, firstHalf);
- notifyMonitoringDyld(unloading, portSlot, secondHalf);
- return;
- }
- // build buffer to send
- dyld_all_image_infos* allImageInfo = gAllImages.oldAllImageInfo();
- uint8_t buffer[totalSize];
- dyld_process_info_notify_header* header = (dyld_process_info_notify_header*)buffer;
- header->version = 1;
- header->imageCount = (uint32_t)imageInfos.count();
- header->imagesOffset = sizeof(dyld_process_info_notify_header);
- header->stringsOffset = sizeof(dyld_process_info_notify_header) + entriesSize;
- header->timestamp = allImageInfo->infoArrayChangeTimestamp;
- dyld_process_info_image_entry* entries = (dyld_process_info_image_entry*)&buffer[header->imagesOffset];
- char* const pathPoolStart = (char*)&buffer[header->stringsOffset];
- char* pathPool = pathPoolStart;
- for (uintptr_t i=0; i < imageInfos.count(); ++i) {
- launch_cache::Image image(imageInfos[i].imageData);
- strcpy(pathPool, image.path());
- uint32_t len = (uint32_t)strlen(pathPool);
- memcpy(entries->uuid, image.uuid(), sizeof(uuid_t));
- entries->loadAddress = (uint64_t)imageInfos[i].loadAddress;
- entries->pathStringOffset = (uint32_t)(pathPool - pathPoolStart);
- entries->pathLength = len;
- pathPool += (len +1);
- ++entries;
- }
- // lazily alloc reply port
- if ( sNotifyReplyPorts[portSlot] == 0 ) {
- if ( !mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &sNotifyReplyPorts[portSlot]) )
- mach_port_insert_right(mach_task_self(), sNotifyReplyPorts[portSlot], sNotifyReplyPorts[portSlot], MACH_MSG_TYPE_MAKE_SEND);
- //log("allocated reply port %d\n", sNotifyReplyPorts[portSlot]);
- }
- //log("found port to send to\n");
- mach_msg_header_t* h = (mach_msg_header_t*)buffer;
- h->msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND,MACH_MSG_TYPE_MAKE_SEND); // MACH_MSG_TYPE_MAKE_SEND_ONCE
- h->msgh_id = unloading ? DYLD_PROCESS_INFO_NOTIFY_UNLOAD_ID : DYLD_PROCESS_INFO_NOTIFY_LOAD_ID;
- h->msgh_local_port = sNotifyReplyPorts[portSlot];
- h->msgh_remote_port = allImageInfo->notifyPorts[portSlot];
- h->msgh_reserved = 0;
- h->msgh_size = (mach_msg_size_t)sizeof(buffer);
- //log("sending to port[%d]=%d, size=%d, reply port=%d, id=0x%X\n", portSlot, allImageInfo->notifyPorts[portSlot], h->msgh_size, sNotifyReplyPorts[portSlot], h->msgh_id);
- kern_return_t sendResult = mach_msg(h, MACH_SEND_MSG | MACH_RCV_MSG | MACH_RCV_TIMEOUT, h->msgh_size, h->msgh_size, sNotifyReplyPorts[portSlot], 2000, MACH_PORT_NULL);
- //log("send result = 0x%X, msg_id=%d, msg_size=%d\n", sendResult, h->msgh_id, h->msgh_size);
- if ( sendResult == MACH_SEND_INVALID_DEST ) {
- // sender is not responding, detatch
- //log("process requesting notification gone. deallocation send port %d and receive port %d\n", allImageInfo->notifyPorts[portSlot], sNotifyReplyPorts[portSlot]);
- mach_port_deallocate(mach_task_self(), allImageInfo->notifyPorts[portSlot]);
- mach_port_deallocate(mach_task_self(), sNotifyReplyPorts[portSlot]);
- allImageInfo->notifyPorts[portSlot] = 0;
- sNotifyReplyPorts[portSlot] = 0;
- }
- else if ( sendResult == MACH_RCV_TIMED_OUT ) {
- // client took too long, ignore him from now on
- sZombieNotifiers[portSlot] = true;
- mach_port_deallocate(mach_task_self(), sNotifyReplyPorts[portSlot]);
- sNotifyReplyPorts[portSlot] = 0;
- }
-}
-
-void AllImages::notifyMonitorMain()
-{
- dyld_all_image_infos* allImageInfo = gAllImages.oldAllImageInfo();
- for (int slot=0; slot < DYLD_MAX_PROCESS_INFO_NOTIFY_COUNT; ++slot) {
- if ( (allImageInfo->notifyPorts[slot] != 0 ) && !sZombieNotifiers[slot] ) {
- if ( sNotifyReplyPorts[slot] == 0 ) {
- if ( !mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &sNotifyReplyPorts[slot]) )
- mach_port_insert_right(mach_task_self(), sNotifyReplyPorts[slot], sNotifyReplyPorts[slot], MACH_MSG_TYPE_MAKE_SEND);
- //dyld::log("allocated reply port %d\n", sNotifyReplyPorts[slot]);
- }
- //dyld::log("found port to send to\n");
- uint8_t messageBuffer[sizeof(mach_msg_header_t) + MAX_TRAILER_SIZE];
- mach_msg_header_t* h = (mach_msg_header_t*)messageBuffer;
- h->msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND,MACH_MSG_TYPE_MAKE_SEND); // MACH_MSG_TYPE_MAKE_SEND_ONCE
- h->msgh_id = DYLD_PROCESS_INFO_NOTIFY_MAIN_ID;
- h->msgh_local_port = sNotifyReplyPorts[slot];
- h->msgh_remote_port = allImageInfo->notifyPorts[slot];
- h->msgh_reserved = 0;
- h->msgh_size = (mach_msg_size_t)sizeof(messageBuffer);
- //dyld::log("sending to port[%d]=%d, size=%d, reply port=%d, id=0x%X\n", slot, allImageInfo->notifyPorts[slot], h->msgh_size, sNotifyReplyPorts[slot], h->msgh_id);
- kern_return_t sendResult = mach_msg(h, MACH_SEND_MSG | MACH_RCV_MSG | MACH_RCV_TIMEOUT, h->msgh_size, h->msgh_size, sNotifyReplyPorts[slot], 2000, MACH_PORT_NULL);
- //dyld::log("send result = 0x%X, msg_id=%d, msg_size=%d\n", sendResult, h->msgh_id, h->msgh_size);
- if ( sendResult == MACH_SEND_INVALID_DEST ) {
- // sender is not responding, detatch
- //dyld::log("process requesting notification gone. deallocation send port %d and receive port %d\n", allImageInfo->notifyPorts[slot], sNotifyReplyPorts[slot]);
- mach_port_deallocate(mach_task_self(), allImageInfo->notifyPorts[slot]);
- mach_port_deallocate(mach_task_self(), sNotifyReplyPorts[slot]);
- allImageInfo->notifyPorts[slot] = 0;
- sNotifyReplyPorts[slot] = 0;
- }
- else if ( sendResult == MACH_RCV_TIMED_OUT ) {
- // client took too long, ignore him from now on
- sZombieNotifiers[slot] = true;
- mach_port_deallocate(mach_task_self(), sNotifyReplyPorts[slot]);
- sNotifyReplyPorts[slot] = 0;
- }
- }
- }
-}
-
-void AllImages::notifyMonitorLoads(const launch_cache::DynArray<loader::ImageInfo>& newImages)
-{
- // notify each monitoring process
- dyld_all_image_infos* allImageInfo = gAllImages.oldAllImageInfo();
- for (int slot=0; slot < DYLD_MAX_PROCESS_INFO_NOTIFY_COUNT; ++slot) {
- if ( allImageInfo->notifyPorts[slot] != 0 ) {
- notifyMonitoringDyld(false, slot, newImages);
- }
- else if ( sNotifyReplyPorts[slot] != 0 ) {
- // monitoring process detached from this process, so release reply port
- //dyld::log("deallocated reply port %d\n", sNotifyReplyPorts[slot]);
- mach_port_deallocate(mach_task_self(), sNotifyReplyPorts[slot]);
- sNotifyReplyPorts[slot] = 0;
- sZombieNotifiers[slot] = false;
- }
- }
-}
-
-void AllImages::notifyMonitorUnloads(const launch_cache::DynArray<loader::ImageInfo>& unloadingImages)
-{
- // notify each monitoring process
- dyld_all_image_infos* allImageInfo = gAllImages.oldAllImageInfo();
- for (int slot=0; slot < DYLD_MAX_PROCESS_INFO_NOTIFY_COUNT; ++slot) {
- if ( allImageInfo->notifyPorts[slot] != 0 ) {
- notifyMonitoringDyld(true, slot, unloadingImages);
- }
- else if ( sNotifyReplyPorts[slot] != 0 ) {
- // monitoring process detached from this process, so release reply port
- //dyld::log("deallocated reply port %d\n", sNotifyReplyPorts[slot]);
- mach_port_deallocate(mach_task_self(), sNotifyReplyPorts[slot]);
- sNotifyReplyPorts[slot] = 0;
- sZombieNotifiers[slot] = false;
- }
- }
-}
-
-} // namespace dyld3
-
-
-
-
+ object->retainCount() -= 1;
+ if ( object->retainCount() == 0 ) {
+ object->~dyld_process_info_notify_base();
+ free((void*)object);
+ }
+}
+
+
+