fixed bug in attaching nics to hosts, changed documentation format and generator (buggy but usable)

docs/core/error.md

@@ -1,9 +1,15 @@
 # core/error.h
-
-## Free functions
-
-### `std::mutex &error_mutex() noexcept;`
-### `inline T&& show(std::string_view name, T&& value) noexcept { ... }`
-### `std::lock_guard<std::mutex> lock(error_mutex());`
-### `inline T&& eval_and_show(std::string_view expr, T&& value) noexcept { ... }`
-### `std::lock_guard<std::mutex> lock(error_mutex());`
+## `dofs::log_error`
+`void log_error(std::string_view type, std::string_view message, std::optional<uint64_t> timestamp = std::nullopt) noexcept;`
+## `DOFS_ERROR`
+`#define DOFS_ERROR(TYPE, MSG)`
+## `DOFS_ERROR_ST`
+`#define DOFS_ERROR_ST(TYPE, SRC, MSG, TS)`
+## `DOFS_ERROR_T`
+`#define DOFS_ERROR_T(TYPE, MSG, TS)`
+## `DOFS_EVAL`
+`#define DOFS_EVAL(EXPR)`
+## `DOFS_SHOW`
+`#define DOFS_SHOW(VAR)`
+## `FORMAT`
+`#define FORMAT(VAR)`

docs/core/host.md

@@ -1,10 +1,32 @@
 # core/host.h
+## `Host::Host`
+`Host(Simulator *const sim, NodeId id) noexcept`
 
-## class NetworkNic — public interface
+Binds a host to a simulator under the `NodeId` id.
 
-### `Host(Simulator *const sim, NodeId id) noexcept;`
-### `virtual ~Host() = default;`
-### `NetworkNic *nic() const noexcept { ... }`
-### `void attach_nic(NetworkNic* nic) noexcept;`
-### `void detach_nic(NetworkNic* nic) noexcept;`
-### `Host(const Host &) = delete;`
+## `Host::Host`
+`Host(const Host &) = delete`
+
+Binds a host to a simulator under the `NodeId` id.
+
+## `Host::attach_nic`
+`void attach_nic(NetworkNic *nic) noexcept`
+
+Attaches a `NetworkNic` to the host.
+
+## `Host::detach_nic`
+`void detach_nic(NetworkNic *nic) noexcept`
+
+Detaches a `NetworkNic` to the host.
+## `Host::nic`
+`NetworkNic *nic() const noexcept`
+## `Host::operator=`
+`Host &operator=(const Host &) = delete`
+## `Host::recv_flow`
+`virtual void recv_flow(NodeId src, FlowId flow, FlowPriority priority, Bytes flow_size) = 0`
+## `Host::recv_frame`
+`virtual void recv_frame(const Packet &frame) = 0`
+## `Host::recv_mgmt_msg`
+`virtual void recv_mgmt_msg(std::unique_ptr<struct MgmtMsg> msg) = 0`
+## `Host::~Host`
+`virtual ~Host() = default`

docs/core/logger.md

@@ -1,13 +1,31 @@
 # core/logger.h
-
-## class Logger — public interface
-
-### `Logger(std::string_view path, bool append) noexcept;`
-### `~Logger() noexcept;`
-### `Logger(const Logger &) = delete;`
-### `Logger(Logger &&) = delete;`
-### `bool is_open() const noexcept { ... }`
-### `void write_line(std::string_view line) noexcept;`
-### `void flush() noexcept;`
-### `void close() noexcept;`
-### `std::string_view path() const noexcept { ... }`
+## `Logger::Logger`
+`Logger(Logger &&) = delete`
+## `Logger::Logger`
+`Logger(const Logger &) = delete`
+## `Logger::Logger`
+`Logger(std::string_view path, bool append) noexcept`
+## `Logger::close`
+`void close() noexcept`
+## `Logger::flush`
+`void flush() noexcept`
+## `Logger::is_open`
+`bool is_open() const noexcept`
+## `Logger::operator=`
+`Logger &operator=(Logger &&) = delete`
+## `Logger::operator=`
+`Logger &operator=(const Logger &) = delete`
+## `Logger::path`
+`std::string_view path() const noexcept`
+## `Logger::write_line`
+`void write_line(std::string_view line) noexcept`
+## `Logger::~Logger`
+`~Logger() noexcept`
+## `dofs::close`
+`void close() noexcept;`
+## `dofs::flush`
+`void flush() noexcept;`
+## `dofs::write_line`
+`void write_line(std::string_view line) noexcept;`
+## `open`
+`private: bool open(std::ios::openmode mode) noexcept;`

docs/core/node.md

@@ -1,13 +1,21 @@
 # core/node.h
-
-## class Node — public interface
-
-### `Node(Simulator *const sim, NodeId id, NodeType type) noexcept;`
-### `virtual ~Node() = default;`
-### `NodeId id() const noexcept;`
-### `NodeStatus status() const noexcept;`
-### `NodeType type() const noexcept;`
-### `void set_status(NodeStatus s) noexcept;`
-### `void boot(Time boottime_ns);`
-### `void reboot(Time boottime_ns);`
-### `Node(const Node &) = delete;`
+## `Node::Node`
+`Node(Simulator *const sim, NodeId id, NodeType type) noexcept`
+## `Node::Node`
+`Node(const Node &) = delete`
+## `Node::boot`
+`void boot(Time boottime_ns)`
+## `Node::id`
+`NodeId id() const noexcept`
+## `Node::operator=`
+`Node &operator=(const Node &) = delete`
+## `Node::reboot`
+`void reboot(Time boottime_ns)`
+## `Node::set_status`
+`void set_status(NodeStatus s) noexcept`
+## `Node::status`
+`NodeStatus status() const noexcept`
+## `Node::type`
+`NodeType type() const noexcept`
+## `Node::~Node`
+`virtual ~Node() = default`

docs/core/rng.md

@@ -1,16 +1,45 @@
 # core/rng.h
-
-## class Rng — public interface
-
-### `: _eng(seed) { ... }`
-### `void seed(seed_type s) noexcept { ... }`
-### `_eng.seed(s);`
-### `double uniform01() { ... }`
-### `Int uniform_range(Int lo_inclusive, Int hi_exclusive) { ... }`
-### `Int uniform_range(Int hi_exclusive) { ... }`
-### `double uniform_range(double lo_inclusive, double hi_exclusive) { ... }`
-### `std::uint64_t poisson(double lambda) { ... }`
-### `T choose_weighted(const std::vector<std::pair<double, T>>& items) { ... }`
-### `return choose_weighted_impl(items.begin(), items.end());`
-### `T choose_weighted(std::initializer_list<std::pair<double, T>> items) { ... }`
-### `return choose_weighted_impl(items.begin(), items.end());`
+## `Rng::Rng`
+`explicit Rng(seed_type seed = default_seed()) noexcept : _eng(seed)`
+## `Rng::choose_weighted`
+`template<typename T> template<typename T> T choose_weighted(const std::vector<std::pair<double, T>> &items)`
+## `Rng::choose_weighted`
+`template<typename T> template<typename T> T choose_weighted(std::initializer_list<std::pair<double, T>> items)`
+## `Rng::poisson`
+`std::uint64_t poisson(double lambda)`
+## `Rng::seed`
+`void seed(seed_type s) noexcept`
+## `Rng::uniform01`
+`double uniform01()`
+## `Rng::uniform_range`
+`double uniform_range(double lo_inclusive, double hi_exclusive)`
+## `Rng::uniform_range`
+`template<typename Int,
+         typename = std::enable_if_t<std::is_integral<Int>::value>> template<typename Int, typename = std::enable_if_t<std::is_integral<Int>::value>> Int uniform_range(Int hi_exclusive)`
+## `Rng::uniform_range`
+`template<typename Int,
+         typename = std::enable_if_t<std::is_integral<Int>::value>> template<typename Int, typename = std::enable_if_t<std::is_integral<Int>::value>> Int uniform_range(Int lo_inclusive, Int hi_exclusive)`
+## `choose_weighted`
+`template <typename T> T choose_weighted(const std::vector<std::pair<double, T>> &items){`
+## `choose_weighted`
+`template <typename T> T choose_weighted(std::initializer_list<std::pair<double, T>> items){`
+## `choose_weighted_impl`
+`return choose_weighted_impl(items.begin(), items.end());`
+## `choose_weighted_impl`
+`return choose_weighted_impl(items.begin(), items.end());`
+## `choose_weighted_impl`
+`template <typename Iter> auto choose_weighted_impl(Iter first, Iter last) -> typename std::iterator_traits<Iter>::value_type::second_type{`
+## `default_seed`
+`static constexpr seed_type default_seed() noexcept{`
+## `dofs::seed`
+`void seed(seed_type s) noexcept{`
+## `poisson`
+`std::uint64_t poisson(double lambda){`
+## `uniform01`
+`double uniform01(){`
+## `uniform_range`
+`Int uniform_range(Int hi_exclusive){`
+## `uniform_range`
+`Int uniform_range(Int lo_inclusive, Int hi_exclusive){`
+## `uniform_range`
+`double uniform_range(double lo_inclusive, double hi_exclusive){`

docs/core/simulator.md

@@ -1,27 +1,49 @@
 # core/simulator.h
-
-## Free functions
-
-### `std::numeric_limits<InstanceId>::max();`
-### `std::numeric_limits<LinkId>::max();`
-
-## class Rng — public interface
-
-### `Simulator() = default;`
-### `static std::pair<InstanceId, Simulator *> create_simulator(InstanceId id);`
-### `static Simulator *get_simulator(InstanceId id) noexcept;`
-### `Time now() const noexcept;`
-### `EventId schedule_at(Time abs_time, F&& f, Args&&... args) { ... }`
-### `_event_pq.push(std::move(it));`
-### `EventId schedule_after(Time delay, F&& f, Args&&... args) { ... }`
-### `bool cancel(EventId id);`
-### `bool run_next();`
-### `void run_until(Time end_time);`
-### `void lock() noexcept;`
-### `bool is_locked() const noexcept { ... }`
-### `void flush_after(Time grace) noexcept;`
-### `Rng* create_rng(std::uint64_t seed);`
-### `Rng* get_rng() noexcept;`
-### `Rng const* get_rng() const noexcept;`
-### `Link* get_link(LinkId id) noexcept;`
-### `Link const* get_link(LinkId id) const noexcept;`
+## `Simulator::Cmp::operator`
+`bool operator()(const Item &a, const Item &b) const noexcept`
+## `Simulator::Simulator`
+`Simulator() = default`
+## `Simulator::cancel`
+`bool cancel(EventId id)`
+## `Simulator::create_link`
+`std::pair<LinkId, Link *> create_link(NetworkNode *a, PortId a_port, NetworkNode *b, PortId b_port, Time latency, double bandwidth_gbps)`
+## `Simulator::create_rng`
+`Rng *create_rng(std::uint64_t seed)`
+## `Simulator::create_simulator`
+`static std::pair<InstanceId, Simulator *> create_simulator(InstanceId id)`
+## `Simulator::flush_after`
+`void flush_after(Time grace) noexcept`
+## `Simulator::get_link`
+`Link *get_link(LinkId id) noexcept`
+## `Simulator::get_link`
+`Link const *get_link(LinkId id) const noexcept`
+## `Simulator::get_rng`
+`Rng *get_rng() noexcept`
+## `Simulator::get_rng`
+`Rng const *get_rng() const noexcept`
+## `Simulator::get_simulator`
+`static Simulator *get_simulator(InstanceId id) noexcept`
+## `Simulator::is_locked`
+`bool is_locked() const noexcept`
+## `Simulator::lock`
+`void lock() noexcept`
+## `Simulator::now`
+`Time now() const noexcept`
+## `Simulator::run_next`
+`bool run_next()`
+## `Simulator::run_until`
+`void run_until(Time end_time)`
+## `Simulator::schedule_after`
+`template<class F, class... Args> template<class F, class... Args> EventId schedule_after(Time delay, F&&f, Args&&... args)`
+## `Simulator::schedule_at`
+`template<class F, class... Args> template<class F, class... Args> EventId schedule_at(Time abs_time, F&&f, Args&&... args)`
+## `cancel`
+`bool cancel(EventId id);`
+## `flush_after`
+`void flush_after(Time grace) noexcept;`
+## `lock`
+`void lock() noexcept;`
+## `run_next`
+`bool run_next();`
+## `run_until`
+`void run_until(Time end_time);`

