urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-24 04:58:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

vere: increment event timestamps by ~s0..0001 in queuing loops

Browse Source
This commit is contained in:
Joe Bryan 2020-12-07 00:08:33 -08:00
parent ad40a0ce1f
commit c87e097d80
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/urbit/include/vere/vere.h
View File

@ -428,7 +428,6 @@
/* u3_writ: ipc message from king to serf
*/
typedef struct _u3_writ {
struct timeval tim_u; // time enqueued
struct _u3_writ* nex_u; // next in queue
u3_writ_type typ_e; // type-tagged
union { //
@ -1001,7 +1000,7 @@
/* u3_lord_work(): attempt work.
*/
void
u3_lord_work(u3_lord* god_u, u3_ovum* egg_u, u3_noun ovo);
u3_lord_work(u3_lord* god_u, u3_ovum* egg_u, u3_noun job);
/* u3_lord_play(): recompute batch.
*/

9
pkg/urbit/vere/lord.c
View File

@ -765,7 +765,6 @@ static u3_writ*
_lord_writ_new(u3_lord* god_u)
{
u3_writ* wit_u = c3_calloc(sizeof(*wit_u));
gettimeofday(&wit_u->tim_u, 0);
return wit_u;
}
@ -940,16 +939,12 @@ u3_lord_play(u3_lord* god_u, u3_info fon_u)
/* u3_lord_work(): attempt work.
*/
void
u3_lord_work(u3_lord* god_u, u3_ovum* egg_u, u3_noun ovo)
u3_lord_work(u3_lord* god_u, u3_ovum* egg_u, u3_noun job)
{
u3_writ* wit_u = _lord_writ_new(god_u);
wit_u->typ_e = u3_writ_work;
wit_u->wok_u.egg_u = egg_u;
{
u3_noun now = u3_time_in_tv(&wit_u->tim_u);
wit_u->wok_u.job = u3nc(now, ovo);
}
wit_u->wok_u.job = job;
// if not spinning, start
//

44
pkg/urbit/vere/pier.c
View File

@ -95,12 +95,19 @@ _pier_work_send(u3_work* wok_u)
//
{
u3_ovum* egg_u;
u3_noun ovo;
u3_pico* pic_u;
u3_noun ovo, now, bit = u3qc_bex(48);
{
struct timeval tim_tv;
gettimeofday(&tim_tv, 0);
now = u3_time_in_tv(&tim_tv);
}
while ( len_w && car_u && (egg_u = u3_auto_next(car_u, &ovo)) ) {
len_w--;
u3_lord_work(god_u, egg_u, ovo);
u3_lord_work(god_u, egg_u, u3nc(u3k(now), ovo));
now = u3ka_add(now, u3k(bit));
// queue events depth first
//
@ -123,6 +130,8 @@ _pier_work_send(u3_work* wok_u)
u3_lord_peek(god_u, pic_u);
u3_pico_free(pic_u);
}
u3z(now); u3z(bit);
}
}
@ -832,7 +841,11 @@ _pier_wyrd_init(u3_pier* pir_u)
c3_assert( u3_auto_next(car_u, &ovo) == egg_u );
u3_lord_work(god_u, egg_u, ovo);
{
struct timeval tim_tv;
gettimeofday(&tim_tv, 0);
u3_lord_work(god_u, egg_u, u3nc(u3_time_in_tv(&tim_tv), ovo));
}
}
}
@ -1754,30 +1767,33 @@ _pier_boot_plan(u3_pier* pir_u, u3_noun who, u3_noun ven, u3_noun pil)
// insert module and userspace events
//
// XX increment [now] deterministically?
//
{
struct timeval tim_tv;
u3_noun ova = bot_u.mod;
u3_noun bit = u3qc_bex(48); // 1/2^16 seconds
u3_noun now;
while ( u3_nul != ova ) {
{
struct timeval tim_tv;
gettimeofday(&tim_tv, 0);
u3_disk_boot_plan(pir_u->log_u,
u3nc(u3_time_in_tv(&tim_tv),
u3k(u3h(ova))));
now = u3_time_in_tv(&tim_tv);
}
while ( u3_nul != ova ) {
u3_disk_boot_plan(pir_u->log_u, u3nc(u3k(now), u3k(u3h(ova))));
now = u3ka_add(now, u3k(bit));
ova = u3t(ova);
}
ova = bot_u.use;
while ( u3_nul != ova ) {
gettimeofday(&tim_tv, 0);
u3_disk_boot_plan(pir_u->log_u,
u3nc(u3_time_in_tv(&tim_tv),
u3k(u3h(ova))));
u3_disk_boot_plan(pir_u->log_u, u3nc(u3k(now), u3k(u3h(ova))));
now = u3ka_add(now, u3k(bit));
ova = u3t(ova);
}
u3z(bit); u3z(now);
}
u3_disk_boot_save(pir_u->log_u);