MirrorHub
/
construct
mirror of https://github.com/matrix-construct/construct
0
0
Fork 0
Code Issues Releases Wiki Activity

ircd:Ⓜ️:room::events: Move nested interfaces out to room::.

This commit is contained in:
Jason Volk 2023-02-17 15:24:23 -08:00
parent 4e209855de
commit d28d3d8084
11 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ircd/m/room/events.h
View File

@ -21,10 +21,6 @@
/// ///
struct ircd::m::room::events struct ircd::m::room::events
{ {
struct sounding;
struct missing;
struct horizon;
static conf::item<ssize_t> viewport_size; static conf::item<ssize_t> viewport_size;
m::room room; m::room room;

4
include/ircd/m/room/events_horizon.h → include/ircd/m/room/horizon.h
View File

@ -9,14 +9,14 @@
// full license for this software is available in the LICENSE file. // full license for this software is available in the LICENSE file.
#pragma once #pragma once
#define HAVE_IRCD_M_ROOM_EVENTS_HORIZON_H #define HAVE_IRCD_M_ROOM_HORIZON_H
/// Find missing room events. This is an interface to the event-horizon for /// Find missing room events. This is an interface to the event-horizon for
/// this room. The event horizon is keyed by event_id and the value is the /// this room. The event horizon is keyed by event_id and the value is the
/// event::idx of the event referencing it. There can be multiple entries for /// event::idx of the event referencing it. There can be multiple entries for
/// an event_id. The closure is also invoked with the depth of the referencer. /// an event_id. The closure is also invoked with the depth of the referencer.
/// ///
struct ircd::m::room::events::horizon struct ircd::m::room::horizon
{ {
using closure = util::function_bool using closure = util::function_bool
< <

4
include/ircd/m/room/events_missing.h → include/ircd/m/room/missing.h
View File

@ -9,7 +9,7 @@
// full license for this software is available in the LICENSE file. // full license for this software is available in the LICENSE file.
#pragma once #pragma once
#define HAVE_IRCD_M_ROOM_EVENTS_MISSING_H #define HAVE_IRCD_M_ROOM_MISSING_H
/// Find missing room events. This is a breadth-first iteration of missing /// Find missing room events. This is a breadth-first iteration of missing
/// references from the tophead (or at the event provided in the room arg) /// references from the tophead (or at the event provided in the room arg)
@ -18,7 +18,7 @@
/// to the server, followed by the depth and event::idx of the event making the /// to the server, followed by the depth and event::idx of the event making the
/// reference. /// reference.
/// ///
struct ircd::m::room::events::missing struct ircd::m::room::missing
{ {
using closure = util::function_bool using closure = util::function_bool
< <

9
include/ircd/m/room/room.h
View File

@ -112,6 +112,9 @@ namespace ircd::m
struct ircd::m::room struct ircd::m::room
{ {
struct events; struct events;
struct missing;
struct horizon;
struct sounding;
struct state; struct state;
struct members; struct members;
struct origins; struct origins;
@ -189,9 +192,9 @@ struct ircd::m::room
}; };
#include "events.h" #include "events.h"
#include "events_sounding.h" #include "sounding.h"
#include "events_missing.h" #include "missing.h"
#include "events_horizon.h" #include "horizon.h"
#include "state.h" #include "state.h"
#include "state_space.h" #include "state_space.h"
#include "state_history.h" #include "state_history.h"

4
include/ircd/m/room/events_sounding.h → include/ircd/m/room/sounding.h
View File

@ -9,7 +9,7 @@
// full license for this software is available in the LICENSE file. // full license for this software is available in the LICENSE file.
#pragma once #pragma once
#define HAVE_IRCD_M_ROOM_EVENTS_SOUNDING_H #define HAVE_IRCD_M_ROOM_SOUNDING_H
// The "viewport" is comprised of events starting from the tophead (most recent // The "viewport" is comprised of events starting from the tophead (most recent
// in room timeline) and covering about ~20 events leading up to that. Note // in room timeline) and covering about ~20 events leading up to that. Note
@ -44,7 +44,7 @@ namespace ircd::m
/// to calculate backfill requests, etc. This interface is depth-first oriented, /// to calculate backfill requests, etc. This interface is depth-first oriented,
/// rather than the breadth-first room::missing interface. /// rather than the breadth-first room::missing interface.
/// ///
struct ircd::m::room::events::sounding struct ircd::m::room::sounding
{ {
using range = std::pair<int64_t, int64_t>; using range = std::pair<int64_t, int64_t>;
using closure = util::function_bool using closure = util::function_bool

6
matrix/Makefile.am
View File

@ -109,9 +109,9 @@ libircd_matrix_la_SOURCES += room_aliases.cc
libircd_matrix_la_SOURCES += room_bootstrap.cc libircd_matrix_la_SOURCES += room_bootstrap.cc
libircd_matrix_la_SOURCES += room_create.cc libircd_matrix_la_SOURCES += room_create.cc
libircd_matrix_la_SOURCES += room_events.cc libircd_matrix_la_SOURCES += room_events.cc
libircd_matrix_la_SOURCES += room_events_sounding.cc libircd_matrix_la_SOURCES += room_sounding.cc
libircd_matrix_la_SOURCES += room_events_missing.cc libircd_matrix_la_SOURCES += room_missing.cc
libircd_matrix_la_SOURCES += room_events_horizon.cc libircd_matrix_la_SOURCES += room_horizon.cc
libircd_matrix_la_SOURCES += room_head.cc libircd_matrix_la_SOURCES += room_head.cc
libircd_matrix_la_SOURCES += room_head_fetch.cc libircd_matrix_la_SOURCES += room_head_fetch.cc
libircd_matrix_la_SOURCES += room_state_fetch.cc libircd_matrix_la_SOURCES += room_state_fetch.cc

2
matrix/acquire.cc
View File

@ -164,7 +164,7 @@ ircd::m::acquire::fetch_history(event::idx &ref_min)
if(size_t(depth_range.second - depth_range.first) < opts.viewport_size) if(size_t(depth_range.second - depth_range.first) < opts.viewport_size)
depth_range.first -= std::min(long(opts.viewport_size), depth_range.first); depth_range.first -= std::min(long(opts.viewport_size), depth_range.first);
m::room::events::missing missing m::room::missing missing
{ {
opts.room opts.room
}; };

6
matrix/room_events_horizon.cc → matrix/room_horizon.cc
View File

@ -15,7 +15,7 @@ namespace ircd::m::dbs
} }
size_t size_t
ircd::m::room::events::horizon::rebuild() ircd::m::room::horizon::rebuild()
{ {
m::dbs::opts opts; m::dbs::opts opts;
opts.appendix.reset(); opts.appendix.reset();
@ -54,7 +54,7 @@ ircd::m::room::events::horizon::rebuild()
} }
size_t size_t
ircd::m::room::events::horizon::count() ircd::m::room::horizon::count()
const const
{ {
size_t ret{0}; size_t ret{0};
@ -69,7 +69,7 @@ const
} }
bool bool
ircd::m::room::events::horizon::for_each(const closure &closure) ircd::m::room::horizon::for_each(const closure &closure)
const const
{ {
const std::function<bool (const string_view &)> in_room const std::function<bool (const string_view &)> in_room

16
matrix/room_events_missing.cc → matrix/room_missing.cc
View File

@ -9,7 +9,7 @@
// full license for this software is available in the LICENSE file. // full license for this software is available in the LICENSE file.
size_t size_t
ircd::m::room::events::missing::count() ircd::m::room::missing::count()
const const
{ {
size_t ret{0}; size_t ret{0};
@ -24,15 +24,15 @@ const
} }
bool bool
ircd::m::room::events::missing::for_each(const closure &closure) ircd::m::room::missing::for_each(const closure &closure)
const const
{ {
return for_each({0L, 0L}, closure); return for_each({0L, 0L}, closure);
} }
bool bool
ircd::m::room::events::missing::for_each(const pair<int64_t> &depth, ircd::m::room::missing::for_each(const pair<int64_t> &depth,
const closure &closure) const closure &closure)
const const
{ {
room::events it room::events it
@ -53,8 +53,8 @@ const
} }
bool bool
ircd::m::room::events::missing::rfor_each(const pair<int64_t> &depth, ircd::m::room::missing::rfor_each(const pair<int64_t> &depth,
const closure &closure) const closure &closure)
const const
{ {
room::events it room::events it
@ -78,8 +78,8 @@ const
} }
bool bool
ircd::m::room::events::missing::_each(m::room::events &it, ircd::m::room::missing::_each(m::room::events &it,
const closure &closure) const closure &closure)
const const
{ {
const m::event event const m::event event

12
matrix/room_events_sounding.cc → matrix/room_sounding.cc
View File

@ -43,7 +43,7 @@ ircd::m::twain(const room &room)
-1, 0 -1, 0
}; };
const room::events::sounding s const room::sounding s
{ {
room room
}; };
@ -66,7 +66,7 @@ ircd::m::sounding(const room &room)
-1, 0 -1, 0
}; };
const room::events::sounding s const room::sounding s
{ {
room room
}; };
@ -90,7 +90,7 @@ ircd::m::hazard(const room &room)
0, 0 0, 0
}; };
const room::events::sounding s const room::sounding s
{ {
room room
}; };
@ -106,11 +106,11 @@ ircd::m::hazard(const room &room)
} }
// //
// room::events::sounding // room::sounding
// //
bool bool
ircd::m::room::events::sounding::rfor_each(const closure &closure) ircd::m::room::sounding::rfor_each(const closure &closure)
const const
{ {
const int64_t depth const int64_t depth
@ -155,7 +155,7 @@ const
} }
bool bool
ircd::m::room::events::sounding::for_each(const closure &closure) ircd::m::room::sounding::for_each(const closure &closure)
const const
{ {
const int64_t depth const int64_t depth

16
modules/console.cc
View File

@ -9415,7 +9415,7 @@ console_cmd__room(opt &out, const string_view &line)
out << std::endl; out << std::endl;
out << "recent missing: " << std::endl; out << "recent missing: " << std::endl;
const m::room::events::missing missing const m::room::missing missing
{ {
room room
}; };
@ -9463,7 +9463,7 @@ console_cmd__room(opt &out, const string_view &line)
out << "recent gaps: " << std::endl; out << "recent gaps: " << std::endl;
size_t gap_count(4); size_t gap_count(4);
const m::room::events::sounding gaps const m::room::sounding gaps
{ {
room room
}; };
@ -9832,7 +9832,7 @@ console_cmd__room__depth__gaps(opt &out, const string_view &line)
return true; return true;
}}; }};
const m::room::events::sounding gaps const m::room::sounding gaps
{ {
room room
}; };
@ -11310,7 +11310,7 @@ console_cmd__room__events__missing(opt &out, const string_view &line)
m::top(room) m::top(room)
}; };
const m::room::events::missing missing const m::room::missing missing
{ {
room room
}; };
@ -11386,7 +11386,7 @@ console_cmd__room__events__missing__count(opt &out, const string_view &line)
room_id, event_id room_id, event_id
}; };
const m::room::events::missing missing const m::room::missing missing
{ {
room room
}; };
@ -11418,7 +11418,7 @@ console_cmd__room__events__horizon(opt &out, const string_view &line)
room_id room_id
}; };
const m::room::events::horizon horizon const m::room::horizon horizon
{ {
room room
}; };
@ -11462,7 +11462,7 @@ console_cmd__room__events__horizon__count(opt &out, const string_view &line)
room_id, event_id room_id, event_id
}; };
const m::room::events::horizon horizon const m::room::horizon horizon
{ {
room room
}; };
@ -11489,7 +11489,7 @@ console_cmd__room__events__horizon__rebuild(opt &out, const string_view &line)
room_id room_id
}; };
m::room::events::horizon horizon m::room::horizon horizon
{ {
room room
}; };