docs/core/time.md

@@ -1,36 +1,61 @@
 # core/time.h
-
-## Free functions
-
-### `constexpr Time operator""_ns(unsigned long long v) noexcept { ... }`
-### `return Time::from_ns(static_cast<Time::rep>(v));`
-### `constexpr Time operator""_us(unsigned long long v) noexcept { ... }`
-### `return Time::from_us(static_cast<Time::rep>(v));`
-### `constexpr Time operator""_ms(unsigned long long v) noexcept { ... }`
-### `return Time::from_ms(static_cast<Time::rep>(v));`
-### `constexpr Time operator""_s (unsigned long long v) noexcept { ... }`
-### `return Time::from_s (static_cast<Time::rep>(v));`
-
-## class Time — public interface
-
-### `constexpr Time() : _nsec(0) { ... }`
-### `explicit constexpr Time(rep ns) : _nsec(ns) { ... }`
-### `static constexpr Time from_ns(rep ns) noexcept { ... }`
-### `return Time(ns);`
-### `static constexpr Time from_us(rep us) noexcept { ... }`
-### `return Time(us * 1000ULL);`
-### `static constexpr Time from_ms(rep ms) noexcept { ... }`
-### `return Time(ms * 1000ULL * 1000ULL);`
-### `static constexpr Time from_s (rep s ) noexcept { ... }`
-### `return Time(s * 1000ULL * 1000ULL * 1000ULL);`
-### `constexpr rep ns() const noexcept { ... }`
-### `constexpr rep count() const noexcept { ... }`
-### `static constexpr rep us_to_ns(rep us) noexcept { ... }`
-### `static constexpr rep ms_to_ns(rep ms) noexcept { ... }`
-### `return Time(a._nsec + b._nsec);`
-### `return Time(a._nsec * b._nsec);`
-### `return safe_sub(a, b);`
-### `if (a._nsec < b._nsec) { ... }`
-### `return Time(a._nsec - b._nsec);`
-### `constexpr Time unsafe_sub(Time t) const noexcept { ... }`
-### `return Time(this->_nsec - t._nsec);`
+## `Time`
+`return Time(a._nsec * b._nsec);`
+## `Time`
+`return Time(a._nsec + b._nsec);`
+## `Time`
+`return Time(a._nsec - b._nsec);`
+## `Time`
+`return Time(ms * 1000ULL * 1000ULL);`
+## `Time`
+`return Time(ns);`
+## `Time`
+`return Time(s * 1000ULL * 1000ULL * 1000ULL);`
+## `Time`
+`return Time(this->_nsec - t._nsec);`
+## `Time`
+`return Time(us * 1000ULL);`
+## `Time::Time`
+`constexpr Time() : _nsec(0)`
+## `Time::Time`
+`explicit constexpr Time(rep ns) : _nsec(ns)`
+## `Time::count`
+`constexpr rep count() const noexcept`
+## `Time::from_ms`
+`static constexpr Time from_ms(rep ms) noexcept`
+## `Time::from_ns`
+`static constexpr Time from_ns(rep ns) noexcept`
+## `Time::from_s`
+`static constexpr Time from_s (rep s ) noexcept`
+## `Time::from_us`
+`static constexpr Time from_us(rep us) noexcept`
+## `Time::ms_to_ns`
+`static constexpr rep ms_to_ns(rep ms) noexcept`
+## `Time::ns`
+`constexpr rep ns() const noexcept`
+## `Time::us_to_ns`
+`static constexpr rep us_to_ns(rep us) noexcept`
+## `_ms`
+`constexpr Time operator _ms(unsigned long long v) noexcept{`
+## `_ns`
+`constexpr Time operator _ns(unsigned long long v) noexcept{`
+## `_s`
+`constexpr Time operator _s (unsigned long long v) noexcept{`
+## `_us`
+`constexpr Time operator _us(unsigned long long v) noexcept{`
+## `from_ms`
+`static constexpr Time from_ms(rep ms) noexcept{`
+## `from_ns`
+`static constexpr Time from_ns(rep ns) noexcept{`
+## `from_s`
+`static constexpr Time from_s (rep s ) noexcept{`
+## `from_us`
+`static constexpr Time from_us(rep us) noexcept{`
+## `ms_to_ns`
+`static constexpr rep ms_to_ns(rep ms) noexcept{`
+## `safe_sub`
+`friend constexpr std::optional<Time> safe_sub(Time a, Time b) noexcept{`
+## `safe_sub`
+`return safe_sub(a, b);`
+## `us_to_ns`
+`static constexpr rep us_to_ns(rep us) noexcept{`

docs/core/timer.md

@@ -1,13 +1,13 @@
 # core/timer.h
-
-## class Timer — public interface
-
-### `Timer() { ... }`
-### `init();`
-### `void init() noexcept { ... }`
-### `_start = clock::now();`
-### `Time start() const noexcept { ... }`
-### `auto tp = _start.time_since_epoch();`
-### `Time now() const noexcept { ... }`
-### `auto tp = clock::now().time_since_epoch();`
-### `Time elapsed() const noexcept { ... }`
+## `Timer::Timer`
+`Timer()`
+## `Timer::elapsed`
+`Time elapsed() const noexcept`
+## `Timer::init`
+`void init() noexcept`
+## `Timer::now`
+`Time now() const noexcept`
+## `Timer::start`
+`Time start() const noexcept`
+## `dofs::init`
+`void init() noexcept{`

docs/core/types.md

@@ -1,6 +1,3 @@
 # core/types.h
-
-## Free functions
-
-### `inline IPv4Addr ipv4(NodeId n, PortId p) noexcept { ... }`
-### `return (static_cast<uint32_t>(n) << 16) | static_cast<uint32_t>(p);`
+## `dofs::ipv4`
+`inline IPv4Addr ipv4(NodeId n, PortId p) noexcept{`

docs/hosts/mgmt_msg.md

@@ -1,19 +1,15 @@
 # hosts/mgmt_msg.h
-
-## class MgmtMsg — public interface
-
-### `virtual ~MgmtMsg() = default;`
-
-## class HeartbeatMsg — public interface
-
-### `: subscriber_id(sid), status(st), generated_at(t) { ... }`
-### `MgmtKind kind() const noexcept override { ... }`
-
-## class JobFinishedMsg — public interface
-
-### `: flow_id(fid), finished_at(t) { ... }`
-### `MgmtKind kind() const noexcept override { ... }`
-
-## class EndSimulationMsg — public interface
-
-### `MgmtKind kind() const noexcept override { ... }`
+## `EndSimulationMsg::kind`
+`MgmtKind kind() const noexcept override`
+## `HeartbeatMsg::HeartbeatMsg`
+`explicit HeartbeatMsg(NodeId sid, NodeStatus st, Time t) noexcept : subscriber_id(sid), status(st), generated_at(t)`
+## `HeartbeatMsg::kind`
+`MgmtKind kind() const noexcept override`
+## `JobFinishedMsg::JobFinishedMsg`
+`explicit JobFinishedMsg(FlowId fid, Time t) noexcept : flow_id(fid), finished_at(t)`
+## `JobFinishedMsg::kind`
+`MgmtKind kind() const noexcept override`
+## `MgmtMsg::kind`
+`virtual MgmtKind kind() const noexcept = 0`
+## `MgmtMsg::~MgmtMsg`
+`virtual ~MgmtMsg() = default`

docs/hosts/policies.md

@@ -1,20 +1,13 @@
 # hosts/policies.h
-
-## class PubBasePolicy — public interface
-
-### `virtual ~PubBasePolicy() = default;`
-
-## class PubRRPolicy — public interface
-
-### `: _ranges(std::move(ranges)) { ... }`
-### `validate_and_build();`
-### `PacketGroups select_multicast_groups(PacketGroups update_groups_mask) override { ... }`
-### `for (auto const& r : _ranges) { ... }`
-
-## class SubBasePolicy — public interface
-
-### `virtual ~SubBasePolicy() = default;`
-
-## class SubDummyPolicy — public interface
-
-### `~SubDummyPolicy() override = default;`
+## `PubBasePolicy::select_multicast_groups`
+`virtual PacketGroups select_multicast_groups(PacketGroups update_groups_mask) = 0`
+## `PubBasePolicy::~PubBasePolicy`
+`virtual ~PubBasePolicy() = default`
+## `PubRRPolicy::PubRRPolicy`
+`explicit PubRRPolicy(std::vector<ReplicaRange> ranges) : _ranges(std::move(ranges))`
+## `PubRRPolicy::select_multicast_groups`
+`PacketGroups select_multicast_groups(PacketGroups update_groups_mask) override`
+## `group_present`
+`static bool group_present(PacketGroups mask, uint32_t gid) noexcept{`
+## `validate_and_build`
+`void validate_and_build(){`

docs/hosts/publisher.md

@@ -1,10 +1,25 @@
 # hosts/publisher.h
-
-## class Publisher — public interface
-
-### `void recv_update(Bytes size, PacketGroups update_groups_mask) noexcept;`
-### `void set_status(NodeStatus s, Time new_latency = Time{}) noexcept;`
-### `virtual void recv_mgmt_msg(MgmtMsgPtr msg) noexcept override;`
-### `virtual void recv_frame(const Packet& frame) override;`
-### `uint64_t updates_in() const noexcept { ... }`
-### `uint64_t bytes_out() const noexcept { ... }`
+## `Publisher::Pending::arm_staging_if_needed`
+`void arm_staging_if_needed() noexcept`
+## `Publisher::Pending::on_staging_timer`
+`void on_staging_timer() noexcept`
+## `Publisher::Publisher`
+`Publisher(Simulator *sim, NodeId id, Time update_latency_base, std::unique_ptr<PubBasePolicy> policy, Time mgmt_latency) noexcept`
+## `Publisher::bytes_out`
+`uint64_t bytes_out() const noexcept`
+## `Publisher::recv_flow`
+`virtual void recv_flow(NodeId src, FlowId flow, FlowPriority prio, Bytes flow_size) override`
+## `Publisher::recv_frame`
+`virtual void recv_frame(const Packet &frame) override`
+## `Publisher::recv_mgmt_msg`
+`virtual void recv_mgmt_msg(MgmtMsgPtr msg) noexcept override`
+## `Publisher::recv_update`
+`void recv_update(Bytes size, PacketGroups update_groups_mask) noexcept`
+## `Publisher::set_status`
+`void set_status(NodeStatus s, Time new_latency = Time{}) noexcept`
+## `Publisher::updates_in`
+`uint64_t updates_in() const noexcept`
+## `arm_staging_if_needed`
+`void arm_staging_if_needed() noexcept;`
+## `on_staging_timer`
+`void on_staging_timer() noexcept;`

docs/hosts/subscriber.md

@@ -1,8 +1,19 @@
 # hosts/subscriber.h
