ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-03 04:40:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ccr-cleanup

Browse Source 
* master:
  bump urbit version number
  if sweep gives 0 and reference count != 0, leak
  added urbit, curl and argon2 to version reporting (urbit -R)
  [CI] bump pinned arvo commit
  bump urbit version number to 0.7.3
  Consistently use "boot:" printf prefix
  Be more precise about the snapshot contents
  Re-add printf to notify of snapshot download
This commit is contained in:
Joe Bryan 2019-04-25 22:56:14 -07:00
commit 5d0f1e1465
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/urbit/daemon/main.c
View File

@ -16,6 +16,8 @@
#include <openssl/ssl.h>
#include <openssl/rand.h>
#include <h2o.h>
#include <curl/curl.h>
#include <argon2.h>
#define U3_GLOBAL
#define C3_GLOBAL
@ -441,6 +443,7 @@ u3_ve_sysopt()
static void
report(void)
{
printf("urbit %s\n", URBIT_VERSION);
printf("---------\nLibraries\n---------\n");
printf("gmp: %s\n", gmp_version);
printf("sigsegv: %d.%d\n",
@ -453,6 +456,11 @@ report(void)
H2O_LIBRARY_VERSION_MAJOR,
H2O_LIBRARY_VERSION_MINOR,
H2O_LIBRARY_VERSION_PATCH);
printf("curl: %d.%d.%d\n",
LIBCURL_VERSION_MAJOR,
LIBCURL_VERSION_MINOR,
LIBCURL_VERSION_PATCH);
printf("argon2: 0x%x\n", ARGON2_VERSION_NUMBER);
}
static void

2
pkg/urbit/noun/allocate.c
View File

@ -1851,7 +1851,7 @@ u3a_sweep(void)
weq_w += box_u->siz_w;
}
else {
_ca_print_leak("weak", box_u, box_u->eus_w, box_u->use_w);
_ca_print_leak("leak", box_u, box_u->eus_w, box_u->use_w);
leq_w += box_u->siz_w;
}

8
pkg/urbit/vere/dawn.c
View File

@ -197,7 +197,7 @@ _dawn_fail(u3_noun who, u3_noun rac, u3_noun sas)
}
}
u3l_log("dawn: invalid keys for %s '%s'\r\n", rac_c, how_c);
u3l_log("boot: invalid keys for %s '%s'\r\n", rac_c, how_c);
// XX deconstruct sas, print helpful error messages
u3m_p("pre-boot error", u3t(sas));
@ -306,20 +306,22 @@ u3_dawn_vent(u3_noun seed)
// load snapshot from file
//
if ( 0 != u3_Host.ops_u.ets_c ) {
u3l_log("boot: loading ethereum snapshot\r\n");
u3l_log("boot: loading azimuth snapshot\r\n");
u3_noun raw_snap = u3ke_cue(u3m_file(u3_Host.ops_u.ets_c));
sap = u3nc(u3_nul, raw_snap);
}
// load snapshot from HTTP URL
//
else if ( 0 != u3_Host.ops_u.sap_c ) {
u3l_log("boot: downloading azimuth snapshot from %s\r\n",
u3_Host.ops_u.sap_c);
u3_noun raw_snap = _dawn_get_jam(u3_Host.ops_u.sap_c);
sap = u3nc(u3_nul, raw_snap);
}
// no snapshot
//
else {
u3l_log("dawn: no ethereum snapshot specified\n");
u3l_log("boot: no azimuth snapshot specified\n");
sap = u3_nul;
}