Merge branch 'master' of github.com:DynamoRIO/dynamorio into i6831-sp…

…lit-eof

clients/drcachesim/scheduler/scheduler.cpp

@@ -59,9 +59,9 @@ scheduler_tmpl_t<RecordType, ReaderType>::init(
                                 scheduler_impl_deleter_t>(
             new scheduler_replay_tmpl_t<RecordType, ReaderType>);
     } else {
-        // Non-dynamic and non-replay fixed modes such as analyzer serial and
-        // parallel modes.  Although serial does do interleaving by timestamp
-        // it is closer to parallel mode than the file-based replay modes.
+        // Non-dynamic and non-replay fixed modes such as analyzer
+        // parallel mode with a static mapping of inputs to outputs and analyzer
+        // serial mode with a simple time interleaving of all inputs onto one output.
         impl_ = std::unique_ptr<scheduler_impl_tmpl_t<RecordType, ReaderType>,
                                 scheduler_impl_deleter_t>(
             new scheduler_fixed_tmpl_t<RecordType, ReaderType>);

clients/drcachesim/scheduler/scheduler_dynamic.cpp

@@ -41,6 +41,7 @@
 #include <mutex>
 #include <thread>
 
+#include "flexible_queue.h"
 #include "memref.h"
 #include "memtrace_stream.h"
 #include "mutex_dbg_owned.h"

clients/drcachesim/scheduler/scheduler_impl.cpp

@@ -2924,15 +2924,6 @@ scheduler_impl_tmpl_t<RecordType, ReaderType>::get_statistic(
     return static_cast<double>(outputs_[output].stats[stat]);
 }
 
-template <typename RecordType, typename ReaderType>
-typename scheduler_tmpl_t<RecordType, ReaderType>::stream_status_t
-scheduler_impl_tmpl_t<RecordType, ReaderType>::set_output_active(output_ordinal_t output,
-                                                                 bool active)
-{
-    // Only supported in scheduler_dynamic_tmpl_t subclass.
-    return sched_type_t::STATUS_INVALID;
-}
-
 template <typename RecordType, typename ReaderType>
 void
 scheduler_impl_tmpl_t<RecordType, ReaderType>::print_queue_stats()

clients/drcachesim/scheduler/scheduler_impl.h

@@ -557,11 +557,63 @@ template <typename RecordType, typename ReaderType> class scheduler_impl_tmpl_t
     // We assume a 2GHz clock and IPC=1.
     static constexpr uint64_t INSTRS_PER_US = 2000;
 
+    ///////////////////////////////////////////////////////////////////////////
+    /// Protected virtual methods.
+    /// XXX i#6831: These interfaces between the main class the subclasses could be
+    /// more clearly separated and crystalized.  One goal is to avoid conditionals
+    // in scheduler_impl_tmpl_t based on options_mapping or possibly on options_
+    // at all (possibly only storing options_ in the subclasses).
+
     // Called just once at initialization time to set the initial input-to-output
     // mappings and state for the particular mapping_t mode.
+    // Should call set_cur_input() for all outputs with initial inputs.
     virtual scheduler_status_t
     set_initial_schedule(std::unordered_map<int, std::vector<int>> &workload2inputs) = 0;
 
+    // Allow subclasses to perform custom initial marker processing during
+    // get_initial_input_content().  Returns whether to keep reading.
+    // The caller will stop calling when an instruction record is reached.
+    // The 'record' may have TRACE_TYPE_INVALID in some calls in which case
+    // the two bool parameters are what the return value should be based on.
+    virtual bool
+    process_next_initial_record(input_info_t &input, RecordType record,
+                                bool &found_filetype, bool &found_timestamp);
+
+    // Helper for pick_next_input() specialized by mapping_t mode.
+    // This is called when check_for_input_switch() indicates a switch is needed.
+    // No input_info_t lock can be held on entry.
+    virtual stream_status_t
+    pick_next_input_for_mode(output_ordinal_t output, uint64_t blocked_time,
+                             input_ordinal_t prev_index, input_ordinal_t &index) = 0;
+
+    // Helper for next_record() specialized by mapping_t mode: called on every record
+    // before it's passed to the user.  Determines whether to switch to a new input
+    // (returned in "need_new_input"; if so, whether it's a preempt is in "preempt"
+    // and if this current input should be blocked then that time should be set in
+    // "blocked_time").  If this returns true for "need_new_input",
+    // pick_next_input_for_mode() is called.
+    virtual stream_status_t
+    check_for_input_switch(output_ordinal_t output, RecordType &record,
+                           input_info_t *input, uint64_t cur_time, bool &need_new_input,
+                           bool &preempt, uint64_t &blocked_time) = 0;
+
+    // The external interface lets a user request that an output go inactive when
+    // doing dynamic scheduling.
+    virtual stream_status_t
+    set_output_active(output_ordinal_t output, bool active)
+    {
+        // Only supported in scheduler_dynamic_tmpl_t subclass.
+        return sched_type_t::STATUS_INVALID;
+    }
+
+    // mapping_t-mode specific actions when one output runs out of things to do.
+    // Success return values are either STATUS_IDLE or STATUS_EOF.
+    virtual stream_status_t
+    eof_or_idle_for_mode(output_ordinal_t output, input_ordinal_t prev_input) = 0;
+
+    ///
+    ///////////////////////////////////////////////////////////////////////////
+
     // Assumed to only be called at initialization time.
     // Reads ahead in each input to find its filetype, and if "gather_timestamps"
     // is set, to find its first timestamp, queuing all records
@@ -573,15 +625,6 @@ template <typename RecordType, typename ReaderType> class scheduler_impl_tmpl_t
     void
     print_configuration();
 
-    // Allow subclasses to perform custom initial marker processing during
-    // get_initial_input_content().  Returns whether to keep reading.
-    // The caller will stop calling when an instruction record is reached.
-    // The 'record' may have TRACE_TYPE_INVALID in some calls in which case
-    // the two bool parameters are what the return value should be based on.
-    virtual bool
-    process_next_initial_record(input_info_t &input, RecordType record,
-                                bool &found_filetype, bool &found_timestamp);
-
     scheduler_status_t
     legacy_field_support();
 
@@ -716,24 +759,6 @@ template <typename RecordType, typename ReaderType> class scheduler_impl_tmpl_t
     stream_status_t
     pick_next_input(output_ordinal_t output, uint64_t blocked_time);
 
-    // Helper for pick_next_input() specialized by mapping_t mode.
-    // This is called when check_for_input_switch() indicates a switch is needed.
-    // No input_info_t lock can be held on entry.
-    virtual stream_status_t
-    pick_next_input_for_mode(output_ordinal_t output, uint64_t blocked_time,
-                             input_ordinal_t prev_index, input_ordinal_t &index) = 0;
-
-    // Helper for next_record() specialized by mapping_t mode: called on every record
-    // before it's passed to the user.  Determines whether to switch to a new input
-    // (returned in "need_new_input"; if so, whether it's a preempt is in "preempt"
-    // and if this current input should be blocked then that time should be set in
-    // "blocked_time").  If this returns true for "need_new_input",
-    // pick_next_input_for_mode() is called.
-    virtual stream_status_t
-    check_for_input_switch(output_ordinal_t output, RecordType &record,
-                           input_info_t *input, uint64_t cur_time, bool &need_new_input,
-                           bool &preempt, uint64_t &blocked_time) = 0;
-
     // If the given record has a thread id field, returns true and the value.
     bool
     record_type_has_tid(RecordType record, memref_tid_t &tid);
@@ -862,9 +887,6 @@ template <typename RecordType, typename ReaderType> class scheduler_impl_tmpl_t
     stream_status_t
     stop_speculation(output_ordinal_t output);
 
-    virtual stream_status_t
-    set_output_active(output_ordinal_t output, bool active);
-
     // Caller must hold the input's lock.
     // The return value is STATUS_EOF if a global exit is now happening (an
     // early exit); otherwise STATUS_OK is returned on success but only a
@@ -880,11 +902,6 @@ template <typename RecordType, typename ReaderType> class scheduler_impl_tmpl_t
     stream_status_t
     eof_or_idle(output_ordinal_t output, input_ordinal_t prev_input);
 
-    // mapping_t-mode specific actions when one output runs out of things to do.
-    // Success return values are either STATUS_IDLE or STATUS_EOF.
-    virtual stream_status_t
-    eof_or_idle_for_mode(output_ordinal_t output, input_ordinal_t prev_input) = 0;
-
     // Returns whether the current record for the current input stream scheduled on
     // the 'output_ordinal'-th output stream is from a part of the trace corresponding
     // to kernel execution.

clients/drcachesim/tests/scheduler_unit_tests.cpp

@@ -3105,7 +3105,6 @@ test_replay_timestamps()
 
 #ifdef HAS_ZIP
 // We subclass scheduler_impl_t to access its record struct and functions.
-// We subclass scheduler_impl_t to access its record struct and functions.
 class test_noeof_scheduler_t : public test_scheduler_base_t {
 public:
     void