-
-## class Publisher — public interface
-
-### `virtual void recv_mgmt_msg(MgmtMsgPtr msg) noexcept override;`
-### `void recv_frame(const Packet& frame) override;`
-### `void set_status(NodeStatus s) noexcept;`
-### `void set_publisher(Publisher* p) noexcept { ... }`
+## `Subscriber::Subscriber`
+`Subscriber(Simulator *sim, NodeId id, Publisher *publisher, std::unique_ptr<SubBasePolicy> policy, Time mgmt_latency, Time heartbeat_period) noexcept`
+## `Subscriber::recv_flow`
+`void recv_flow(NodeId src, FlowId flow, FlowPriority prio, Bytes flow_size) override`
+## `Subscriber::recv_frame`
+`void recv_frame(const Packet &frame) override`
+## `Subscriber::recv_mgmt_msg`
+`virtual void recv_mgmt_msg(MgmtMsgPtr msg) noexcept override`
+## `Subscriber::set_publisher`
+`void set_publisher(Publisher *p) noexcept`
+## `Subscriber::set_status`
+`void set_status(NodeStatus s) noexcept`
+## `dofs::on_heartbeat_timer`
+`void on_heartbeat_timer() noexcept;`
+## `dofs::schedule_next_heartbeat`
+`void schedule_next_heartbeat(Time delay) noexcept;`
+## `dofs::send_job_finished`
+`void send_job_finished(FlowId flow) noexcept;`

docs/network/link.md

@@ -1,19 +1,37 @@
 # network/link.h
-
-## class Link — public interface
-
-### `void send_pkt(Packet &pkt, NodeId caller);`
-### `void schedule_delivery_after(Packet &pkt, NodeId caller, Time after);`
-### `Time next_available(NodeId sender) const noexcept;`
-### `std::optional<Reservation> reserve(Bytes bytes, NodeId sender) noexcept;`
-### `Time serialization_time(Bytes bytes) const noexcept { ... }`
-### `return serialization_time(bytes, _bandwidth_gbps_cur);`
-### `Time propagation_latency() const noexcept { ... }`
-### `LinkId id() const noexcept { ... }`
-### `LinkStatus status() const noexcept { ... }`
-### `double bandwidth_gbps() const noexcept { ... }`
-### `NodeId src_id() const noexcept { ... }`
-### `NodeId dst_id() const noexcept { ... }`
-### `PortId src_port() const noexcept { ... }`
-### `PortId dst_port() const noexcept { ... }`
-### `static Time serialization_time(Bytes bytes, double gbps) noexcept;`
+## `Link::Link`
+`Link(Simulator *const sim, LinkId id, NetworkNode *a, PortId a_port, NetworkNode *b, PortId b_port, Time latency, double bandwidth_gbps) noexcept`
+## `Link::bandwidth_gbps`
+`double bandwidth_gbps() const noexcept`
+## `Link::dst_id`
+`NodeId dst_id() const noexcept`
+## `Link::dst_port`
+`PortId dst_port() const noexcept`
+## `Link::id`
+`LinkId id() const noexcept`
+## `Link::next_available`
+`Time next_available(NodeId sender) const noexcept`
+## `Link::propagation_latency`
+`Time propagation_latency() const noexcept`
+## `Link::reserve`
+`std::optional<Reservation> reserve(Bytes bytes, NodeId sender) noexcept`
+## `Link::schedule_delivery_after`
+`void schedule_delivery_after(Packet &pkt, NodeId caller, Time after)`
+## `Link::send_pkt`
+`void send_pkt(Packet &pkt, NodeId caller)`
+## `Link::serialization_time`
+`Time serialization_time(Bytes bytes) const noexcept`
+## `Link::serialization_time`
+`static Time serialization_time(Bytes bytes, double gbps) noexcept`
+## `Link::set_status`
+`void set_status(LinkStatus s, Time new_latency = Time(0), double new_bandwidth_gbps = 0.0)`
+## `Link::src_id`
+`NodeId src_id() const noexcept`
+## `Link::src_port`
+`PortId src_port() const noexcept`
+## `Link::status`
+`LinkStatus status() const noexcept`
+## `serialization_time`
+`static Time serialization_time(Bytes bytes, double gbps) noexcept;`
+## `set_status`
+`void set_status(LinkStatus s, Time new_latency = Time(0), double new_bandwidth_gbps = 0.0);`

docs/network/network_nic.md

@@ -1,11 +1,95 @@
 # network/network_nic.h
-
-## class NetworkNic — public interface
-
-### `virtual void recv_pkt(Packet &pkt, PortId ingress) override;`
-### `void attach_host(Host* host) noexcept;`
-### `void detach_host(Host* host) noexcept;`
-### `void set_status(NodeStatus s, Time new_latency = Time(0)) noexcept;`
-### `const NicTelemetry &telemetry() const noexcept { ... }`
-### `void set_port_blacklisted(PortId port, bool blacklisted) noexcept;`
-### `bool is_port_blacklisted(PortId port) const noexcept;`
+## `NicSchedulingWeights::NetworkNic::NetworkNic`
+`NetworkNic(Simulator *const sim, NodeId id, uint16_t total_ports, SwitchBuffer *const buf, Time nic_latency, Bytes mice_elephant_threshold, PacketSeq ooo_threshold, CCType cc_type, LBType lb_type, Bytes cc_init_cwnd, Bytes cc_max_cwnd, const NicSchedulingWeights &schedw) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::enqueue_packet`
+`void enqueue_packet(PortId port, QClass cls, Packet pkt) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::is_elephant`
+`bool is_elephant(Bytes sz) const noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::lookup_rtt_and_erase`
+`bool lookup_rtt_and_erase(const Packet &ack_like, Time now, Time &out_rtt) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::make_ack_packet`
+`Packet make_ack_packet(const Packet &rx_data, PortId ingress) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::make_data_packet`
+`Packet make_data_packet(NodeId dst, PortId out_port, FlowPriority prio, FlowId fid, PacketSeq seq, Bytes payload) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::make_nack_packet`
+`Packet make_nack_packet(NodeId peer, FlowId flow, PacketSeq miss, FlowPriority prio, PortId ingress) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::make_trim_back_response`
+`Packet make_trim_back_response(const Packet &trim, PortId ingress) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::pick_next_qclass`
+`bool pick_next_qclass(const PortQueues &pq, QClass &out_cls) const noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::pick_src_port_for_flow`
+`PortId pick_src_port_for_flow(NodeId dst) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::port_drain_task`
+`void port_drain_task(PortId port) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::record_tx_timestamp`
+`void record_tx_timestamp(const Packet &pkt) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::schedule_ack`
+`void schedule_ack(const Packet &rx_data, PortId ingress) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::schedule_nack`
+`void schedule_nack(NodeId peer, FlowId flow, PacketSeq missing_seq, FlowPriority prio, PortId ingress) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::schedule_port_if_needed`
+`void schedule_port_if_needed(PortId port) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::schedule_trim_back_response`
+`void schedule_trim_back_response(const Packet &trim, PortId ingress) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::start_tx_multicast`
+`void start_tx_multicast(PacketGroups gmask, Bytes size, FlowPriority prio)`
+## `NicSchedulingWeights::NetworkNic::PortQueues::start_tx_unicast`
+`void start_tx_unicast(NodeId dst, Bytes size, FlowPriority prio)`
+## `NicSchedulingWeights::NetworkNic::PortQueues::try_send_one`
+`bool try_send_one(PortId port, QClass cls) noexcept`
+## `NicSchedulingWeights::NetworkNic::PortQueues::txkey`
+`static inline std::uint64_t txkey(FlowId f, PacketSeq s) noexcept`
+## `NicSchedulingWeights::NetworkNic::attach_host`
+`void attach_host(Host *host) noexcept`
+## `NicSchedulingWeights::NetworkNic::detach_host`
+`void detach_host(Host *host) noexcept`
+## `NicSchedulingWeights::NetworkNic::is_port_blacklisted`
+`bool is_port_blacklisted(PortId port) const noexcept`
+## `NicSchedulingWeights::NetworkNic::recv_pkt`
+`virtual void recv_pkt(Packet &pkt, PortId ingress) override`
+## `NicSchedulingWeights::NetworkNic::send_flow`
+`void send_flow(NodeId dst, Bytes size, FlowPriority desired = FlowPriority::AUTO)`
+## `NicSchedulingWeights::NetworkNic::send_flow`
+`void send_flow(PacketGroups group_mask, Bytes size, FlowPriority desired = FlowPriority::AUTO)`
+## `NicSchedulingWeights::NetworkNic::set_port_blacklisted`
+`void set_port_blacklisted(PortId port, bool blacklisted) noexcept`
+## `NicSchedulingWeights::NetworkNic::set_status`
+`void set_status(NodeStatus s, Time new_latency = Time(0)) noexcept`
+## `NicSchedulingWeights::NetworkNic::telemetry`
+`const NicTelemetry &telemetry() const noexcept`
+## `enqueue_packet`
+`void enqueue_packet(PortId port, QClass cls, Packet pkt) noexcept;`
+## `lookup_rtt_and_erase`
+`bool lookup_rtt_and_erase(const Packet &ack_like, Time now, Time &out_rtt) noexcept;`
+## `make_ack_packet`
+`Packet make_ack_packet(const Packet &rx_data, PortId ingress) noexcept;`
+## `make_data_packet`
+`Packet make_data_packet(NodeId dst, PortId out_port, FlowPriority prio, FlowId fid, PacketSeq seq, Bytes payload) noexcept;`
+## `make_nack_packet`
+`Packet make_nack_packet(NodeId peer, FlowId flow, PacketSeq miss, FlowPriority prio, PortId ingress) noexcept;`
+## `make_trim_back_response`
+`Packet make_trim_back_response(const Packet &trim, PortId ingress) noexcept;`
+## `pick_src_port_for_flow`
+`PortId pick_src_port_for_flow(NodeId dst) noexcept;`
+## `port_drain_task`
+`void port_drain_task(PortId port) noexcept;`
+## `record_tx_timestamp`
+`void record_tx_timestamp(const Packet &pkt) noexcept;`
+## `schedule_ack`
+`void schedule_ack(const Packet &rx_data, PortId ingress) noexcept;`
+## `schedule_nack`
+`void schedule_nack(NodeId peer, FlowId flow, PacketSeq missing_seq, FlowPriority prio, PortId ingress) noexcept;`
+## `schedule_port_if_needed`
+`void schedule_port_if_needed(PortId port) noexcept;`
+## `schedule_trim_back_response`
+`void schedule_trim_back_response(const Packet &trim, PortId ingress) noexcept;`
+## `set_port_blacklisted`
+`void set_port_blacklisted(PortId port, bool blacklisted) noexcept;`
+## `start_tx_multicast`
+`void start_tx_multicast(PacketGroups gmask, Bytes size, FlowPriority prio);`
+## `start_tx_unicast`
+`void start_tx_unicast(NodeId dst, Bytes size, FlowPriority prio);`
+## `try_send_one`
+`bool try_send_one(PortId port, QClass cls) noexcept;`
+## `txkey`
+`static inline std::uint64_t txkey(FlowId f, PacketSeq s) noexcept;`

docs/network/network_node.md

@@ -1,6 +1,7 @@
 # network/network_node.h
-
-## class NetworkNode — public interface
-
-### `explicit NetworkNode(Simulator *const sim, NodeId id, NodeType type) noexcept;`
-### `virtual ~NetworkNode() = default;`
+## `NetworkNode::NetworkNode`
+`explicit NetworkNode(Simulator *const sim, NodeId id, NodeType type) noexcept`
+## `NetworkNode::recv_pkt`
+`virtual void recv_pkt(Packet &pkt, PortId ingress) = 0`
+## `NetworkNode::~NetworkNode`
+`virtual ~NetworkNode() = default`

