--- dyld/dyld-1122.1/other-tools/dyld_usage.cpp
+++ dyld/dyld-957/other-tools/dyld_usage.cpp
@@ -41,7 +41,7 @@
 #include <libutil.h>
 #include <ktrace/session.h>
 #include <dispatch/dispatch.h>
-#include <sys/kdebug_private.h>
+#include <System/sys/kdebug.h>
 
 #include "Tracing.h"
 
@@ -186,22 +186,6 @@
         }
     }
 
-    void flushInterrupted() {
-        if (!_currentRootEvent) {
-            return;
-        }
-
-        std::ostringstream ostream;
-        outputConsoleLine(_currentRootEvent, columns, ostream, 0,
-                "root event was interrupted, flushing events", true);
-        std::cerr << ostream.str();
-        std::cerr.flush();
-
-        _eventStack.clear();
-        output(_currentRootEvent);
-        _currentRootEvent = nullptr;
-    }
-
     bool empty() { return !_currentRootEvent && _eventStack.empty() && _rootEvents.empty(); }
 private:
     template<typename T>
@@ -232,7 +216,7 @@
     }
 
     struct event_pair {
-        event_pair(ktrace_event_t E) : _startTime(E->timestamp), _endTime(0), _depth(0), _threadid((unsigned long)(E->threadid)),
+        event_pair(ktrace_event_t E) : _startTime(E->timestamp), _depth(0), _threadid((unsigned long)(E->threadid)),
                                        _eventCode(KDBG_EXTRACT_CODE(E->debugid)), _walltime(E->walltime) {};
         virtual ~event_pair(){}
         std::vector<std::shared_ptr<event_pair>>& children() { return _children; }
@@ -294,11 +278,6 @@
     }
 
     std::string duration(std::shared_ptr<event_pair> event) {
-        // interrupted event with no end timestamp
-        if (event->endTimestamp() == 0) {
-            return "";
-        }
-
         std::ostringstream result;
         uint64_t usecs = (mach_to_nano(event->endTimestamp() - event->startTimestamp()) + (NSEC_PER_USEC - 1)) / NSEC_PER_USEC;
         uint64_t secs = usecs / USEC_PER_SEC;
@@ -348,15 +327,8 @@
             extended = true;
         }
 
-        outputConsoleLine(node, width, sstr, depth, line.str(), extended);
-
-        for (const auto& child : node->children()) {
-            outputConsole(child, width, sstr, depth+1);
-        }
-    }
-
-    void outputConsoleLine(std::shared_ptr<event_pair> node, uint64_t width, std::ostringstream& sstr, uint64_t depth, std::string lineStr, bool extended) {
         std::string timestampStr = timestamp(node, extended);
+        std::string lineStr = line.str();
         std::string commandStr = process(node, extended);
         std::string durationStr = duration(node);
         size_t lineMax = (size_t)width - (timestampStr.length() + commandStr.length() + durationStr.length() + 2*(size_t)depth + 3);
@@ -365,6 +337,10 @@
         sstr << timestampStr << " ";
         std::fill_n(std::ostream_iterator<char>(sstr), 2*depth, ' ');
         sstr << lineStr << " " << durationStr << " " << commandStr << std::endl;
+
+        for (const auto& child : node->children()) {
+            outputConsole(child, width, sstr, depth+1);
+        }
     }
 
     void outputJSON(std::shared_ptr<event_pair> node, std::ostringstream& sstr) {
@@ -656,10 +632,6 @@
     std::map<unsigned long, std::unique_ptr<output_renderer>> sOutputRenders;
 
     void flush() {
-        for (const auto& renderer: sOutputRenders) {
-            renderer.second->flushInterrupted();
-        }
-
         if (JSON_Tracing_flag) {
             std::ostringstream ostream;
             ostream << "{\"displayTimeUnit\":\"ns\"";
@@ -735,18 +707,11 @@
             return;
         auto i = sOutputManager.sOutputRenders.find((size_t)(event->threadid));
         if (i == sOutputManager.sOutputRenders.end()) {
-            i = sOutputManager.sOutputRenders.emplace(event->threadid, std::make_unique<output_renderer>(s, event)).first;
+            sOutputManager.sOutputRenders.emplace(std::make_pair(event->threadid, std::make_unique<output_renderer>(s, event)));
+            i = sOutputManager.sOutputRenders.find((size_t)(event->threadid));
         }
         i->second->recordEvent(event);
         if (i->second->empty()) {
-            sOutputManager.sOutputRenders.erase(i);
-        }
-    });
-
-    ktrace_set_thread_exit_handler(s, ^(uint64_t tid, const char* execname) {
-        if (auto i = sOutputManager.sOutputRenders.find((size_t)tid); i != sOutputManager.sOutputRenders.end()) {
-            // Renderer still registered, so the thread might have finished unexpectedly with missing end event
-            i->second->flushInterrupted();
             sOutputManager.sOutputRenders.erase(i);
         }
     });
@@ -838,6 +803,9 @@
             ktrace_exclude_process(s, "csh");
             ktrace_exclude_process(s, "sh");
             ktrace_exclude_process(s, "zsh");
+#if TARGET_OS_EMBEDDED
+            ktrace_exclude_process(s, "dropbear");
+#endif /* TARGET_OS_EMBEDDED */
         }
     }