Complete M6.4 atomic environmental transfers
This commit is contained in:
@@ -79,6 +79,7 @@ class EnvironmentView {
|
||||
}
|
||||
|
||||
private:
|
||||
friend class EnvironmentalTransfers;
|
||||
friend std::expected<EnvironmentView, EnvironmentError>
|
||||
query_environment(const FieldStore&, const ChunkStore&, std::uint64_t,
|
||||
std::span<const VoxelAddress>, std::uint32_t);
|
||||
|
||||
@@ -93,6 +93,7 @@ class FieldStore {
|
||||
}
|
||||
|
||||
private:
|
||||
friend class EnvironmentalTransfers;
|
||||
using Page = std::array<std::uint64_t, 64>;
|
||||
struct Channel {
|
||||
bool present{};
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
#pragma once
|
||||
#include "evo/world/environment.hpp"
|
||||
#include <array>
|
||||
#include <compare>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <expected>
|
||||
#include <memory>
|
||||
#include <span>
|
||||
|
||||
namespace evo::world {
|
||||
struct OrganismResourceId {
|
||||
std::uint64_t value{};
|
||||
auto operator<=>(const OrganismResourceId&) const = default;
|
||||
};
|
||||
// Tagged compartments in Field order; fg for mass, pJ for energy. No lifecycle state.
|
||||
struct OrganismResources {
|
||||
OrganismResourceId id;
|
||||
std::array<std::uint64_t, field_count> balances{}, capacities{};
|
||||
auto operator<=>(const OrganismResources&) const = default;
|
||||
};
|
||||
enum class ResourceDirection : std::uint8_t { to_organism, to_environment };
|
||||
struct EnvironmentalLeg {
|
||||
VoxelAddress voxel;
|
||||
OrganismResourceId organism;
|
||||
Field field;
|
||||
ResourceDirection direction;
|
||||
std::uint64_t amount{};
|
||||
auto operator<=>(const EnvironmentalLeg&) const = default;
|
||||
};
|
||||
struct EnvironmentalBatch {
|
||||
std::uint64_t command{}, tick{};
|
||||
std::span<const EnvironmentalLeg> legs;
|
||||
};
|
||||
struct EnvironmentalReceipt {
|
||||
std::uint64_t command{}, tick{};
|
||||
std::size_t legs{};
|
||||
auto operator<=>(const EnvironmentalReceipt&) const = default;
|
||||
};
|
||||
enum class TransferError : std::uint8_t {
|
||||
config,
|
||||
identity,
|
||||
terrain_binding,
|
||||
capacity,
|
||||
overflow,
|
||||
budget,
|
||||
invalid_request,
|
||||
wrong_owner,
|
||||
stale_view,
|
||||
uncovered,
|
||||
missing,
|
||||
unknown_organism,
|
||||
insufficient,
|
||||
conflict,
|
||||
stale_command
|
||||
};
|
||||
class EnvironmentalTransfers {
|
||||
public:
|
||||
static constexpr std::size_t max_sites = 256, max_organisms = 64, max_legs = 32;
|
||||
static constexpr std::size_t retained_commands = 64, scratch_bytes = 65536;
|
||||
// Consumes both stores on success or failure. Retaining mutable aliases is forbidden.
|
||||
[[nodiscard]] static std::expected<std::unique_ptr<EnvironmentalTransfers>, TransferError>
|
||||
create(WorldIdentity identity, std::unique_ptr<FieldStore> fields,
|
||||
std::unique_ptr<ChunkStore> terrain, std::span<const OrganismResources> organisms,
|
||||
std::size_t byte_budget);
|
||||
EnvironmentalTransfers(const EnvironmentalTransfers&) = delete;
|
||||
EnvironmentalTransfers& operator=(const EnvironmentalTransfers&) = delete;
|
||||
EnvironmentalTransfers(EnvironmentalTransfers&&) = delete;
|
||||
EnvironmentalTransfers& operator=(EnvironmentalTransfers&&) = delete;
|
||||
[[nodiscard]] const FieldStore& fields() const noexcept {
|
||||
return *fields_;
|
||||
}
|
||||
[[nodiscard]] const ChunkStore& terrain() const noexcept {
|
||||
return *terrain_;
|
||||
}
|
||||
[[nodiscard]] std::span<const OrganismResources> organisms() const noexcept {
|
||||
return std::span{organisms_}.first(count_);
|
||||
}
|
||||
[[nodiscard]] accounting::Inventory totals() const noexcept;
|
||||
[[nodiscard]] std::size_t accounted_bytes() const noexcept;
|
||||
[[nodiscard]] std::expected<EnvironmentalReceipt, TransferError>
|
||||
commit(const EnvironmentalBatch& batch, const EnvironmentView& view,
|
||||
std::uint64_t current_tick);
|
||||
|
||||
private:
|
||||
struct History {
|
||||
EnvironmentalReceipt receipt{};
|
||||
std::array<EnvironmentalLeg, max_legs> legs{};
|
||||
};
|
||||
EnvironmentalTransfers() = default;
|
||||
std::unique_ptr<FieldStore> fields_;
|
||||
std::unique_ptr<ChunkStore> terrain_;
|
||||
std::array<OrganismResources, max_organisms> organisms_{};
|
||||
std::array<History, retained_commands> history_{};
|
||||
std::size_t count_{}, budget_{}, next_history_{};
|
||||
};
|
||||
} // namespace evo::world
|
||||
Reference in New Issue
Block a user