docs/network/network_switch.md

@@ -1,9 +1,19 @@
 # network/network_switch.h
-
-## class NetworkSwitch — public interface
-
-### `virtual void recv_pkt(Packet &pkt, PortId ingress) override;`
-### `void set_status(NodeStatus s, Time new_forward_latency = Time(0)) noexcept;`
-### `NodeStatus get_status() const noexcept { ... }`
-### `return status();`
-### `uint16_t port_cnt() const noexcept { ... }`
+## `NetworkSwitch::NetworkSwitch`
+`NetworkSwitch(Simulator *const sim, NodeId id, uint16_t total_ports, ECNEngine *const ecn, SwitchBuffer *const buf, const RoutingTables *const rt, Time forwarding_latency, Time multicast_dup_delay) noexcept`
+## `NetworkSwitch::get_status`
+`NodeStatus get_status() const noexcept`
+## `NetworkSwitch::port_cnt`
+`uint16_t port_cnt() const noexcept`
+## `NetworkSwitch::recv_pkt`
+`virtual void recv_pkt(Packet &pkt, PortId ingress) override`
+## `NetworkSwitch::set_status`
+`void set_status(NodeStatus s, Time new_forward_latency = Time(0)) noexcept`
+## `enqueue_one`
+`void enqueue_one(Packet pkt, PortId egress, FlowPriority prio) noexcept;`
+## `forward_after_delay`
+`private: void forward_after_delay(Packet pkt, PortId ingress) noexcept;`
+## `group_bit_set`
+`static inline bool group_bit_set(PacketGroups mask, std::size_t gid) noexcept;`
+## `merge_sorted_unique`
+`static void merge_sorted_unique(std::vector<PortId> &base, const std::vector<PortId> &add);`

docs/network/nic/congestion_control.md

@@ -1,18 +1,21 @@
 # network/nic/congestion_control.h
-
-## class CongestionControl — public interface
-
-### `explicit CongestionControl(Bytes init_cwnd, Bytes max_cwnd) noexcept;`
-### `virtual ~CongestionControl() = default;`
-### `Bytes cwnd() const noexcept { ... }`
-### `Bytes cwnd_max() const noexcept { ... }`
-
-## class DCQCN — public interface
-
-### `explicit DCQCN(Bytes init_cwnd, Bytes max_cwnd) noexcept;`
-### `virtual void update(const Packet& pkt, Time rtt) noexcept override;`
-
-## class NSCC — public interface
-
-### `explicit NSCC(Bytes init_cwnd, Bytes max_cwnd) noexcept;`
-### `virtual void update(const Packet& pkt, Time rtt) noexcept override;`
+## `CongestionControl::CongestionControl`
+`explicit CongestionControl(Bytes init_cwnd, Bytes max_cwnd) noexcept`
+## `CongestionControl::cwnd`
+`Bytes cwnd() const noexcept`
+## `CongestionControl::cwnd_max`
+`Bytes cwnd_max() const noexcept`
+## `CongestionControl::is_allowed_to_send`
+`virtual bool is_allowed_to_send(Bytes bytes_outstanding, Bytes next_bytes) const noexcept`
+## `CongestionControl::update`
+`virtual void update(const Packet &pkt, Time rtt) noexcept = 0`
+## `CongestionControl::~CongestionControl`
+`virtual ~CongestionControl() = default`
+## `DCQCN::DCQCN`
+`explicit DCQCN(Bytes init_cwnd, Bytes max_cwnd) noexcept`
+## `DCQCN::update`
+`virtual void update(const Packet &pkt, Time rtt) noexcept override`
+## `NSCC::NSCC`
+`explicit NSCC(Bytes init_cwnd, Bytes max_cwnd) noexcept`
+## `NSCC::update`
+`virtual void update(const Packet &pkt, Time rtt) noexcept override`

docs/network/nic/load_balance.md

@@ -1,12 +1,15 @@
 # network/nic/load_balance.h
-
-## class LoadBalance — public interface
-
-### `explicit LoadBalance(Rng *const rng) noexcept : _rng(rng) { ... }`
-### `virtual ~LoadBalance() = default;`
-
-## class LBRandomPacketSpraying — public interface
-
-### `explicit LBRandomPacketSpraying(Rng *const rng) noexcept : LoadBalance(rng) { ... }`
-### `virtual void update(const Packet& pkt) noexcept override;`
-### `virtual uint16_t get_entropy(const Packet& context) noexcept override;`
+## `LBRandomPacketSpraying::LBRandomPacketSpraying`
+`explicit LBRandomPacketSpraying(Rng *const rng) noexcept : LoadBalance(rng)`
+## `LBRandomPacketSpraying::get_entropy`
+`virtual uint16_t get_entropy(const Packet &context) noexcept override`
+## `LBRandomPacketSpraying::update`
+`virtual void update(const Packet &pkt) noexcept override`
+## `LoadBalance::LoadBalance`
+`explicit LoadBalance(Rng *const rng) noexcept : _rng(rng)`
+## `LoadBalance::get_entropy`
+`virtual uint16_t get_entropy(const Packet &context) noexcept = 0`
+## `LoadBalance::update`
+`virtual void update(const Packet &pkt) noexcept = 0`
+## `LoadBalance::~LoadBalance`
+`virtual ~LoadBalance() = default`

docs/network/nic/nic_telemetry.md

@@ -0,0 +1,2 @@
+# network/nic/nic_telemetry.h
+_No public API symbols found in this header._

docs/network/packet.md

@@ -1,35 +1,65 @@
 # network/packet.h
-
-## class Packet — public interface
-
-### `NodeId src_node() const noexcept;`
-### `PortId src_port() const noexcept;`
-### `NodeId dst_node() const noexcept;`
-### `PortId dst_port() const noexcept;`
-### `PacketProtocol protocol() const noexcept;`
-### `PacketSeq seq() const noexcept;`
-### `FlowId flow_id() const noexcept;`
-### `uint32_t entropy() const noexcept;`
-### `void set_src_node(NodeId n) noexcept;`
-### `void set_src_port(PortId p) noexcept;`
-### `void set_dst_node(NodeId n) noexcept;`
-### `void set_dst_port(PortId p) noexcept;`
-### `void set_seq(PacketSeq s) noexcept;`
-### `void set_flow_id(FlowId f) noexcept;`
-### `void set_entropy(uint32_t e) noexcept;`
-### `void set_protocol(PacketProtocol p) noexcept;`
-### `void set_payload_size(Bytes size) noexcept;`
-### `void set_ecn_enabled(bool v) noexcept;`
-### `void set_ecn_marked(bool v) noexcept;`
-### `void set_eof(bool v) noexcept;`
-### `bool is_ecn_enabled() const noexcept;`
-### `bool is_ecn() const noexcept;`
-### `bool is_eof() const noexcept;`
-### `FlowPriority priority() const noexcept;`
-### `uint8_t priority_raw() const noexcept;`
-### `Bytes header_size() const noexcept;`
-### `Bytes payload_size() const noexcept;`
-### `Bytes total_size() const noexcept;`
-### `PacketGroups groups() const noexcept;`
-### `void set_groups(PacketGroups g) noexcept;`
-### `void add_groups(PacketGroups gmask) noexcept;`
+## `Packet::Packet`
+`Packet(NodeId src_node, PortId src_port, NodeId dst_node, PortId dst_port, PacketProtocol proto, FlowPriority prio, PacketSeq seq = 0, FlowId flow = 0, uint16_t entropy = 0, uint8_t notifications = 0, Bytes payload_bytes = DEFAULT_MSS_BYTES) noexcept`
+## `Packet::add_groups`
+`void add_groups(PacketGroups gmask) noexcept`
+## `Packet::dst_node`
+`NodeId dst_node() const noexcept`
+## `Packet::dst_port`
+`PortId dst_port() const noexcept`
+## `Packet::entropy`
+`uint32_t entropy() const noexcept`
+## `Packet::flow_id`
+`FlowId flow_id() const noexcept`
+## `Packet::groups`
+`PacketGroups groups() const noexcept`
+## `Packet::header_size`
+`Bytes header_size() const noexcept`
+## `Packet::is_ecn`
+`bool is_ecn() const noexcept`
+## `Packet::is_ecn_enabled`
+`bool is_ecn_enabled() const noexcept`
+## `Packet::is_eof`
+`bool is_eof() const noexcept`
+## `Packet::payload_size`
+`Bytes payload_size() const noexcept`
+## `Packet::priority`
+`FlowPriority priority() const noexcept`
+## `Packet::priority_raw`
+`uint8_t priority_raw() const noexcept`
+## `Packet::protocol`
+`PacketProtocol protocol() const noexcept`
+## `Packet::seq`
+`PacketSeq seq() const noexcept`
+## `Packet::set_dst_node`
+`void set_dst_node(NodeId n) noexcept`
+## `Packet::set_dst_port`
+`void set_dst_port(PortId p) noexcept`
+## `Packet::set_ecn_enabled`
+`void set_ecn_enabled(bool v) noexcept`
+## `Packet::set_ecn_marked`
+`void set_ecn_marked(bool v) noexcept`
+## `Packet::set_entropy`
+`void set_entropy(uint32_t e) noexcept`
+## `Packet::set_eof`
+`void set_eof(bool v) noexcept`
+## `Packet::set_flow_id`
+`void set_flow_id(FlowId f) noexcept`
+## `Packet::set_groups`
+`void set_groups(PacketGroups g) noexcept`
+## `Packet::set_payload_size`
+`void set_payload_size(Bytes size) noexcept`
+## `Packet::set_protocol`
+`void set_protocol(PacketProtocol p) noexcept`
+## `Packet::set_seq`
+`void set_seq(PacketSeq s) noexcept`
+## `Packet::set_src_node`
+`void set_src_node(NodeId n) noexcept`
+## `Packet::set_src_port`
+`void set_src_port(PortId p) noexcept`
+## `Packet::src_node`
+`NodeId src_node() const noexcept`
+## `Packet::src_port`
+`PortId src_port() const noexcept`
+## `Packet::total_size`
+`Bytes total_size() const noexcept`

docs/network/switch/dedicated_buffer.md

@@ -1,5 +1,7 @@
 # network/switch/dedicated_buffer.h
-
-## class DedicatedBuffer — public interface
-
-### `bool drain_one(PortId port) override;`
+## `DedicatedBuffer::DedicatedBuffer`
+`DedicatedBuffer(Simulator *const sim, NetworkSwitch *const owner, Bytes total_bytes, uint16_t ports)`
+## `DedicatedBuffer::drain_one`
+`bool drain_one(PortId port) override`
+## `DedicatedBuffer::enqueue_packet`
+`bool enqueue_packet(const Packet &pkt, PortId egress, FlowPriority prio) override`

docs/network/switch/ecn_dedicated_red.md

@@ -1,5 +1,7 @@
 # network/switch/ecn_dedicated_red.h
-
-## class DedicatedREDEngine — public interface
-
-### `_rng(rng) { ... }`
+## `DedicatedREDEngine::DedicatedREDEngine`
+`DedicatedREDEngine(Bytes min_th, Bytes max_th, double p_max, bool back_to_sender, Rng *const rng) noexcept : _min_th(min_th), _max_th(max_th), _p_max(p_max), _back_to_sender(back_to_sender), _rng(rng)`
+## `DedicatedREDEngine::process_packet`
+`virtual Packet &process_packet(Packet &pkt, SwitchBuffer *buf) noexcept override`
+## `dofs::ensure_size`
+`private: void ensure_size(uint16_t port_cnt){`

