Loading...
--- dyld/dyld-960/common/Diagnostics.cpp
+++ dyld/dyld-1235.2/common/Diagnostics.cpp
@@ -21,49 +21,42 @@
* @APPLE_LICENSE_HEADER_END@
*/
-#include <iostream>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <assert.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>
-#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 <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
#include "Diagnostics.h"
-#if BUILDING_CACHE_BUILDER
+#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
#include <dispatch/dispatch.h>
dispatch_queue_t sWarningQueue = dispatch_queue_create("com.apple.dyld.cache-builder.warnings", NULL);
#endif
Diagnostics::Diagnostics(bool verbose)
-#if BUILDING_CACHE_BUILDER
+#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
: _prefix(""), _verbose(verbose)
#endif
{
-}
-
-#if BUILDING_CACHE_BUILDER
+#if TARGET_OS_EXCLAVEKIT
+ _strBuf[0] = '\0';
+#endif
+}
+
+#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
Diagnostics::Diagnostics(const std::string& prefix, bool verbose)
: _prefix(prefix),_verbose(verbose)
{
@@ -79,25 +72,21 @@
{
va_list list;
va_start(list, format);
-#if __x86_64__
error(format, list);
-#else
- errorVA(format, list);
-#endif
- va_end(list);
-}
-
-#if __x86_64__
+ va_end(list);
+}
+
void Diagnostics::error(const char* format, va_list list)
-#else
-void Diagnostics::errorVA(const char* format, va_list list)
-#endif
-{
+{
+#if TARGET_OS_EXCLAVEKIT
+ vsnprintf(_strBuf, sizeof(_strBuf), format, list);
+#else
if ( _buffer == nullptr )
_buffer = _simple_salloc();
_simple_vsprintf(_buffer, format, list);
-
-#if BUILDING_CACHE_BUILDER
+#endif
+
+#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
if ( !_verbose )
return;
@@ -111,73 +100,65 @@
void Diagnostics::appendError(const char* format, ...)
{
- if ( _buffer != nullptr )
+#if TARGET_OS_EXCLAVEKIT
+ size_t len = strlen(_strBuf);
+ va_list list;
+ va_start(list, format);
+ vsnprintf(&_strBuf[len], sizeof(_strBuf)-len, format, list);
+ va_end(list);
+#else
+ if ( _buffer != nullptr )
_simple_sresize(_buffer);
va_list list;
va_start(list, format);
-#if __x86_64__
error(format, list);
-#else
- errorVA(format, list);
-#endif
- va_end(list);
+ va_end(list);
+#endif
}
bool Diagnostics::hasError() const
{
+#if TARGET_OS_EXCLAVEKIT
+ return (*_strBuf != '\0');
+#else
return _buffer != nullptr;
+#endif
}
bool Diagnostics::noError() const
{
+#if TARGET_OS_EXCLAVEKIT
+ return (*_strBuf == '\0');
+#else
return _buffer == nullptr;
+#endif
}
void Diagnostics::clearError()
{
+#if TARGET_OS_EXCLAVEKIT
+ *_strBuf = '\0';
+#else
if ( _buffer )
_simple_sfree(_buffer);
_buffer = nullptr;
+#endif
}
void Diagnostics::assertNoError() const
{
- if ( _buffer != nullptr )
- abort_report_np("%s", _simple_string(_buffer));
+ if ( hasError() )
+ abort_report_np("%s", errorMessageCStr());
}
bool Diagnostics::errorMessageContains(const char* subString) const
{
- if ( _buffer == nullptr )
+ if ( noError() )
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;
- }
- 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
+ return (strstr(errorMessageCStr(), subString) != nullptr);
+}
+
+#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
void Diagnostics::warning(const char* format, ...)
{
_SIMPLE_STRING tmp = _simple_salloc();
@@ -185,13 +166,9 @@
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);
}
@@ -242,29 +219,36 @@
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
- _warnings.clear();
-#endif
-}
-
-#if BUILDING_CACHE_BUILDER
+}
+
+#else
+
+const char* Diagnostics::errorMessage() const
+{
+ if ( noError() )
+ return "";
+#if TARGET_OS_EXCLAVEKIT
+ return _strBuf;
+#else
+ return _simple_string(_buffer);
+#endif
+}
+
+#endif
+
+#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
void TimeRecorder::pushTimedSection() {
openTimings.push_back(mach_absolute_time());
}
@@ -288,6 +272,8 @@
});
}
+ free(output_string);
+
openTimings.push_back(mach_absolute_time());
}
@@ -310,7 +296,24 @@
timings.clear();
}
-#endif
-
-#endif
-
+
+#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