Loading...
--- dyld/dyld-1340/common/Diagnostics.cpp
+++ dyld/dyld-960/common/Diagnostics.cpp
@@ -21,92 +21,51 @@
* @APPLE_LICENSE_HEADER_END@
*/
-
-#include <limits.h>
+#include <iostream>
+
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#include <TargetConditionals.h>
-#include "Defines.h"
-#if TARGET_OS_EXCLAVEKIT
- extern "C" void abort_report_np(const char* format, ...) __attribute__((noreturn,format(printf, 1, 2)));
-#else
- #include <_simple.h>
- #include <libc_private.h>
-#endif
-#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
- #include <mach/mach_time.h> // mach_absolute_time()
- #include <iostream>
-#endif
-
-#if !TARGET_OS_EXCLAVEKIT
-#include "BitUtils.h"
+#include <uuid/uuid.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <_simple.h>
+#include <unistd.h>
+#include <sys/uio.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <dirent.h>
#include <mach/mach.h>
-#endif
+#include <mach/machine.h>
+#include <mach/mach_time.h>
+#include <mach-o/loader.h>
+#include <mach-o/nlist.h>
+#include <mach-o/fat.h>
+#include <pthread.h>
+#include <libc_private.h>
#include "Diagnostics.h"
-#if !BUILDING_DYLD
-#define _simple_vsnprintf(str, size, fmt, ap) vsnprintf(str, size, fmt, ap)
-#endif
-
-#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
+#if BUILDING_CACHE_BUILDER
#include <dispatch/dispatch.h>
dispatch_queue_t sWarningQueue = dispatch_queue_create("com.apple.dyld.cache-builder.warnings", NULL);
#endif
-#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
Diagnostics::Diagnostics(bool verbose)
+#if BUILDING_CACHE_BUILDER
: _prefix(""), _verbose(verbose)
-{
-}
-#endif
-
-Diagnostics::Diagnostics()
-{
-#if TARGET_OS_EXCLAVEKIT
- this->_strBuf[0] = '\0';
-#endif
-}
-
-Diagnostics::Diagnostics(Diagnostics&& other)
-{
-#if TARGET_OS_EXCLAVEKIT
- strlcpy(this->_strBuf, other._strBuf, sizeof(this->_strBuf));
- other._strBuf[0] = '\0';
-#else
- this->_buffer = other._buffer;
- this->_bufferSize = other._bufferSize;
- this->_bufferUsed = other._bufferUsed;
-
- other._buffer = nullptr;
- other._bufferSize = 0;
- other._bufferUsed = 0;
-#endif
-}
-
-Diagnostics& Diagnostics::operator=(Diagnostics&& other)
-{
-#if TARGET_OS_EXCLAVEKIT
- strlcpy(this->_strBuf, other._strBuf, sizeof(this->_strBuf));
- other._strBuf[0] = '\0';
-#else
- this->_buffer = other._buffer;
- this->_bufferSize = other._bufferSize;
- this->_bufferUsed = other._bufferUsed;
-
- other._buffer = nullptr;
- other._bufferSize = 0;
- other._bufferUsed = 0;
-#endif
-
- return *this;
-}
-
-#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
+#endif
+{
+}
+
+#if BUILDING_CACHE_BUILDER
Diagnostics::Diagnostics(const std::string& prefix, bool verbose)
- : _prefix(prefix), _verbose(verbose)
+ : _prefix(prefix),_verbose(verbose)
{
}
#endif
@@ -120,180 +79,105 @@
{
va_list list;
va_start(list, format);
- error(format, va_list_wrap(list));
- va_end(list);
-}
-
-void Diagnostics::error(const char* format, va_list_wrap vaWrap)
-{
-#if TARGET_OS_EXCLAVEKIT
- vsnprintf(_strBuf, sizeof(_strBuf), format, vaWrap.list);
-#else
- clearError();
-
- va_list list2;
- va_copy(list2, vaWrap.list);
-
- // Get the size
- char smallBuffer[1] = { '\0' };
- int expectedSize = _simple_vsnprintf(smallBuffer, sizeof(smallBuffer), format, vaWrap.list) + 1;
- assert(expectedSize >= 0);
-
- const uint64_t alignedSize = lsl::roundToNextAligned(PAGE_SIZE, (uint64_t)expectedSize);
-
- vm_address_t newBuffer = 0;
- int kr = ::vm_allocate(mach_task_self(), &newBuffer, (vm_size_t)alignedSize,
- VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_MEMORY_DYLD));
- assert(kr == KERN_SUCCESS);
-
- this->_buffer = (char*)newBuffer;
-
- int actualSize = _simple_vsnprintf(this->_buffer, (size_t)alignedSize, format, list2);
- assert(actualSize >= 0);
- assert((actualSize + 1) == expectedSize);
-
- this->_bufferUsed = actualSize + 1;
- this->_bufferSize = (uint32_t)alignedSize;
-
- va_end(list2);
-#endif
-
-#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
+#if __x86_64__
+ error(format, list);
+#else
+ errorVA(format, list);
+#endif
+ va_end(list);
+}
+
+#if __x86_64__
+void Diagnostics::error(const char* format, va_list list)
+#else
+void Diagnostics::errorVA(const char* format, va_list list)
+#endif
+{
+ if ( _buffer == nullptr )
+ _buffer = _simple_salloc();
+ _simple_vsprintf(_buffer, format, list);
+
+#if BUILDING_CACHE_BUILDER
if ( !_verbose )
return;
if (_prefix.empty()) {
- fprintf(stderr, "%s\n", this->_buffer);
+ fprintf(stderr, "%s\n", _simple_string(_buffer));
} else {
- fprintf(stderr, "[%s] %s\n", _prefix.c_str(), this->_buffer);
- }
-#endif
-}
-
-bool Diagnostics::empty() const
-{
-#if TARGET_OS_EXCLAVEKIT
- return (this->_strBuf[0] == '\0');
-#else
- if ( (_buffer == nullptr) || (_bufferUsed == 0) || (_bufferSize == 0) )
- return true;
- return false;
-#endif
-}
-
-void Diagnostics::appendError(const char* format, ...)
-{
-#if TARGET_OS_EXCLAVEKIT
- size_t len = strlen(_strBuf);
+ fprintf(stderr, "[%s] %s\n", _prefix.c_str(), _simple_string(_buffer));
+ }
+#endif
+}
+
+ void Diagnostics::appendError(const char* format, ...)
+ {
+ if ( _buffer != nullptr )
+ _simple_sresize(_buffer);
va_list list;
va_start(list, format);
- vsnprintf(&_strBuf[len], sizeof(_strBuf)-len, format, list);
- va_end(list);
-#else
- if ( empty() ) {
- va_list list;
- va_start(list, format);
- error(format, va_list_wrap(list));
- va_end(list);
+#if __x86_64__
+ error(format, list);
+#else
+ errorVA(format, list);
+#endif
+ va_end(list);
+ }
+
+bool Diagnostics::hasError() const
+{
+ return _buffer != nullptr;
+}
+
+bool Diagnostics::noError() const
+{
+ return _buffer == nullptr;
+}
+
+void Diagnostics::clearError()
+{
+ if ( _buffer )
+ _simple_sfree(_buffer);
+ _buffer = nullptr;
+}
+
+void Diagnostics::assertNoError() const
+{
+ if ( _buffer != nullptr )
+ abort_report_np("%s", _simple_string(_buffer));
+}
+
+bool Diagnostics::errorMessageContains(const char* subString) const
+{
+ if ( _buffer == nullptr )
+ return false;
+ return (strstr(_simple_string(_buffer), subString) != nullptr);
+}
+
+void Diagnostics::quotePath(const char* path, char newPath[PATH_MAX])
+{
+ if ( !path ) {
+ newPath[0] = '\0';
return;
- }
-
- // Existing buffer, so need to actually append
- va_list list, list2;
- va_start(list, format);
- va_copy(list2, list);
-
- // Get the size
- char smallBuffer[1] = { '\0' };
- int expectedSize = _simple_vsnprintf(smallBuffer, sizeof(smallBuffer), format, list) + 1;
- assert(expectedSize >= 0);
-
- uint64_t remainingSize = this->_bufferSize - this->_bufferUsed;
- if ( remainingSize < expectedSize ) {
- // Grow the buffer to make space
- const uint64_t alignedSize = lsl::roundToNextAligned(PAGE_SIZE, (uint64_t)expectedSize + this->_bufferUsed);
-
- vm_address_t newBuffer = 0;
- int kr = ::vm_allocate(mach_task_self(), &newBuffer, (vm_size_t)alignedSize,
- VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_MEMORY_DYLD));
- assert(kr == KERN_SUCCESS);
-
- // Copy the old buffer over to the new one
- memcpy((void*)newBuffer, this->_buffer, this->_bufferSize);
-
- // Free the existing buffer
- ::vm_deallocate(mach_task_self(), (vm_address_t)this->_buffer, (vm_size_t)this->_bufferSize);
-
- // Set the buffer to the new one
- this->_buffer = (char*)newBuffer;
- this->_bufferSize = (uint32_t)alignedSize;
-
- remainingSize = this->_bufferSize - this->_bufferUsed;
- }
-
- // Write in to the existing buffer
- int actualSize = _simple_vsnprintf(&this->_buffer[this->_bufferUsed - 1], (size_t)remainingSize, format, list2);
- assert(actualSize >= 0);
- assert((actualSize + 1) == expectedSize);
-
- this->_bufferUsed += actualSize;
-
- va_end(list);
- va_end(list2);
-#endif
-}
-
-bool Diagnostics::hasError() const
-{
-#if TARGET_OS_EXCLAVEKIT
- return (this->_strBuf[0] != '\0');
-#else
- return _buffer != nullptr;
-#endif
-}
-
-bool Diagnostics::noError() const
-{
-#if TARGET_OS_EXCLAVEKIT
- return (this->_strBuf[0] == '\0');
-#else
- return _buffer == nullptr;
-#endif
-}
-
-void Diagnostics::clearError()
-{
-#if TARGET_OS_EXCLAVEKIT
- this->_strBuf[0] = '\0';
-#else
- if ( _buffer ) {
- ::vm_deallocate(mach_task_self(), (vm_address_t)this->_buffer, (vm_size_t)this->_bufferSize);
- }
- _buffer = nullptr;
- _bufferSize = 0;
- _bufferUsed = 0;
-#endif
-}
-
-void Diagnostics::assertNoError() const
-{
- if ( hasError() )
- abort_report_np("%s", errorMessageCStr());
-}
-
-bool Diagnostics::errorMessageContains(const char* subString) const
-{
- if ( noError() )
- return false;
- return (strstr(errorMessageCStr(), subString) != nullptr);
-}
-
-std::string_view Diagnostics::errorMessageSV() const
-{
- return this->errorMessageCStr();
-}
-
-#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
+ }
+ size_t len = strlen(path);
+ if ( len >= PATH_MAX )
+ len = PATH_MAX-1;
+ for (size_t i = 0; i < len; i++) {
+ newPath[i] = path[i];
+ if ( newPath[i] == '\'' )
+ newPath[i] = ' ';
+ }
+ newPath[len] = '\0';
+}
+
+
+#if !BUILDING_CACHE_BUILDER
+const char* Diagnostics::errorMessage() const
+{
+ return _buffer ? _simple_string(_buffer) : "";
+}
+
+#else
void Diagnostics::warning(const char* format, ...)
{
_SIMPLE_STRING tmp = _simple_salloc();
@@ -301,9 +185,13 @@
va_start(list, format);
_simple_vsprintf(tmp, format, list);
va_end(list);
+#if BUILDING_CACHE_BUILDER
dispatch_sync(sWarningQueue, ^{
_warnings.insert(_simple_string(tmp));
});
+#else
+ _warnings.insert(_simple_string(tmp));
+#endif
_simple_sfree(tmp);
}
@@ -347,43 +235,36 @@
const char* Diagnostics::errorMessageCStr() const
{
if ( _buffer != nullptr )
- return this->_buffer;
+ return _simple_string(_buffer);
else
return "";
}
const std::set<std::string> Diagnostics::warnings() const
{
+#if BUILDING_CACHE_BUILDER
__block std::set<std::string> retval;
dispatch_sync(sWarningQueue, ^{
retval = _warnings;
});
return retval;
+#else
+ return _warnings;
+#endif
}
void Diagnostics::clearWarnings()
{
+#if BUILDING_CACHE_BUILDER
dispatch_sync(sWarningQueue, ^{
_warnings.clear();
});
-}
-
-#else
-
-const char* Diagnostics::errorMessage() const
-{
- if ( noError() )
- return "";
-#if TARGET_OS_EXCLAVEKIT
- return _strBuf;
-#else
- return this->_buffer;
-#endif
-}
-
-#endif
-
-#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
+#else
+ _warnings.clear();
+#endif
+}
+
+#if BUILDING_CACHE_BUILDER
void TimeRecorder::pushTimedSection() {
openTimings.push_back(mach_absolute_time());
}
@@ -407,8 +288,6 @@
});
}
- free(output_string);
-
openTimings.push_back(mach_absolute_time());
}
@@ -431,24 +310,7 @@
timings.clear();
}
-
-#endif
-
-#if BUILDING_LD || BUILDING_UNIT_TESTS || BUILDING_SHARED_CACHE_LINKER || BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS
-
-mach_o::Error Diagnostics::toError() const
-{
- if ( hasError() )
- return mach_o::Error("%s", errorMessageCStr());
- return mach_o::Error::none();
-}
-
-void Diagnostics::error(const mach_o::Error& err)
-{
- if ( err.noError() )
- return;
-
- error("%s", err.message());
-}
-
-#endif
+#endif
+
+#endif
+