docs/network/switch/ecn_engine.md

@@ -1,5 +1,7 @@
 # network/switch/ecn_engine.h
-
-## class SwitchBuffer — public interface
-
-### `virtual ~ECNEngine() = default;`
+## `ECNEngine::process_packet`
+`virtual Packet &process_packet(Packet &pkt, SwitchBuffer *buf) noexcept = 0`
+## `ECNEngine::~ECNEngine`
+`virtual ~ECNEngine() = default`
+## `dofs::header_trim`
+`static inline void header_trim(Packet &pkt, bool back_to_sender) noexcept{`

docs/network/switch/ecn_shared_red.md

@@ -1,5 +1,13 @@
 # network/switch/ecn_shared_red.h
-
-## class SharedREDEngine — public interface
-
-### `_avg_port_bytes() { ... }`
+## `SharedREDEngine::SharedREDEngine`
+`explicit SharedREDEngine(Rng *const rng = nullptr) noexcept : _rng(rng), _avg_total_bytes(0.0), _avg_port_bytes()`
+## `SharedREDEngine::process_packet`
+`virtual Packet &process_packet(Packet &pkt, SwitchBuffer *buf) noexcept override`
+## `dofs::ensure_size`
+`private: void ensure_size(uint16_t port_cnt){`
+## `is_ctrl`
+`static inline bool is_ctrl(const Packet &p) noexcept{`
+## `is_ele`
+`static inline bool is_ele (const Packet &p) noexcept{`
+## `is_mice`
+`static inline bool is_mice(const Packet &p) noexcept{`

docs/network/switch/multicast_table.md

@@ -1,15 +1,23 @@
 # network/switch/multicast_table.h
-
-## class MulticastTable — public interface
-
-### `MulticastTable();`
-### `bool add_tree(std::size_t group_id, uint16_t tree_id);`
-### `bool delete_tree(std::size_t group_id, uint16_t tree_id);`
-### `bool add_child_port(std::size_t group_id, uint16_t tree_id, PortId out_port);`
-### `bool delete_child_port(std::size_t group_id, uint16_t tree_id, PortId out_port);`
-### `bool set_parent(std::size_t group_id, uint16_t tree_id, PortId parent);`
-### `bool set_weight(std::size_t group_id, uint16_t tree_id, uint8_t w);`
-### `bool set_epoch(std::size_t group_id, uint16_t tree_id, uint8_t epoch);`
-### `const std::vector<McTree> *trees_of(std::size_t group_id) const;`
-### `std::size_t group_count() const noexcept;`
-### `std::vector<PortId> get_port_list(PacketGroups groups) const;`
+## `McTree::MulticastTable::MulticastTable`
+`MulticastTable()`
+## `McTree::MulticastTable::add_child_port`
+`bool add_child_port(std::size_t group_id, uint16_t tree_id, PortId out_port)`
+## `McTree::MulticastTable::add_tree`
+`bool add_tree(std::size_t group_id, uint16_t tree_id)`
+## `McTree::MulticastTable::delete_child_port`
+`bool delete_child_port(std::size_t group_id, uint16_t tree_id, PortId out_port)`
+## `McTree::MulticastTable::delete_tree`
+`bool delete_tree(std::size_t group_id, uint16_t tree_id)`
+## `McTree::MulticastTable::get_port_list`
+`std::vector<PortId> get_port_list(PacketGroups groups) const`
+## `McTree::MulticastTable::group_count`
+`std::size_t group_count() const noexcept`
+## `McTree::MulticastTable::set_epoch`
+`bool set_epoch(std::size_t group_id, uint16_t tree_id, uint8_t epoch)`
+## `McTree::MulticastTable::set_parent`
+`bool set_parent(std::size_t group_id, uint16_t tree_id, PortId parent)`
+## `McTree::MulticastTable::set_weight`
+`bool set_weight(std::size_t group_id, uint16_t tree_id, uint8_t w)`
+## `McTree::MulticastTable::trees_of`
+`const std::vector<McTree> *trees_of(std::size_t group_id) const`

docs/network/switch/routing_alg.md

@@ -0,0 +1,7 @@
+# network/switch/routing_alg.h
+## `dofs::hash_ecmp`
+`PortId hash_ecmp(NodeId src_node, PortId src_port, NodeId dst_node, PortId dst_port, uint32_t differentiator, uint16_t port_count) noexcept;`
+## `dofs::hash_ecmp`
+`inline PortId hash_ecmp(NodeId src_node, NodeId dst_node, uint32_t differentiator, uint16_t port_count) noexcept{`
+## `dofs::hash_ecmp`
+`return hash_ecmp(src_node, static_cast<PortId>(0), dst_node, static_cast<PortId>(0), differentiator, port_count);`

docs/network/switch/routing_tables.md

@@ -0,0 +1,2 @@
+# network/switch/routing_tables.h
+_No public API symbols found in this header._

docs/network/switch/shared_buffer.md

@@ -1,5 +1,7 @@
 # network/switch/shared_buffer.h
-
-## class SharedBuffer — public interface
-
-### `virtual bool drain_one(PortId port) override;`
+## `SharedBuffer::SharedBuffer`
+`SharedBuffer(Simulator *const sim, NetworkSwitch *const owner, Bytes total_bytes, uint16_t ports)`
+## `SharedBuffer::drain_one`
+`virtual bool drain_one(PortId port) override`
+## `SharedBuffer::enqueue_packet`
+`virtual bool enqueue_packet(const Packet &pkt, PortId egress, FlowPriority prio) override`

docs/network/switch/switch_buffer.md

@@ -1,19 +1,65 @@
 # network/switch/switch_buffer.h
-
-## class NetworkSwitch — public interface
-
-### `virtual ~SwitchBuffer() = default;`
-### `Bytes buffer_size() const noexcept;`
-### `SwitchBufferType type() const noexcept;`
-### `uint16_t port_cnt() const noexcept;`
-### `Bytes port_buffered(PortId p) const noexcept;`
-### `const std::vector<Bytes> &ports_buffered() const noexcept;`
-### `uint8_t share_ctrl() const noexcept;`
-### `uint8_t share_mice() const noexcept;`
-### `uint8_t share_elephant() const noexcept;`
-### `void set_share_ctrl(uint8_t pct) noexcept;`
-### `void set_share_mice(uint8_t pct) noexcept;`
-### `void set_share_elephant(uint8_t pct) noexcept;`
-### `const Simulator *simulator() const noexcept;`
-### `const NetworkSwitch *owner() const noexcept;`
-### `void set_egress_links(const std::vector<Link*> &links);`
+## `SwitchBuffer::PerPortSched::drain_once`
+`void drain_once(PortId port)`
+## `SwitchBuffer::PerPortSched::drain_one_common`
+`bool drain_one_common(PortId port)`
+## `SwitchBuffer::PerPortSched::on_dequeue_commit`
+`virtual void on_dequeue_commit(PortId port, Bytes sz) = 0`
+## `SwitchBuffer::PerPortSched::on_enqueue_cap_check`
+`virtual bool on_enqueue_cap_check(PortId port, Bytes sz) = 0`
+## `SwitchBuffer::PerPortSched::on_enqueue_commit`
+`virtual void on_enqueue_commit(PortId port, Bytes sz) = 0`
+## `SwitchBuffer::PerPortSched::queued_bytes_port`
+`Bytes queued_bytes_port(PortId p) const noexcept`
+## `SwitchBuffer::PerPortSched::queued_bytes_total`
+`Bytes queued_bytes_total() const noexcept`
+## `SwitchBuffer::PerPortSched::queues_for`
+`virtual const std::array<std::deque<Queued>, PRI_COUNT> &queues_for( PortId p) const = 0`
+## `SwitchBuffer::PerPortSched::queues_for`
+`virtual std::array<std::deque<Queued>, PRI_COUNT> &queues_for(PortId p) = 0`
+## `SwitchBuffer::PerPortSched::schedule_drain_if_needed`
+`void schedule_drain_if_needed(PortId port)`
+## `SwitchBuffer::PerPortSched::try_reserve_and_send`
+`std::optional<Time> try_reserve_and_send(PortId port, Queued &q)`
+## `SwitchBuffer::buffer_size`
+`Bytes buffer_size() const noexcept`
+## `SwitchBuffer::drain_one`
+`virtual bool drain_one(PortId port) = 0`
+## `SwitchBuffer::enqueue_packet`
+`virtual bool enqueue_packet(const Packet &pkt, PortId egress, FlowPriority prio) = 0`
+## `SwitchBuffer::owner`
+`const NetworkSwitch *owner() const noexcept`
+## `SwitchBuffer::port_buffered`
+`Bytes port_buffered(PortId p) const noexcept`
+## `SwitchBuffer::port_cnt`
+`uint16_t port_cnt() const noexcept`
+## `SwitchBuffer::ports_buffered`
+`const std::vector<Bytes> &ports_buffered() const noexcept`
+## `SwitchBuffer::set_egress_links`
+`void set_egress_links(const std::vector<Link*> &links)`
+## `SwitchBuffer::set_share_ctrl`
+`void set_share_ctrl(uint8_t pct) noexcept`
+## `SwitchBuffer::set_share_elephant`
+`void set_share_elephant(uint8_t pct) noexcept`
+## `SwitchBuffer::set_share_mice`
+`void set_share_mice(uint8_t pct) noexcept`
+## `SwitchBuffer::share_ctrl`
+`uint8_t share_ctrl() const noexcept`
+## `SwitchBuffer::share_elephant`
+`uint8_t share_elephant() const noexcept`
+## `SwitchBuffer::share_mice`
+`uint8_t share_mice() const noexcept`
+## `SwitchBuffer::simulator`
+`const Simulator *simulator() const noexcept`
+## `SwitchBuffer::type`
+`SwitchBufferType type() const noexcept`
+## `SwitchBuffer::~SwitchBuffer`
+`virtual ~SwitchBuffer() = default`
+## `drain_once`
+`void drain_once(PortId port);`
+## `drain_one_common`
+`bool drain_one_common(PortId port);`
+## `schedule_drain_if_needed`
+`void schedule_drain_if_needed(PortId port);`
+## `try_reserve_and_send`
+`std::optional<Time> try_reserve_and_send(PortId port, Queued &q);`

docs/network/switch/unicast_table.md

@@ -1,8 +1,9 @@
 # network/switch/unicast_table.h
-
-## class UnicastTable — public interface
-
-### `UnicastTable() = default;`
-### `std::vector<PortId> get_port_list(NodeId dst_node, PortId dst_port) const;`
-### `bool add_entry(NodeId dst_node, PortId dst_port, PortId out_port);`
-### `bool delete_entry(NodeId dst_node, PortId dst_port, PortId out_port);`
+## `UnicastTable::UnicastTable`
+`UnicastTable() = default`
+## `UnicastTable::add_entry`
+`bool add_entry(NodeId dst_node, PortId dst_port, PortId out_port)`
+## `UnicastTable::delete_entry`
+`bool delete_entry(NodeId dst_node, PortId dst_port, PortId out_port)`
+## `UnicastTable::get_port_list`
+`std::vector<PortId> get_port_list(NodeId dst_node, PortId dst_port) const`

src/core/CMakeLists.txt

@@ -28,13 +28,11 @@ else()
 	logger.h
 	simulator.h
 	node.h
-	host.h
     PRIVATE
         error.cc
         logger.cc
         simulator.cc
 	node.cc
-	host.cc
     )
 endif()
 

src/hosts/publisher.h

@@ -7,8 +7,8 @@
 
 #include "core/time.h"
 #include "core/types.h"
-#include "core/host.h"
 #include "core/simulator.h"
+#include "network/host.h"
 #include "hosts/mgmt_msg.h"
 #include "hosts/policies.h"
 

src/hosts/subscriber.h

@@ -3,8 +3,8 @@
 
 #include <cstdint>
 #include <memory>
-#include "core/host.h"
 #include "core/simulator.h"
+#include "network/host.h"
 #include "hosts/mgmt_msg.h"
 #include "hosts/policies.h"
 

src/network/CMakeLists.txt

@@ -22,12 +22,14 @@ else()
       network_node.h
       network_switch.h
       network_nic.h
+      host.h
     PRIVATE
       packet.cc
       link.cc
       network_node.cc
       network_switch.cc
       network_nic.cc
+      host.cc
   )
 endif()
 

src/network/host.cc

@@ -1,6 +1,7 @@
-#include "core/host.h"
+#include "network/host.h"
 
 #include "core/error.h"
+#include "network/network_nic.h"
 
 namespace dofs {
 
@@ -16,6 +17,7 @@ void Host::attach_nic(NetworkNic *nic) noexcept {
         }
 
         _nic = nic;
+        _nic->attach_host(this);
 }
 
 void Host::detach_nic(NetworkNic *nic) noexcept {
@@ -24,6 +26,7 @@ void Host::detach_nic(NetworkNic *nic) noexcept {
                 return;
         }
 
+        _nic->detach_host(this);
         _nic = nullptr;
 }
 

src/network/host.h

@@ -1,5 +1,5 @@
-#ifndef CORE_HOST_H
-#define CORE_HOST_H
+#ifndef NETWORK_HOST_H
+#define NETWORK_HOST_H
 
 #include <cstdint>
 
@@ -45,4 +45,4 @@ private:
 
 } // namespace dofs
 
-#endif // CORE_HOST_H
+#endif // NETWORK_HOST_H

src/network/network_nic.cc

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 #include <utility>
-#include "core/host.h"
+#include "network/host.h"
 #include "core/error.h"
 
 namespace dofs {

tools/extract_api.py

@@ -1,255 +1,626 @@
 #!/usr/bin/env python3
-"""
-extract_api.py
-Scan C++ headers in ./src for public interfaces (public class/struct methods
-and free function declarations) and emit markdown snippets mirroring the src/
-tree into ./docs.
-
-Each interface line is rendered as:
-### `signature`
-
-Usage:
-  cd dofs
-  python3 tools/extract_api.py
-"""
+# dofs/tools/extract_api.py
+# Extract DOFS public API from headers and emit:
+# - Per-header Markdown files under docs/<same path>.md (mirrors src tree)
+# - One JSON index at docs/index.json
 
+from __future__ import annotations
+import argparse
+import json
 import re
-import sys
+from dataclasses import dataclass, asdict
 from pathlib import Path
+from typing import List, Optional, Tuple, Dict
 
-REPO_ROOT = Path(__file__).resolve().parents[1]
-SRC_DIR   = REPO_ROOT / "src"
-DOCS_DIR  = REPO_ROOT / "docs"
+# -------- Repo roots --------
+def _detect_repo_root() -> Path:
+    p = Path(__file__).resolve()
+    for anc in [p.parent, *p.parents]:
+        if (anc / "src").is_dir():
+            return anc
+    return p.parent
 
-HEADER_EXTS = {".h", ".hh", ".hpp", ".hxx"}
-
-# ---------- Utilities ----------
+REPO_ROOT = _detect_repo_root()     # .../dofs
+SRC_ROOT  = REPO_ROOT / "src"
+OUT_DIR_DEFAULT = REPO_ROOT / "docs"   # mirror into docs/
 
+# -------- IO helpers --------
 def read_text(p: Path) -> str:
-    try:
     return p.read_text(encoding="utf-8", errors="ignore")
-    except Exception as e:
-        print(f"[WARN] failed reading {p}: {e}", file=sys.stderr)
+
+def iter_headers(root: Path) -> List[Path]:
+    return sorted(root.rglob("*.h"))
+
+def strip_comments_and_literals(code: str) -> str:
+    string_re = r'("([^"\\]|\\.)*")|(\'([^\'\\]|\\.)*\')'
+    slc_re = r'//[^\n]*'
+    mlc_re = r'/\*.*?\*/'
+    def _keep_nls(m):  # keep line count stable
+        return re.sub(r'[^\n]', ' ', m.group(0))
+    code = re.sub(mlc_re, _keep_nls, code, flags=re.S)
+    code = re.sub(string_re, _keep_nls, code, flags=re.S)
+    code = re.sub(slc_re, _keep_nls, code)
+    return code
+
+# -------- Data model --------
+@dataclass
+class Symbol:
+    kind: str                 # "free_function" | "method" | "ctor" | "dtor" | "conversion" | "macro"
+    qualified: str
+    signature: str
+    file: str                 # e.g., "src/core/simulator.h"
+    line: int
+    static: bool = False
+    const: bool = False
+    ref_qual: str = ""
+    template_params: str = ""
+
+# -------- Parser (same core as before; trimmed comments) --------
+class Parser:
+    def __init__(self, text: str, relpath: str):
+        self.text = text; self.relpath = relpath
+        self.i = 0; self.n = len(text); self.line = 1
+        self.ns_stack: List[str] = []
+        self.class_stack: List[dict] = []
+        self.depth_brace = 0
+        self.pending_template: Optional[str] = None
+        self.syms: List[Symbol] = []
+
+        # simple guard for bogus names when we fall into bodies
+        self._kw_block = {
+            "if", "for", "while", "switch", "return", "case", "default",
+            "do", "else", "break", "continue", "goto", "try", "catch"
+        }
+
+    def peek(self, k=0): j=self.i+k; return self.text[j] if 0<=j<self.n else ""
+    def advance(self, k=1):
+        for _ in range(k):
+            if self.i>=self.n: return
+            ch=self.text[self.i]; self.i+=1
+            if ch=="\n": self.line+=1
+    def skip_ws(self):
+        while self.i<self.n and self.text[self.i].isspace(): self.advance(1)
+
+    def run(self):
+        while self.i < self.n:
+            self.skip_ws()
+            if self.i >= self.n: break
+            if self.text.startswith("namespace", self.i): self._parse_namespace(); continue
+            if self.text.startswith("class ", self.i) or self.text.startswith("struct ", self.i): self._parse_record(); continue
+            if self.text.startswith("template", self.i):
+                self.pending_template = self._parse_template_intro(); continue
+            if self.text.startswith("public:", self.i): self._set_access("public"); self.advance(len("public:")); continue
+            if self.text.startswith("private:", self.i): self._set_access("private"); self.advance(len("private:")); continue
+            if self.text.startswith("protected:", self.i): self._set_access("protected"); self.advance(len("protected:")); continue
+            ch=self.peek()
+            if ch=="{": self.depth_brace+=1; self.advance(1); continue
+            if ch=="}": self.depth_brace-=1; self.advance(1); self._maybe_pop(); continue
+            self._maybe_decl_or_def()
+        return self.syms
+
+    def _skip_balanced_block(self):
+        """
+        Consume a balanced {...} block starting at the current position
+        (which must be at '{'). This does NOT touch self.depth_brace /
+        class_stack, so it won't confuse outer block tracking.
+        """
+        if self.peek() != "{":
+            return
+        depth = 0
+        # consume the first '{'
+        self.advance(1)
+        depth += 1
+        while self.i < self.n and depth > 0:
+            ch = self.peek()
+            if ch == "{":
+                depth += 1
+            elif ch == "}":
+                depth -= 1
+            self.advance(1)
+
+    # --- blocks ---
+    def _parse_namespace(self):
+        self.advance(len("namespace")); self.skip_ws()
+        if self.text.startswith("inline", self.i):
+            self.advance(len("inline")); self.skip_ws()
+        m = re.match(r'([A-Za-z_]\w*(::[A-Za-z_]\w*)*)?', self.text[self.i:])
+        name = ""; 
+        if m: name = m.group(0) or ""; self.advance(len(name))
+        self.skip_ws()
+        if self.peek() == "{":
+            self.advance(1); self.depth_brace += 1
+            self.ns_stack.append(name if name else "")
+    def _parse_record(self):
+        kw = "class" if self.text.startswith("class ", self.i) else "struct"
+        self.advance(len(kw)); self.skip_ws()
+        name = self._read_word()
+        if not name: return
+        while self.i<self.n and self.peek() not in "{;":
+            if self.peek()=="<": self._read_balanced("<", ">")
+            else: self.advance(1)
+        if self.peek()=="{":
+            self.advance(1); self.depth_brace += 1
+            self.class_stack.append({"name": name, "access": "public" if kw=="struct" else "private", "brace_depth": self.depth_brace})
+        else:
+            self.advance(1)  # forward decl
+
+    def _parse_template_intro(self) -> str:
+        self.advance(len("template")); self.skip_ws()
+        params = self._read_balanced("<", ">") if self.peek()=="<" else ""
+        return f"template{params}"
+
+    def _set_access(self, acc: str):
+        if self.class_stack: self.class_stack[-1]["access"]=acc
+
+    def _maybe_pop(self):
+        if self.class_stack and self.class_stack[-1]["brace_depth"] == self.depth_brace + 1:
+            self.class_stack.pop(); return
+        if self.ns_stack: self.ns_stack.pop()
+
+    # --- helpers ---
+    def _read_word(self) -> str:
+        self.skip_ws()
+        m = re.match(r'[A-Za-z_]\w*', self.text[self.i:])
+        if not m: return ""
+        w = m.group(0); self.advance(len(w)); return w
+    def _read_balanced(self, o: str, c: str) -> str:
+        depth=1; out=o; self.advance(1)
+        while self.i<self.n and depth>0:
+            ch=self.peek(); out+=ch; self.advance(1)
+            if ch==o: depth+=1
+            elif ch==c: depth-=1
+        return out
+
+    def _current_ns_is_dofs(self) -> bool:
+        if not self.ns_stack: return False
+        chain=[p for p in self.ns_stack if p]
+        return bool(chain) and chain[0]=="dofs"
+
+    def _read_one_head(self) -> Tuple[str, str]:
+        par=ang=sq=0; start=self.i
+        while self.i<self.n:
+            ch=self.peek()
+            if ch=="(": par+=1
+            elif ch==")": par=max(0,par-1)
+            elif ch=="<": ang+=1
+            elif ch==">": ang=max(0,ang-1)
+            elif ch=="[": sq+=1
+            elif ch=="]": sq=max(0,sq-1)
+            elif ch==";" and par==0 and ang==0 and sq==0:
+                end=self.i; self.advance(1)
+                return self.text[start:end].strip(), ";"
+            elif ch=="{" and par==0 and ang==0 and sq==0:
+                end=self.i
+                return self.text[start:end].strip(), "{"
+            self.advance(1)
+        return "", ""
+
+    def _skip_brace_block(self):
+        """Assumes current char is '{'; skis balanced block."""
+        if self.peek() != "{":
+            return
+        brace = 0
+        while self.i < self.n:
+            ch = self.peek()
+            self.advance(1)
+            if ch == "{":
+                brace += 1
+            elif ch == "}":
+                brace -= 1
+                if brace == 0:
+                    break
+
+
+    def _consume_until_sep(self):
+        par=ang=sq=0
+        while self.i<self.n:
+            ch=self.peek(); self.advance(1)
+            if ch=="(": par+=1
+            elif ch==")": par=max(0,par-1)
+            elif ch=="<": ang+=1
+            elif ch==">": ang=max(0,ang-1)
+            elif ch=="[": sq+=1
+            elif ch=="]": sq=max(0,sq-1)
+            elif ch==";" and par==0 and ang==0 and sq==0: return
+            elif ch=="{" and par==0 and ang==0 and sq==0:
+                brace=1
+                while self.i<self.n and brace>0:
+                    c2=self.peek(); self.advance(1)
+                    if c2=="{": brace+=1
+                    elif c2=="}": brace-=1
+                return
+
+    def _maybe_decl_or_def(self):
+        start_line = self.line
+        # skip obvious non-function starts
+        for bs in ("using ", "typedef ", "enum ", "namespace ", "static_assert"):
+            if self.text.startswith(bs, self.i):
+                self._consume_until_sep(); return
+        if self.text.startswith("template ", self.i):
+            self.pending_template = self._parse_template_intro(); return
+
+        decl, endch = self._read_one_head()
+        if not decl.strip(): return
+
+        tparams = self.pending_template or ""
+        self.pending_template = None
+
+        if "friend" in decl: return
+        if "(" not in decl or ")" not in decl: return
+
+        recorded = False
+        # classify: method vs free fn (inside dofs)
+        in_class = bool(self.class_stack)
+        if in_class:
+            if self.class_stack[-1]["access"] != "public": return
+            self._record_method(decl, start_line, tparams)
+            recorded = True
+        else:
+            if self._current_ns_is_dofs():
+                self._record_free_function(decl, start_line, tparams)
+                recorded = True
+
+        # If we just read a function head with a body, skip the body **after** recording
+        if endch == "{":
+            self._skip_brace_block()
+            return
+
+        # If it wasn't recorded (e.g., not in dofs namespace for free function),
+        # just continue; declarations ending with ';' need no additional skipping.
+        if recorded:
+            return
+        else:
+            return
+
+    # --- symbol building ---
+    def _normalize(self, s: str) -> str:
+        return re.sub(r'\s+', ' ', s).strip()
+
+    def _name_from_decl(self, decl: str) -> str:
+        """
+        Find the function/method name robustly:
+        - choose the '(' that starts the *parameter list* (angle-depth == 0)
+        - then take the identifier immediately to its left as the name
+        Avoids mistaking template args like 'std::function<void()>' for a function.
+        """
+        # Strip trailing qualifiers after param list for stability
+        head = re.split(r'\b(noexcept|requires)\b', decl)[0]
+
+        # Scan to find the '(' that begins the parameter list at angle-depth 0
+        ang = 0
+        par_open_idx = -1
+        for idx, ch in enumerate(head):
+            if ch == '<':
+                ang += 1
+            elif ch == '>':
+                ang = max(0, ang - 1)
+            elif ch == '(' and ang == 0:
+                par_open_idx = idx
+                break
+        if par_open_idx == -1:
             return ""
 
-def strip_comments(code: str) -> str:
-    # Remove /* ... */ (including multiline) and // ... to end of line
-    no_block = re.sub(r"/\*.*?\*/", "", code, flags=re.S)
-    no_line  = re.sub(r"//.*?$", "", no_block, flags=re.M)
-    return no_line
-
-def collapse_ws(s: str) -> str:
-    return re.sub(r"\s+", " ", s).strip()
-
-def ensure_dir(path: Path):
-    path.parent.mkdir(parents=True, exist_ok=True)
-
-# ---------- Heuristic extractors ----------
-
-ACCESS_RE = re.compile(r"^\s*(public|private|protected)\s*:\s*$")
-CLASS_START_RE = re.compile(r"^\s*(class|struct)\s+([A-Za-z_]\w*)\b")
-POSSIBLE_FUNC_DECL_RE = re.compile(
-    r"""^[^;{}()]*\b
-        (?!typedef\b)(?!using\b)(?!friend\b)
-        [A-Za-z_~]\w*\s*
-        \(
-        [^;]*              # params
-        \)
-        (?:\s*(?:const|noexcept|override|final|=0|=\s*default|=\s*delete))*\s*
-        ;
-        \s*$""",
-    re.X,
-)
-POSSIBLE_INLINE_DEF_RE = re.compile(
-    r"""^[^;{}()]*\b
-        (?!typedef\b)(?!using\b)(?!friend\b)
-        [A-Za-z_~]\w*\s*
-        \(
-        [^{;]*              # params
-        \)
-        (?:\s*(?:const|noexcept|override|final))*\s*
-        \{""",
-    re.X,
-)
-SKIP_PREFIXES = ("#define", "#include", "static_assert", "enum ", "enum class ",
-                 "template<", "namespace ", "using ", "typedef ", "friend ",
-                 "struct ", "class ")
-
-def extract_public_methods(lines, is_struct_default_public: bool):
-    public = is_struct_default_public
-    out = []
-    depth = 0
-    for raw in lines:
-        line = raw.strip()
-        if not line:
-            continue
-
-        # Track nested braces to avoid confusing nested scopes
-        depth += raw.count("{")
-        depth -= raw.count("}")
-
-        m = ACCESS_RE.match(line)
-        if m and depth >= 0:
-            public = (m.group(1) == "public")
-            continue
-
-        if not public:
-            continue
-
-        if line.startswith(SKIP_PREFIXES) or line.endswith(":"):
-            continue
-
-        if POSSIBLE_FUNC_DECL_RE.match(line):
-            out.append(collapse_ws(line))
-            continue
-
-        if POSSIBLE_INLINE_DEF_RE.match(line):
-            sig = line.split("{", 1)[0].rstrip()
-            out.append(collapse_ws(sig) + " { ... }")
-            continue
-
-    return out
-
-def extract_free_function_decls(code: str):
-    # Remove class/struct bodies to avoid capturing methods
-    scrubbed = []
-    toks = code.splitlines()
-    in_class = False
-    brace_balance = 0
-    for line in toks:
-        if not in_class:
-            if CLASS_START_RE.match(line):
-                in_class = True
-                brace_balance = line.count("{") - line.count("}")
-                scrubbed.append("")
-                continue
+        # Walk left from par_open_idx to find the start of the name token
+        j = par_open_idx - 1
+        # Skip whitespace
+        while j >= 0 and head[j].isspace():
+            j -= 1
+        # Collect identifier (and allow operator forms)
+        # First, try operator names
+        m_op = re.search(r'(operator\s*""\s*_[A-Za-z_]\w*|operator\s*[^\s(]+)\s*$', head[:par_open_idx])
+        if m_op:
+            name = m_op.group(1)
         else:
-            brace_balance += line.count("{") - line.count("}")
-            if brace_balance <= 0:
-                in_class = False
-            scrubbed.append("")
+            # Regular identifier (possibly destructor)
+            m_id = re.search(r'(~?[A-Za-z_]\w*)\s*$', head[:par_open_idx])
+            name = m_id.group(1) if m_id else ""
+
+        if not name or name in self._kw_block:
+            return ""
+        return name
+
+    def _qualify(self, name: str) -> str:
+        ns = [p for p in self.ns_stack if p]
+        q = "::".join(ns) + "::" if ns else ""
+        if self.class_stack:
+            q += "::".join([c["name"] for c in self.class_stack]) + "::"
+        return (q + name) if q else name
+
+    def _kind_for_method(self, name: str, cls: str) -> str:
+        if name == cls: return "ctor"
+        if name == f"~{cls}": return "dtor"
+        if name.startswith("operator"):
+            if re.match(r'operator\s+[^(\s]+', name) and "<" not in name and name != "operator()":
+                return "conversion"
+            return "method"
+        return "method"
+
+    def _cvref_static(self, decl: str) -> Tuple[bool,bool,str]:
+        is_static = bool(re.search(r'(^|\s)static\s', decl))
+        r = decl.rfind(")")
+        tail = decl[r+1:] if r!=-1 else ""
+        is_const = bool(re.search(r'\bconst\b', tail))
+        refq = "&&" if "&&" in tail else ("&" if re.search(r'(^|\s)&(\s|$)', tail) else "")
+        return is_static, is_const, refq
+
+    def _record_method(self, decl: str, start_line: int, tparams: str):
+        cls = self.class_stack[-1]["name"]
+        name = self._name_from_decl(decl)
+        if not name: return
+        qualified = self._qualify(name)
+        is_static, is_const, refq = self._cvref_static(decl)
+        kind = self._kind_for_method(name, cls)
+        sig = self._normalize((tparams + " " + decl).strip() if tparams else decl)
+        self.syms.append(Symbol(kind=kind, qualified=qualified, signature=sig,
+                                file=self.relpath, line=start_line,
+                                static=is_static, const=is_const, ref_qual=refq,
+                                template_params=tparams or ""))
+
+    def _record_free_function(self, decl: str, start_line: int, tparams: str):
+        name = self._name_from_decl(decl)
+        if not name: return
+        qualified = self._qualify(name)
+        sig = self._normalize((tparams + " " + decl).strip() if tparams else decl)
+        self.syms.append(Symbol(kind="free_function", qualified=qualified, signature=sig,
+                                file=self.relpath, line=start_line,
+                                template_params=tparams or ""))
+
+# -------- Rendering --------
+def to_json(symbols: List[Symbol]) -> str:
+    items = [asdict(s) for s in symbols]
+    items.sort(key=lambda s: (s["file"], s["line"], s["qualified"], s["signature"]))
+    return json.dumps({"version": 1, "symbols": items}, indent=2)
+
+def _markdown_for_file(rel_repo_file: str, symbols: List[Symbol]) -> str:
+    """
+    Build per-header Markdown for exactly the symbols whose s.file == rel_repo_file.
+    """
+    title = rel_repo_file.replace("src/", "", 1)
+    lines = [f"# {title}\n"]
+    file_syms = [s for s in symbols if s.file == rel_repo_file]
+    if not file_syms:
+        lines.append("_No public API symbols found in this header._")
+        lines.append("")
+        return "\n".join(l.rstrip() for l in lines)
+
+    # Group macros last; keep deterministic order
+    def _order(s: Symbol):
+        k = {"macro": 2}.get(s.kind, 1)
+        return (k, s.qualified, s.signature)
+
+    for s in sorted(file_syms, key=_order):
+        tprefix = (s.template_params + " ") if s.template_params else ""
+        if s.kind == "macro":
+            # H2 with macro name, then macro head; no line numbers, no bullets
+            lines.append(f"## `{s.qualified}`")
+            lines.append(f"`{s.signature}`\n")
+        else:
+            # H2 with fully qualified name (namespace::[class::]func)
+            # Contract/signature on the next line
+            fqname = s.qualified
+            if tprefix:
+                lines.append(f"## `{fqname}`")
+                lines.append(f"`{tprefix.strip()} {s.signature}`\n".replace("  ", " ").strip())
+            else:
+                lines.append(f"## `{fqname}`")
+                lines.append(f"`{s.signature}`\n")
+
+    return "\n".join(l.rstrip() for l in lines)
+
+# -------- Robust multi-line free-function extraction --------
+# Matches things like:
+#   inline void foo(A a,
+#                   B b = std::nullopt) noexcept;
+#   std::mutex &error_mutex() noexcept;
+_FREE_FN_RE = re.compile(r"""
+    (?P<prefix> ^ | [;\}\n] )                      # anchor
+    (?P<head>
+        (?:\s*(?:inline|constexpr|consteval|constinit|static|extern)\s+)*   # storage/attrs
+        (?:[\w:\<\>\*\&\s]+\s+)?                  # return type (optional for constructors, but we only accept when present)
+        (?P<name>[A-Za-z_]\w*)\s*                 # function name
+        \(
+            (?P<params>
+                [^()]* (?:\([^()]*\)[^()]*)*     # balanced parens inside params
+            )
+        \)
+        (?:\s*noexcept(?:\s*\([^)]*\))?)?         # optional noexcept/noexcept(expr)
+        (?:\s*->\s*[^;{\n]+)?                     # optional trailing return type
+    )
+    \s*
+    (?P<ender> [;{] )                              # prototype or definition
+""", re.VERBOSE | re.DOTALL | re.MULTILINE)
+
+def _collapse_ws(s: str) -> str:
+    # Collapse all whitespace runs to a single space for clean signatures
+    return " ".join(s.split())
+
+def extract_free_functions_multiline(clean_text: str, relpath: str) -> List[Symbol]:
+    """
+    Walk the file tracking namespace blocks and pick out free-function
+    heads that can span multiple lines. Avoid class/struct/enum bodies.
+    """
+    syms: List[Symbol] = []
+    ns_stack: List[str] = []
+    class_depth = 0  # crude guard: skip when inside class/struct/enum body
+
+    # Token-ish scan to maintain simple block context
+    i = 0
+    n = len(clean_text)
+    while i < n:
+        # namespace enter
+        if clean_text.startswith("namespace", i):
+            j = i + len("namespace")
+            while j < n and clean_text[j].isspace():
+                j += 1
+            # Parse namespace name (could be 'dofs' or anonymous)
+            k = j
+            while k < n and (clean_text[k].isalnum() or clean_text[k] in "_:"):
+                k += 1
+            ns_name = clean_text[j:k].strip()
+            # Find the next '{'
+            m = clean_text.find("{", k)
+            if m != -1:
+                if ns_name:
+                    ns_stack.append(ns_name)
+                else:
+                    ns_stack.append("")  # anonymous
+                i = m + 1
                 continue
-        scrubbed.append(line)
 
-    text = "\n".join(scrubbed)
-
-    out = []
-    for raw in text.splitlines():
-        line = raw.strip()
-        if not line or line.startswith(SKIP_PREFIXES):
+        # class/struct/enum guard
+        if clean_text.startswith("class ", i) or clean_text.startswith("struct ", i) or clean_text.startswith("enum ", i):
+            # Enter body at next '{'
+            m = clean_text.find("{", i)
+            if m != -1:
+                class_depth += 1
+                i = m + 1
                 continue
-        if POSSIBLE_FUNC_DECL_RE.match(line):
-            out.append(collapse_ws(line))
-        elif POSSIBLE_INLINE_DEF_RE.match(line):
-            sig = line.split("{", 1)[0].rstrip()
-            out.append(collapse_ws(sig) + " { ... }")
-    return out
 
-def split_top_level_classes(code: str):
-    lines = code.splitlines()
-    results = []
+        if clean_text[i] == '}':
+            if class_depth > 0:
+                class_depth -= 1
+            elif ns_stack:
+                ns_stack.pop()
+            i += 1
+            continue
+
+        # Try a function head only if not inside a class-like body
+        if class_depth == 0:
+            m = _FREE_FN_RE.match(clean_text, i)
+            if m:
+                name = m.group("name")
+                head = m.group("head")
+                # filter obvious false positives: require a return type before name
+                # (very rough: there must be at least one space before name inside head)
+                if re.search(r"\S\s+" + re.escape(name) + r"\s*\(", head):
+                    qualified = "::".join([ns for ns in ns_stack if ns])  # drop anonymous
+                    qualified = f"{qualified}::{name}" if qualified else name
+                    # Build a tidy signature
+                    ender = m.group("ender")
+                    signature = _collapse_ws(head) + ender
+                    line = clean_text.count("\n", 0, m.start("head")) + 1
+                    syms.append(Symbol(kind="free_function",
+                                       qualified=qualified,
+                                       signature=signature,
+                                       file=relpath,
+                                       line=line))
+                i = m.end()
+                continue
+
+        i += 1
+    return syms
+
+# -------- Macro extraction (function-like only) --------
+_MACRO_HEAD_RE = re.compile(r'^\s*#\s*define\s+([A-Za-z_]\w*)\s*\((.*)$')
+
+def extract_function_like_macros(text: str, relpath: str) -> List[Symbol]:
+    """
+    Capture lines of the form:
+        #define NAME(args) <body...>
+    with multi-line bodies using backslash continuations.
+    We record: kind="macro", qualified=NAME, signature="#define NAME(args)".
+    """
+    syms: List[Symbol] = []
+    lines = text.splitlines()
     i = 0
     while i < len(lines):
-        m = CLASS_START_RE.match(lines[i])
+        line = lines[i]
+        m = _MACRO_HEAD_RE.match(line)
         if not m:
             i += 1
             continue
-        kind, name = m.group(1), m.group(2)
-        # Find opening brace on same or subsequent lines
-        j = i
-        if "{" not in lines[j]:
-            j += 1
-            while j < len(lines) and "{" not in lines[j]:
-                j += 1
-            if j >= len(lines):
+        name = m.group(1)
+        args_part = m.group(2)  # may or may not contain closing ')'
+        start_line = i + 1
+        # Collect continuation lines while trailing backslash exists.
+        body_lines = [line]
         i += 1
-                continue
-        # Capture until matching close
-        depth = 0
-        body = []
-        while j < len(lines):
-            depth += lines[j].count("{")
-            depth -= lines[j].count("}")
-            body.append(lines[j])
-            if depth <= 0 and "}" in lines[j]:
+        while i < len(lines) and body_lines[-1].rstrip().endswith("\\"):
+            body_lines.append(lines[i])
+            i += 1
+        # Reconstruct just the macro head (name + (...) args text).
+        head = "".join(body_lines)
+        # Try to extract the argument list reliably (balanced parens from first '(')
+        # without being confused by body parentheses.
+        head_from_paren = head[head.find("("):] if "(" in head else ""
+        # Minimal balanced scan to the first matching ')'
+        par = 0
+        arg_end = -1
+        for idx, ch in enumerate(head_from_paren):
+            if ch == "(":
+                par += 1
+            elif ch == ")":
+                par -= 1
+                if par == 0:
+                    arg_end = idx
                     break
-            j += 1
-        body_inner = body[1:-1] if body else []
-        results.append((name, kind == "struct", body_inner))
-        i = j + 1
-    return results
-
-# ---------- Main per-file processing ----------
-
-def process_header(path: Path):
-    raw = read_text(path)
-    if not raw:
-        return None
-
-    code = strip_comments(raw)
-
-    # Collect classes
-    class_entries = []
-    for cname, is_struct, body in split_top_level_classes(code):
-        methods = extract_public_methods(body, is_struct_default_public=is_struct)
-        if methods:
-            class_entries.append((cname, methods))
-
-    # Collect free function decls
-    free_funcs = extract_free_function_decls(code)
-
-    if not class_entries and not free_funcs:
-        return None
-
-    # Build markdown with ### `signature` items
-    rel = path.relative_to(SRC_DIR)
-    md_lines = []
-    md_lines.append(f"# {rel.as_posix()}")
-    md_lines.append("")
-
-    if free_funcs:
-        md_lines.append("## Free functions")
-        md_lines.append("")
-        for sig in free_funcs:
-            md_lines.append(f"### `{sig}`")
-        md_lines.append("")
-
-    for cname, methods in class_entries:
-        md_lines.append(f"## class {cname} — public interface")
-        md_lines.append("")
-        for sig in methods:
-            md_lines.append(f"### `{sig}`")
-        md_lines.append("")
-
-    return "\n".join(md_lines)
-
-def write_markdown(src_header: Path, content: str):
-    rel = src_header.relative_to(SRC_DIR)
-    out_path = DOCS_DIR / rel
-    out_path = out_path.with_suffix(".md")
-    ensure_dir(out_path)
-    out_path.write_text(content, encoding="utf-8")
-    return out_path
+        if arg_end != -1:
+            arg_text = head_from_paren[1:arg_end]  # inside (...)
+        else:
+            # Fallback: whatever we saw on the first line
+            arg_text = args_part.split(")")[0]
+        signature = f"#define {name}({arg_text.strip()})"
+        syms.append(Symbol(kind="macro",
+                           qualified=name,
+                           signature=signature,
+                           file=relpath,
+                           line=start_line))
+    return syms
 
+# -------- Driver --------
 def main():
-    if not SRC_DIR.exists():
-        print(f"[ERR] src/ not found at {SRC_DIR}", file=sys.stderr)
-        sys.exit(1)
+    ap = argparse.ArgumentParser(description="Extract DOFS public API (per-header docs).")
+    ap.add_argument("--src", default=str(SRC_ROOT), help="Source root (default: repo/src)")
+    ap.add_argument("--out-dir", default=str(OUT_DIR_DEFAULT), help="Docs root to mirror into (default: docs)")
+    ap.add_argument("--stdout", action="store_true", help="Print JSON to stdout instead of writing files")
+    args = ap.parse_args()
 
-    generated = 0
-    for path in SRC_DIR.rglob("*"):
-        if not path.is_file():
-            continue
-        if path.suffix.lower() not in HEADER_EXTS:
-            continue
-        result = process_header(path)
-        if result:
-            out = write_markdown(path, result)
-            generated += 1
-            print(f"[OK] {out.relative_to(REPO_ROOT)}")
+    src_root = Path(args.src).resolve()
+    out_root = Path(args.out_dir).resolve()
 
-    if generated == 0:
-        print("[INFO] no public interfaces detected (heuristics may have filtered everything)]")
+    all_symbols: List[Symbol] = []
+    header_paths = iter_headers(src_root)
+
+    for hp in header_paths:
+        rel_repo = hp.relative_to(REPO_ROOT).as_posix()     # e.g., src/core/simulator.h
+        raw = read_text(hp)
+        clean = strip_comments_and_literals(raw)
+        p = Parser(clean, rel_repo)
+        # C++ functions/methods (public) inside namespace dofs
+        parsed = p.run()
+        all_symbols.extend(parsed)
+        # Multi-line free functions (e.g., log_error in error.h)
+        extra_fns = extract_free_functions_multiline(clean, rel_repo)
+        # De-duplicate by (kind, qualified, signature, file, line)
+        seen = { (s.kind, s.qualified, s.signature, s.file, s.line) for s in all_symbols }
+        for s in extra_fns:
+            key = (s.kind, s.qualified, s.signature, s.file, s.line)
+            if key not in seen:
+                all_symbols.append(s)
+                seen.add(key)
+        # Function-like macros (global, regardless of namespace)
+        all_symbols.extend(extract_function_like_macros(raw, rel_repo))
+
+    if args.stdout:
+        print(to_json(all_symbols))
+        return
+
+    # Write index.json under docs/
+    out_root.mkdir(parents=True, exist_ok=True)
+    (out_root / "index.json").write_text(to_json(all_symbols), encoding="utf-8")
+
+    # Emit one markdown per header, mirroring src/ -> docs/
+    # src/<subpath>.h  =>  docs/<subpath>.md
+    for hp in header_paths:
+        rel_from_repo = hp.relative_to(REPO_ROOT).as_posix()           # src/...
+        rel_from_src  = hp.relative_to(src_root).with_suffix(".md")    # core/simulator.md
+        target_path   = out_root / rel_from_src
+        target_path.parent.mkdir(parents=True, exist_ok=True)
+        md = _markdown_for_file(rel_from_repo, all_symbols)
+        target_path.write_text(md, encoding="utf-8")
+
+    print(f"[extract_api] Wrote JSON index: {out_root/'index.json'}")
+    print(f"[extract_api] Wrote per-header Markdown under: {out_root}")
 
 if __name__ == "__main__":
     main()