urbit/vere
1
1
Fork 0
mirror of https://github.com/urbit/vere.git synced 2024-10-03 22:57:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename c3_assert() as u3_assert()

Browse Source
This commit is contained in:
Peter McEvoy 2023-04-25 11:32:21 -04:00
parent f66ba84895
commit fe45997aa5
45 changed files with 443 additions and 443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/spec/u3.md
View File

@ -506,12 +506,12 @@ at the global level, and will leave them in an inconsistent state
if your inner road gets terminated. (Instead, use our drop-in
replacements, `u3a_malloc()`, `u3a_free()`, `u3a_realloc()`.)
A good example is the different meaning of `c3_assert()` inside
A good example is the different meaning of `u3_assert()` inside
and outside the interpreter. At either layer, you can use
regular assert(), which will just kill your process. On the
surface, `c3_assert()` will just... kill your process.
surface, `u3_assert()` will just... kill your process.
In deep execution, `c3_assert()` will issue an exception that
In deep execution, `u3_assert()` will issue an exception that
queues an error event, complete with trace stack, on the Arvo
event queue. Let's see how this happens.
@ -544,7 +544,7 @@ on the main thread.
There are also two kinds of exception: mild and severe. An
external exception is always severe. An internal exception is
normally mild, but some (like `c3__oops`, generated by
`c3_assert()`) are severe.
`u3_assert()`) are severe.
Either way, exceptions come with a stack trace. The `u3` nock
interpreter is instrumented to retain stack trace hints and

16
pkg/c3/defs.h
View File

@ -23,21 +23,21 @@
**/
/* Assert. Good to capture.
TODO: determine which c3_assert calls can rather call c3_dessert, i.e. in
public releases, which calls to c3_assert should abort and which should
TODO: determine which u3_assert calls can rather call c3_dessert, i.e. in
public releases, which calls to u3_assert should abort and which should
no-op? If the latter, is the assert useful inter-development to validate
conditions we might accidentally break or not useful at all?
*/
# if defined(ASAN_ENABLED) && defined(__clang__)
# define c3_assert(x) \
# define u3_assert(x) \
do { \
if (!(x)) { \
assert(x); \
} \
} while(0)
# else
# define c3_assert(x) \
# define u3_assert(x) \
do { \
if (!(x)) { \
fflush(stderr); \
@ -71,7 +71,7 @@
/* Stub.
*/
# define c3_stub c3_assert(!"stub")
# define c3_stub u3_assert(!"stub")
/* Size in words.
*/
@ -137,7 +137,7 @@
if ( 0 == rut ) { \
fprintf(stderr, "c3_malloc(%" PRIu64 ") failed\r\n", \
(c3_d)s); \
c3_assert(!"memory lost"); \
u3_assert(!"memory lost"); \
} \
rut;})
# define c3_calloc(s) ({ \
@ -145,7 +145,7 @@
if ( 0 == rut ) { \
fprintf(stderr, "c3_calloc(%" PRIu64 ") failed\r\n", \
(c3_d)s); \
c3_assert(!"memory lost"); \
u3_assert(!"memory lost"); \
} \
rut;})
# define c3_realloc(a, b) ({ \
@ -153,7 +153,7 @@
if ( 0 == rut ) { \
fprintf(stderr, "c3_realloc(%" PRIu64 ") failed\r\n", \
(c3_d)b); \
c3_assert(!"memory lost"); \
u3_assert(!"memory lost"); \
} \
rut;})

80
pkg/noun/allocate.c
View File

@ -111,7 +111,7 @@ _box_make(void* box_v, c3_w siz_w, c3_w use_w)
u3a_box* box_u = box_v;
c3_w* box_w = box_v;
c3_assert(siz_w >= u3a_minimum);
u3_assert(siz_w >= u3a_minimum);
box_u->siz_w = siz_w;
box_w[siz_w - 1] = siz_w; /* stor size at end of allocation as well */
@ -132,8 +132,8 @@ _box_make(void* box_v, c3_w siz_w, c3_w use_w)
static void
_box_attach(u3a_box* box_u)
{
c3_assert(box_u->siz_w >= (1 + c3_wiseof(u3a_fbox)));
c3_assert(0 != u3of(u3a_fbox, box_u));
u3_assert(box_u->siz_w >= (1 + c3_wiseof(u3a_fbox)));
u3_assert(0 != u3of(u3a_fbox, box_u));
#if 0
// For debugging, fill the box with beef.
@ -176,13 +176,13 @@ _box_detach(u3a_box* box_u)
if ( nex_p ) {
if ( u3to(u3a_fbox, nex_p)->pre_p != fre_p ) {
c3_assert(!"loom: corrupt");
u3_assert(!"loom: corrupt");
}
u3to(u3a_fbox, nex_p)->pre_p = pre_p;
}
if ( pre_p ) {
if( u3to(u3a_fbox, pre_p)->nex_p != fre_p ) {
c3_assert(!"loom: corrupt");
u3_assert(!"loom: corrupt");
}
u3to(u3a_fbox, pre_p)->nex_p = nex_p;
}
@ -190,7 +190,7 @@ _box_detach(u3a_box* box_u)
c3_w sel_w = _box_slot(box_u->siz_w);
if ( fre_p != u3R->all.fre_p[sel_w] ) {
c3_assert(!"loom: corrupt");
u3_assert(!"loom: corrupt");
}
u3R->all.fre_p[sel_w] = nex_p;
}
@ -203,7 +203,7 @@ _box_free(u3a_box* box_u)
{
c3_w* box_w = (c3_w *)(void *)box_u;
c3_assert(box_u->use_w != 0);
u3_assert(box_u->use_w != 0);
box_u->use_w -= 1;
if ( 0 != box_u->use_w ) {
return;
@ -378,13 +378,13 @@ u3a_sane(void)
while ( fre_u ) {
if ( fre_u == u3R->all.fre_u[i_w] ) {
c3_assert(fre_u->pre_u == 0);
u3_assert(fre_u->pre_u == 0);
}
else {
c3_assert(fre_u->pre_u != 0);
c3_assert(fre_u->pre_u->nex_u == fre_u);
u3_assert(fre_u->pre_u != 0);
u3_assert(fre_u->pre_u->nex_u == fre_u);
if ( fre_u->nex_u != 0 ) {
c3_assert(fre_u->nex_u->pre_u == fre_u);
u3_assert(fre_u->nex_u->pre_u == fre_u);
}
}
fre_u = fre_u->nex_u;
@ -536,14 +536,14 @@ _ca_willoc(c3_w len_w, c3_w ald_w, c3_w off_w)
(u3to(u3a_fbox, u3to(u3a_fbox, *pfr_p)->pre_p)->nex_p
!= (*pfr_p)) )
{ /* this->pre->nex isn't this */
c3_assert(!"loom: corrupt");
u3_assert(!"loom: corrupt");
}
if( (0 != u3to(u3a_fbox, *pfr_p)->nex_p) &&
(u3to(u3a_fbox, u3to(u3a_fbox, *pfr_p)->nex_p)->pre_p
!= (*pfr_p)) )
{ /* this->nex->pre isn't this */
c3_assert(!"loom: corrupt");
u3_assert(!"loom: corrupt");
}
/* pop the block */
@ -575,7 +575,7 @@ _ca_willoc(c3_w len_w, c3_w ald_w, c3_w off_w)
return u3a_boxto(_box_make(box_w, des_w, 1));
}
else {
c3_assert(0 == box_u->use_w);
u3_assert(0 == box_u->use_w);
box_u->use_w = 1;
#ifdef U3_MEMORY_DEBUG
@ -738,7 +738,7 @@ u3a_calloc(size_t num_i, size_t len_i)
size_t byt_i = num_i * len_i;
c3_w* out_w;
c3_assert(byt_i / len_i == num_i);
u3_assert(byt_i / len_i == num_i);
out_w = u3a_malloc(byt_i);
memset(out_w, 0, byt_i);
@ -981,8 +981,8 @@ _me_wash_north_in(u3_noun som)
static void
_me_wash_north(u3_noun dog)
{
c3_assert(c3y == u3a_is_dog(dog));
// c3_assert(c3y == u3a_north_is_junior(u3R, dog));
u3_assert(c3y == u3a_is_dog(dog));
// u3_assert(c3y == u3a_north_is_junior(u3R, dog));
{
u3a_noun* dog_u = u3a_to_ptr(dog);
@ -1014,8 +1014,8 @@ _me_wash_south_in(u3_noun som)
static void
_me_wash_south(u3_noun dog)
{
c3_assert(c3y == u3a_is_dog(dog));
// c3_assert(c3y == u3a_south_is_junior(u3R, dog));
u3_assert(c3y == u3a_is_dog(dog));
// u3_assert(c3y == u3a_south_is_junior(u3R, dog));
{
u3a_noun* dog_u = u3a_to_ptr(dog);
@ -1185,7 +1185,7 @@ _ca_take_next_north(u3a_pile* pil_u, u3_noun veb)
if ( veb_u->mug_w >> 31 ) {
u3_noun nov = (u3_noun)veb_u->mug_w;
c3_assert( c3y == u3a_north_is_normal(u3R, nov) );
u3_assert( c3y == u3a_north_is_normal(u3R, nov) );
#ifdef VERBOSE_TAKE
u3l_log("north: %p is already %p", veb_u, u3a_to_ptr(nov));
@ -1240,7 +1240,7 @@ _ca_take_next_south(u3a_pile* pil_u, u3_noun veb)
if ( veb_u->mug_w >> 31 ) {
u3_noun nov = (u3_noun)veb_u->mug_w;
c3_assert( c3y == u3a_south_is_normal(u3R, nov) );
u3_assert( c3y == u3a_south_is_normal(u3R, nov) );
#ifdef VERBOSE_TAKE
u3l_log("south: %p is already %p", veb_u, u3a_to_ptr(nov));
@ -1355,7 +1355,7 @@ u3a_take(u3_noun veb)
u3_noun pro;
u3t_on(coy_o);
c3_assert(u3_none != veb);
u3_assert(u3_none != veb);
pro = ( c3y == u3a_is_north(u3R) )
? _ca_take_north(veb)
@ -1395,7 +1395,7 @@ _me_gain_north(u3_noun dog)
else {
/* junior nouns are disallowed
*/
c3_assert(!_(u3a_north_is_junior(u3R, dog)));
u3_assert(!_(u3a_north_is_junior(u3R, dog)));
/* normal pointers are refcounted
*/
@ -1417,7 +1417,7 @@ _me_gain_south(u3_noun dog)
else {
/* junior nouns are disallowed
*/
c3_assert(!_(u3a_south_is_junior(u3R, dog)));
u3_assert(!_(u3a_south_is_junior(u3R, dog)));
/* normal nouns are refcounted
*/
@ -1512,7 +1512,7 @@ u3_noun
u3a_gain(u3_noun som)
{
u3t_on(mal_o);
c3_assert(u3_none != som);
u3_assert(u3_none != som);
if ( !_(u3a_is_cat(som)) ) {
som = _(u3a_is_north(u3R))
@ -1711,7 +1711,7 @@ u3a_mark_ptr(void* ptr_v)
siz_w = 0;
}
else {
c3_assert(use_ws != 0);
u3_assert(use_ws != 0);
if ( 0x80000000 == (c3_w)use_ws ) { // see _raft_prof()
use_ws = -1;
@ -1839,7 +1839,7 @@ u3a_count_ptr(void* ptr_v)
siz_w = 0;
}
else {
c3_assert(use_ws != 0);
u3_assert(use_ws != 0);
if ( use_ws < 0 ) {
siz_w = 0;
@ -1913,7 +1913,7 @@ u3a_discount_ptr(void* ptr_v)
siz_w = 0;
}
else {
c3_assert(use_ws != 0);
u3_assert(use_ws != 0);
if ( use_ws < 0 ) {
use_ws = -use_ws;
@ -1963,7 +1963,7 @@ u3a_discount_noun(u3_noun som)
void
u3a_print_time(c3_c* str_c, c3_c* cap_c, c3_d mic_d)
{
c3_assert( 0 != str_c );
u3_assert( 0 != str_c );
c3_w sec_w = (mic_d / 1000000);
c3_w mec_w = (mic_d % 1000000) / 1000;
@ -1985,7 +1985,7 @@ u3a_print_time(c3_c* str_c, c3_c* cap_c, c3_d mic_d)
void
u3a_print_memory(FILE* fil_u, c3_c* cap_c, c3_w wor_w)
{
c3_assert( 0 != fil_u );
u3_assert( 0 != fil_u );
c3_z byt_z = ((c3_z)wor_w * 4);
c3_z gib_z = (byt_z / 1000000000);
@ -2318,8 +2318,8 @@ u3a_sweep(void)
u3a_print_memory(stderr, "leaked", leq_w);
u3a_print_memory(stderr, "weaked", weq_w);
c3_assert( (pos_w + leq_w + weq_w) == neg_w );
c3_assert( (0 == leq_w) && (0 == weq_w) );
u3_assert( (pos_w + leq_w + weq_w) == neg_w );
u3_assert( (0 == leq_w) && (0 == weq_w) );
return neg_w;
}
@ -2408,7 +2408,7 @@ _ca_pack_move_north(c3_w* box_w, c3_w* end_w, u3_post new_p)
if ( old_u->use_w ) {
c3_w* new_w = (void*)u3a_botox(u3a_into(new_p));
c3_assert( box_w[siz_w - 1] == new_p );
u3_assert( box_w[siz_w - 1] == new_p );
// note: includes leading size
//
@ -2420,7 +2420,7 @@ _ca_pack_move_north(c3_w* box_w, c3_w* end_w, u3_post new_p)
}
}
else {
c3_assert( new_w == box_w );
u3_assert( new_w == box_w );
}
// restore trailing size
@ -2464,7 +2464,7 @@ _ca_pack_move_south(c3_w* box_w, c3_w* end_w, u3_post new_p)
if ( old_u->use_w ) {
c3_w* new_w = (void*)u3a_botox(u3a_into(new_p));
c3_assert( old_u->siz_w == new_p );
u3_assert( old_u->siz_w == new_p );
// note: includes trailing size
//
@ -2476,7 +2476,7 @@ _ca_pack_move_south(c3_w* box_w, c3_w* end_w, u3_post new_p)
}
}
else {
c3_assert( new_w == box_w );
u3_assert( new_w == box_w );
}
// restore leading size
@ -2500,7 +2500,7 @@ _ca_pack_move_south(c3_w* box_w, c3_w* end_w, u3_post new_p)
}
}
else {
c3_assert( end_w == box_w );
u3_assert( end_w == box_w );
break;
}
}
@ -2734,11 +2734,11 @@ u3a_loom_sane()
u3a_fbox *pre_u = u3to(u3a_fbox, this_u->pre_p)
, *nex_u = u3to(u3a_fbox, this_u->nex_p);
if (nex_p && nex_u->pre_p != this_p) c3_assert(!"loom: wack");
if (pre_p && pre_u->nex_p != this_p) c3_assert(!"loom: wack");
if (nex_p && nex_u->pre_p != this_p) u3_assert(!"loom: wack");
if (pre_p && pre_u->nex_p != this_p) u3_assert(!"loom: wack");
if (!pre_p /* this must be the head of a freelist */
&& u3R->all.fre_p[_box_slot(this_u->box_u.siz_w)] != this_p)
c3_assert(!"loom: wack");
u3_assert(!"loom: wack");
}
}
}

8
pkg/noun/allocate.h
View File

@ -386,7 +386,7 @@
u3C.vits_w = 1;
break;
default:
c3_assert(0);
u3_assert(0);
}
u3C.walign_w = 1 << u3C.vits_w;
@ -479,7 +479,7 @@
u3m_bail(c3__meme);
}
# ifdef U3_MEMORY_DEBUG
c3_assert( pil_u->top_p >= u3R->cap_p );
u3_assert( pil_u->top_p >= u3R->cap_p );
# endif
}
else {
@ -487,13 +487,13 @@
u3m_bail(c3__meme);
}
# ifdef U3_MEMORY_DEBUG
c3_assert( pil_u->top_p <= u3R->cap_p );
u3_assert( pil_u->top_p <= u3R->cap_p );
# endif
}
#endif /* ifndef U3_GUARD_PAGE */
#ifdef U3_MEMORY_DEBUG
c3_assert( pil_u->rod_u == u3R );
u3_assert( pil_u->rod_u == u3R );
#endif
return u3a_peek(pil_u);

72
pkg/noun/events.c
View File

@ -141,14 +141,14 @@ u3e_check(c3_c* cap_c)
for ( i_w = 0; i_w < nor_w; i_w++ ) {
mug_w = _ce_check_page(i_w);
if ( strcmp(cap_c, "boot") ) {
c3_assert(mug_w == u3K.mug_w[i_w]);
u3_assert(mug_w == u3K.mug_w[i_w]);
}
sum_w += mug_w;
}
for ( i_w = 0; i_w < sou_w; i_w++ ) {
mug_w = _ce_check_page((u3P.pag_w - (i_w + 1)));
if ( strcmp(cap_c, "boot") ) {
c3_assert(mug_w == u3K.mug_w[(u3P.pag_w - (i_w + 1))]);
u3_assert(mug_w == u3K.mug_w[(u3P.pag_w - (i_w + 1))]);
}
sum_w += mug_w;
}
@ -170,7 +170,7 @@ _ce_maplloc(c3_w len_w)
-1, 0);
if ( -1 == (c3_ps)map_v ) {
c3_assert(0);
u3_assert(0);
}
else {
c3_w* map_w = map_v;
@ -192,7 +192,7 @@ _ce_mapfree(void* map_v)
map_w -= 1;
res_i = munmap(map_w, map_w[0]);
c3_assert(0 == res_i);
u3_assert(0 == res_i);
}
#endif
@ -269,7 +269,7 @@ u3e_fault(void* adr_v, c3_i ser_i)
if ( (adr_w < u3_Loom) || (adr_w >= (u3_Loom + u3C.wor_i)) ) {
fprintf(stderr, "address %p out of loom!\r\n", adr_w);
fprintf(stderr, "loom: [%p : %p)\r\n", u3_Loom, u3_Loom + u3C.wor_i);
c3_assert(0);
u3_assert(0);
return 0;
}
@ -289,7 +289,7 @@ u3e_fault(void* adr_v, c3_i ser_i)
#endif /* ifdef U3_GUARD_PAGE */
if ( 0 != (u3P.dit_w[blk_w] & (1 << bit_w)) ) {
fprintf(stderr, "strange page: %d, at %p, off %x\r\n", pag_w, adr_w, adr_p);
c3_assert(0);
u3_assert(0);
return 0;
}
@ -300,7 +300,7 @@ u3e_fault(void* adr_v, c3_i ser_i)
(PROT_READ | PROT_WRITE)) )
{
fprintf(stderr, "loom: fault mprotect: %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
return 0;
}
@ -334,7 +334,7 @@ _ce_image_open(u3e_image* img_u)
if ( -1 == fstat(img_u->fid_i, &buf_u) ) {
fprintf(stderr, "loom: stat %s: %s\r\n", ful_c, strerror(errno));
c3_assert(0);
u3_assert(0);
return c3n;
}
else {
@ -351,7 +351,7 @@ _ce_image_open(u3e_image* img_u)
return c3n;
}
img_u->pgs_w = (c3_w) pgs_d;
c3_assert(pgs_d == (c3_d)img_u->pgs_w);
u3_assert(pgs_d == (c3_d)img_u->pgs_w);
return c3y;
}
@ -375,7 +375,7 @@ _ce_patch_write_control(u3_ce_patch* pat_u)
else {
fprintf(stderr, "loom: patch ctl write: %s\r\n", strerror(errno));
}
c3_assert(0);
u3_assert(0);
}
}
@ -386,12 +386,12 @@ _ce_patch_read_control(u3_ce_patch* pat_u)
{
c3_w len_w;
c3_assert(0 == pat_u->con_u);
u3_assert(0 == pat_u->con_u);
{
struct stat buf_u;
if ( -1 == fstat(pat_u->ctl_i, &buf_u) ) {
c3_assert(0);
u3_assert(0);
return c3n;
}
len_w = (c3_w) buf_u.st_size;
@ -425,13 +425,13 @@ _ce_patch_create(u3_ce_patch* pat_u)
snprintf(ful_c, 8192, "%s/.urb/chk/control.bin", u3P.dir_c);
if ( -1 == (pat_u->ctl_i = c3_open(ful_c, O_RDWR | O_CREAT | O_EXCL, 0600)) ) {
fprintf(stderr, "loom: patch c3_open control.bin: %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
}
snprintf(ful_c, 8192, "%s/.urb/chk/memory.bin", u3P.dir_c);
if ( -1 == (pat_u->mem_i = c3_open(ful_c, O_RDWR | O_CREAT | O_EXCL, 0600)) ) {
fprintf(stderr, "loom: patch c3_open memory.bin: %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
}
}
@ -577,7 +577,7 @@ _ce_patch_write_page(u3_ce_patch* pat_u,
if ( -1 == lseek(pat_u->mem_i, pgc_w * pag_siz_i, SEEK_SET) ) {
fprintf(stderr, "loom: patch page seek: %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
}
if ( pag_siz_i != (ret_i = write(pat_u->mem_i, mem_w, pag_siz_i)) ) {
@ -588,7 +588,7 @@ _ce_patch_write_page(u3_ce_patch* pat_u,
else {
fprintf(stderr, "loom: patch page write: %s\r\n", strerror(errno));
}
c3_assert(0);
u3_assert(0);
}
}
@ -633,7 +633,7 @@ _ce_patch_save_page(u3_ce_patch* pat_u,
PROT_READ) )
{
fprintf(stderr, "loom: patch mprotect: %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
}
u3P.dit_w[blk_w] &= ~(1 << bit_w);
@ -661,7 +661,7 @@ _ce_patch_compose(void)
nor_w = (nwr_w + (pag_wiz_i - 1)) >> u3a_page;
sou_w = (swu_w + (pag_wiz_i - 1)) >> u3a_page;
c3_assert( ((gar_pag_p >> u3a_page) >= nor_w)
u3_assert( ((gar_pag_p >> u3a_page) >= nor_w)
&& ((gar_pag_p >> u3a_page) <= (u3a_pages - (sou_w + 1))) );
}
@ -719,13 +719,13 @@ _ce_patch_sync(u3_ce_patch* pat_u)
if ( -1 == c3_sync(pat_u->ctl_i) ) {
fprintf(stderr, "loom: control file sync failed: %s\r\n",
strerror(errno));
c3_assert(!"loom: control sync");
u3_assert(!"loom: control sync");
}
if ( -1 == c3_sync(pat_u->mem_i) ) {
fprintf(stderr, "loom: patch file sync failed: %s\r\n",
strerror(errno));
c3_assert(!"loom: patch sync");
u3_assert(!"loom: patch sync");
}
}
@ -738,7 +738,7 @@ _ce_image_sync(u3e_image* img_u)
fprintf(stderr, "loom: image (%s) sync failed: %s\r\n",
img_u->nam_c,
strerror(errno));
c3_assert(!"loom: image sync");
u3_assert(!"loom: image sync");
}
}
@ -752,7 +752,7 @@ _ce_image_resize(u3e_image* img_u, c3_w pgs_w)
fprintf(stderr, "loom: image (%s) truncate: %s\r\n",
img_u->nam_c,
strerror(errno));
c3_assert(0);
u3_assert(0);
}
}
@ -779,7 +779,7 @@ _ce_patch_apply(u3_ce_patch* pat_u)
|| (-1 == lseek(u3P.sou_u.fid_i, 0, SEEK_SET)) )
{
fprintf(stderr, "loom: patch apply seek 0: %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
}
// write patch pages into the appropriate image
@ -807,12 +807,12 @@ _ce_patch_apply(u3_ce_patch* pat_u)
else {
fprintf(stderr, "loom: patch apply read: %s\r\n", strerror(errno));
}
c3_assert(0);
u3_assert(0);
}
else {
if ( -1 == lseek(fid_i, (off_w << (u3a_page + 2)), SEEK_SET) ) {
fprintf(stderr, "loom: patch apply seek: %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
}
if ( pag_siz_i != (ret_i = write(fid_i, mem_w, pag_siz_i)) ) {
if ( 0 < ret_i ) {
@ -822,7 +822,7 @@ _ce_patch_apply(u3_ce_patch* pat_u)
else {
fprintf(stderr, "loom: patch apply write: %s\r\n", strerror(errno));
}
c3_assert(0);
u3_assert(0);
}
}
#if 0
@ -849,7 +849,7 @@ _ce_image_blit(u3e_image* img_u,
if ( -1 == lseek(img_u->fid_i, 0, SEEK_SET) ) {
fprintf(stderr, "loom: image (%s) blit seek 0: %s\r\n",
img_u->nam_c, strerror(errno));
c3_assert(0);
u3_assert(0);
}
for ( i_w = 0; i_w < img_u->pgs_w; i_w++ ) {
@ -862,12 +862,12 @@ _ce_image_blit(u3e_image* img_u,
fprintf(stderr, "loom: image (%s) blit read: %s\r\n",
img_u->nam_c, strerror(errno));
}
c3_assert(0);
u3_assert(0);
}
if ( 0 != mprotect(ptr_w, siz_w, PROT_READ) ) {
fprintf(stderr, "loom: live mprotect: %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
}
c3_w pag_w = u3a_outa(ptr_w) >> u3a_page;
@ -893,7 +893,7 @@ _ce_image_fine(u3e_image* img_u,
if ( -1 == lseek(img_u->fid_i, 0, SEEK_SET) ) {
fprintf(stderr, "loom: image fine seek 0: %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
}
for ( i_w=0; i_w < img_u->pgs_w; i_w++ ) {
@ -908,7 +908,7 @@ _ce_image_fine(u3e_image* img_u,
fprintf(stderr, "loom: image (%s) fine read: %s\r\n",
img_u->nam_c, strerror(errno));
}
c3_assert(0);
u3_assert(0);
}
mem_w = u3r_mug_words(ptr_w, pag_wiz_i);
fil_w = u3r_mug_words(buf_w, pag_wiz_i);
@ -1086,7 +1086,7 @@ u3e_save(void)
_ce_patch_sync(pat_u);
if ( c3n == _ce_patch_verify(pat_u) ) {
c3_assert(!"loom: save failed");
u3_assert(!"loom: save failed");
}
_ce_patch_apply(pat_u);
@ -1101,8 +1101,8 @@ u3e_save(void)
(u3_Loom + u3C.wor_i) - pag_wiz_i,
-(ssize_t)pag_wiz_i);
c3_assert(u3P.nor_u.pgs_w == u3K.nor_w);
c3_assert(u3P.sou_u.pgs_w == u3K.sou_w);
u3_assert(u3P.nor_u.pgs_w == u3K.nor_w);
u3_assert(u3P.sou_u.pgs_w == u3K.sou_w);
}
#endif
@ -1226,7 +1226,7 @@ u3e_yolo(void)
if ( 0 != mprotect(u3a_into(gar_pag_p), pag_siz_i, PROT_NONE) ) {
fprintf(stderr, "loom: failed to protect guard page: %s\r\n",
strerror(errno));
c3_assert(0);
u3_assert(0);
}
return c3y;
@ -1269,7 +1269,7 @@ u3e_ward(u3_post low_p, u3_post hig_p)
{
fprintf(stderr, "loom: failed to unprotect old guard page: %s\r\n",
strerror(errno));
c3_assert(0);
u3_assert(0);
}
{

2
pkg/noun/hashtable.c
View File

@ -224,7 +224,7 @@ _ch_slot_put(u3h_slot* sot_w, u3_noun kev, c3_w lef_w, c3_w rem_w, c3_w* use_w)
kev,
use_w);
c3_assert( c3y == u3h_slot_is_node(*sot_w) );
u3_assert( c3y == u3h_slot_is_node(*sot_w) );
*sot_w = u3h_node_to_slot(hav_v);
}
else {

2
pkg/noun/hashtable_tests.c
View File

@ -121,7 +121,7 @@ _test_skip_slot(void)
{
c3_w mug_w = 31 << 20; // 5 bits, all ones
c3_w res_w = _ch_skip_slot(mug_w, 20);
c3_assert((1 << 25) == res_w);
u3_assert((1 << 25) == res_w);
if ( (1 << 25) != res_w ) {
fprintf(stderr, "bit skip_slot (d): failed\r\n");

18
pkg/noun/imprison.c
View File

@ -40,7 +40,7 @@ _ci_slab_init(u3i_slab* sab_u, c3_w len_w)
vat_u->len_w = len_w;
#ifdef U3_MEMORY_DEBUG
c3_assert( len_w );
u3_assert( len_w );
#endif
sab_u->_._vat_u = vat_u;
@ -203,11 +203,11 @@ u3i_slab_free(u3i_slab* sab_u)
u3t_on(mal_o);
if ( 1 == len_w ) {
c3_assert( !vat_u );
u3_assert( !vat_u );
}
else {
c3_w* tav_w = (sab_u->buf_w - c3_wiseof(u3a_atom));
c3_assert( tav_w == (c3_w*)vat_u );
u3_assert( tav_w == (c3_w*)vat_u );
u3a_wfree(vat_u);
}
@ -228,7 +228,7 @@ u3i_slab_mint(u3i_slab* sab_u)
if ( 1 == len_w ) {
c3_w dat_w = *sab_u->buf_w;
c3_assert( !vat_u );
u3_assert( !vat_u );
u3t_off(mal_o);
pro = u3i_word(dat_w);
@ -237,7 +237,7 @@ u3i_slab_mint(u3i_slab* sab_u)
else {
u3a_atom* vat_u = sab_u->_._vat_u;
c3_w* tav_w = (sab_u->buf_w - c3_wiseof(u3a_atom));
c3_assert( tav_w == (c3_w*)vat_u );
u3_assert( tav_w == (c3_w*)vat_u );
// trim trailing zeros
//
@ -266,7 +266,7 @@ u3i_slab_moot(u3i_slab* sab_u)
if ( 1 == len_w) {
c3_w dat_w = *sab_u->buf_w;
c3_assert( !sab_u->_._vat_u );
u3_assert( !sab_u->_._vat_u );
u3t_off(mal_o);
pro = u3i_word(dat_w);
@ -275,7 +275,7 @@ u3i_slab_moot(u3i_slab* sab_u)
else {
u3a_atom* vat_u = sab_u->_._vat_u;
c3_w* tav_w = (sab_u->buf_w - c3_wiseof(u3a_atom));
c3_assert( tav_w == (c3_w*)vat_u );
u3_assert( tav_w == (c3_w*)vat_u );
pro = _ci_atom_mint(vat_u, len_w);
}
@ -456,7 +456,7 @@ u3i_mp(mpz_t a_mp)
u3_atom
u3i_vint(u3_noun a)
{
c3_assert(u3_none != a);
u3_assert(u3_none != a);
if ( _(u3a_is_cat(a)) ) {
return ( a == 0x7fffffff ) ? u3i_word(a + 1) : (a + 1);
@ -819,7 +819,7 @@ u3i_molt(u3_noun som, ...)
va_end(ap);
}
c3_assert( 0 != len_w );
u3_assert( 0 != len_w );
pms_m = alloca(len_w * sizeof(struct _molt_pair));
// Install.

22
pkg/noun/jets.c
View File

@ -90,9 +90,9 @@ _cj_hash(c3_c* has_c)
c3_w i_w, len_w = strlen(has_c);
if ( 64 != len_w ) {
u3l_log("bash not 64 characters: %s", has_c);
c3_assert(0);
u3_assert(0);
}
c3_assert( 64 == len_w );
u3_assert( 64 == len_w );
c3_y dig_y[32];
for ( i_w = 0; i_w < 64; ) {
c3_y hi_y = has_c[i_w++],
@ -321,7 +321,7 @@ static c3_w
_cj_install(u3j_core* ray_u, c3_w jax_l, u3_noun pel, u3_noun lab, u3j_core* dev_u)
{
c3_w i_w;
c3_assert(u3R == &(u3H->rod_u));
u3_assert(u3R == &(u3H->rod_u));
if ( dev_u ) {
for ( i_w = 0; 0 != dev_u[i_w].cos_c; i_w++ ) {
@ -709,7 +709,7 @@ _cj_cast(u3_noun cor, u3_noun loc)
fis_u->pax = u3k(u3t(par));
}
u3z(rev);
c3_assert( u3_nul == j );
u3_assert( u3_nul == j );
return u3of(u3j_fink, fin_u);
}
@ -746,7 +746,7 @@ _cj_nail(u3_noun loc, u3_noun axe,
u3_noun jax, hap, bal, jit;
u3_weak act;
act = _cj_find_warm(loc);
c3_assert(u3_none != act);
u3_assert(u3_none != act);
u3x_qual(act, &jax, &hap, &bal, &jit);
*lab = u3k(bal);
@ -813,7 +813,7 @@ _cj_hot_mean(c3_l par_l, u3_noun nam)
c3_w
u3j_boot(c3_o nuu_o)
{
c3_assert(u3R == &(u3H->rod_u));
u3_assert(u3R == &(u3H->rod_u));
u3D.len_l = _cj_count(0, u3D.dev_u);
u3D.all_l = (2 * u3D.len_l) + 1024; // horrid heuristic
@ -1125,7 +1125,7 @@ _cj_hank_fine(_cj_hank* han_u, u3_noun cor, u3_noun *inn)
}
else {
u3j_site* sit_u = &(han_u->sit_u);
c3_assert(u3_none != sit_u->loc);
u3_assert(u3_none != sit_u->loc);
return _cj_fine(*inn, sit_u->fin_p);
}
}
@ -1704,7 +1704,7 @@ u3j_gate_prep(u3j_site* sit_u, u3_noun cor)
u3l_log("u3j_gate_prep(): parent axis includes sample");
u3m_p("axis", pax);
u3_weak act = _cj_find_warm(loc);
c3_assert( u3_none != act );
u3_assert( u3_none != act );
sit_u->jet_o = c3n;
sit_u->lab = u3k(u3h(u3t(u3t(act))));
u3z(act);
@ -1828,7 +1828,7 @@ _cj_mine(u3_noun cey, u3_noun cor, u3_noun bas)
}
else {
u3_weak pac = _cj_find_warm(pel);
c3_assert(u3_none != pac);
u3_assert(u3_none != pac);
par_l = u3h(pac);
bal = u3nc(u3k(nam), u3k(u3h(u3t(u3t(pac)))));
u3z(pac);
@ -2179,7 +2179,7 @@ void
u3j_ream(void)
{
u3_noun rel = u3_nul;
c3_assert(u3R == &(u3H->rod_u));
u3_assert(u3R == &(u3H->rod_u));
u3h_free(u3R->jed.war_p);
u3R->jed.war_p = u3h_new();
u3h_walk_with(u3R->jed.cod_p, _cj_warm_tap, &rel);
@ -2195,7 +2195,7 @@ u3_noun
u3j_stay(void)
{
u3_noun rel = u3_nul;
c3_assert(u3R == &(u3H->rod_u));
u3_assert(u3R == &(u3H->rod_u));
u3h_walk_with(u3R->jed.cod_p, _cj_warm_tap, &rel);
return rel;
}

2
pkg/noun/jets/e/hmac.c
View File

@ -16,7 +16,7 @@
u3_atom wid,
u3_atom dat)
{
c3_assert(_(u3a_is_cat(boq)) && _(u3a_is_cat(wik)) && _(u3a_is_cat(wid)));
u3_assert(_(u3a_is_cat(boq)) && _(u3a_is_cat(wik)) && _(u3a_is_cat(wid)));
// prep the hashing gate
u3j_site sit_u;

12
pkg/noun/jets/e/json_de.c
View File

@ -121,7 +121,7 @@ _parse(u3_atom txt)
while ( json_peek(sam_u) != JSON_DONE ) {
switch ( json_next(sam_u) ) {
// unreachable barring programming error
default: c3_assert(0);
default: u3_assert(0);
case JSON_ARRAY:
case JSON_OBJECT: {
@ -175,7 +175,7 @@ _parse(u3_atom txt)
switch ( json_get_context(sam_u, &cnt_d) ) {
// unreachable barring programming error
default: c3_assert(0);
default: u3_assert(0);
case JSON_DONE: {
res = val;
@ -199,10 +199,10 @@ _parse(u3_atom txt)
case JSON_OBJECT: {
// odd cnt_d and unset key weeded out by continue command on key
c3_assert(!(cnt_d & 1));
c3_assert(tak_u->key != u3_none);
u3_assert(!(cnt_d & 1));
u3_assert(tak_u->key != u3_none);
// cnt_d == 0 weeded out by continue command on array/object open
c3_assert(cnt_d);
u3_assert(cnt_d);
tak_u->col = u3kdb_put(tak_u->col, tak_u->key, val);
tak_u->key = u3_none;
@ -214,7 +214,7 @@ _parse(u3_atom txt)
// clean up
//
c3_assert(c3y == u3a_pile_done(pil_u));
u3_assert(c3y == u3a_pile_done(pil_u));
// skip over whitespce
while ( json_isspace(json_source_peek(sam_u)) ) {

4
pkg/noun/jets/e/json_en.c
View File

@ -102,7 +102,7 @@ static void
_serialize_loobean(json_buffer *buf_u, u3_noun a)
{
switch ( a ) {
default: c3_assert(0);
default: u3_assert(0);
case c3y: return _append_text(buf_u, _JSON_TRUE, sizeof(_JSON_TRUE) - 1);
case c3n: return _append_text(buf_u, _JSON_FALSE, sizeof(_JSON_FALSE) - 1);
}
@ -369,7 +369,7 @@ _serialize(json_buffer *buf_u, u3_noun a)
u3x_cell(a, &s, &p);
switch ( s ) {
default: c3_assert(0);
default: u3_assert(0);
case c3__a: return _serialize_array(buf_u, p);
case c3__o: return _serialize_object(buf_u, p);
case c3__b: return _serialize_loobean(buf_u, p);

4
pkg/noun/jets/e/loss.c
View File

@ -116,7 +116,7 @@
(inx_w == 0) ? u3_nul
: u3k(loc_u->kad[inx_w - 1]));
if ( loc_u->kct_w == inx_w ) {
c3_assert(loc_u->kct_w < (1 << 31));
u3_assert(loc_u->kct_w < (1 << 31));
loc_u->kct_w++;
} else {
u3z(loc_u->kad[inx_w]);
@ -181,7 +181,7 @@
c3_w max_w,
c3_w goy_w)
{
c3_assert(max_w >= *inx_w);
u3_assert(max_w >= *inx_w);
if ( max_w == *inx_w ) {
if ( c3n == _lonk(loc_u, *inx_w, goy_w) ) {

2
pkg/noun/jets/f/ap.c
View File

@ -513,7 +513,7 @@
u3qdb_put(q_gen, u3_blip, diz)),
u3nc(c3__cnzy, u3_blip));
c3_assert(0);
u3_assert(0);
u3z(diz);
return ret;
}

2
pkg/noun/jets/f/flip.c
View File

@ -14,7 +14,7 @@
return u3nc(1, c3n);
}
else {
c3_assert((c3n == u3t(hel)));
u3_assert((c3n == u3t(hel)));
return u3nc(1, c3y);
}

2
pkg/noun/jets/f/hike.c
View File

@ -89,7 +89,7 @@
u3qf_hike(u3_noun axe,
u3_noun pac)
{
c3_assert(0);
u3_assert(0);
if ( (u3_nul == pac) ) {
return u3nc(0, u3k(axe));
}

34
pkg/noun/manage.c
View File

@ -739,7 +739,7 @@ u3m_bail(u3_noun how)
fprintf(stderr, "\r\nbail: %s\r\n", str_c);
}
else if ( 1 != u3h(how) ) {
c3_assert(_(u3ud(u3h(how))));
u3_assert(_(u3ud(u3h(how))));
fprintf(stderr, "\r\nbail: %d\r\n", u3h(how));
}
}
@ -765,7 +765,7 @@ u3m_bail(u3_noun how)
// XX JB: these seem unrecoverable, at least wrt memory management,
// so they've been disabled above for now
//
c3_assert(_(u3a_is_cat(how)));
u3_assert(_(u3a_is_cat(how)));
u3m_signal(how);
}
@ -867,7 +867,7 @@ u3m_leap(c3_w pad_w)
/* Attach the new road to its parents.
*/
{
c3_assert(0 == u3R->kid_p);
u3_assert(0 == u3R->kid_p);
rod_u->par_p = u3of(u3_road, u3R);
u3R->kid_p = u3of(u3_road, rod_u);
}
@ -897,7 +897,7 @@ _print_diff(c3_c* cap_c, c3_w a, c3_w b)
void
u3m_fall()
{
c3_assert(0 != u3R->par_p);
u3_assert(0 != u3R->par_p);
#if 0
/* If you're printing a lot of these you need to change
@ -945,7 +945,7 @@ u3m_fall()
void
u3m_hate(c3_w pad_w)
{
c3_assert(0 == u3R->ear_p);
u3_assert(0 == u3R->ear_p);
u3R->ear_p = u3R->cap_p;
u3m_leap(pad_w);
@ -1029,7 +1029,7 @@ u3m_flog(c3_w gof_w)
void
u3m_water(c3_w* low_w, c3_w* hig_w)
{
c3_assert(u3R == &u3H->rod_u);
u3_assert(u3R == &u3H->rod_u);
*low_w = u3a_heap(u3R);
*hig_w = u3a_temp(u3R) + c3_wiseof(u3v_home);
@ -1118,7 +1118,7 @@ u3m_soft_sure(u3_funk fun_f, u3_noun arg)
{
u3_noun pro, pru = u3m_soft_top(0, (1 << 18), fun_f, arg);
c3_assert(_(u3du(pru)));
u3_assert(_(u3du(pru)));
pro = u3k(u3t(pru));
u3z(pru);
@ -1198,9 +1198,9 @@ u3m_soft_run(u3_noun gul,
/* Produce - or fall again.
*/
{
c3_assert(_(u3du(why)));
u3_assert(_(u3du(why)));
switch ( u3h(why) ) {
default: c3_assert(0); return 0;
default: u3_assert(0); return 0;
case 0: { // unusual: bail with success.
pro = u3m_love(why);
@ -1253,7 +1253,7 @@ u3m_soft_esc(u3_noun ref, u3_noun sam)
/* Assert preconditions.
*/
{
c3_assert(0 != u3R->ski.gul);
u3_assert(0 != u3R->ski.gul);
gul = u3h(u3R->ski.gul);
}
@ -1360,7 +1360,7 @@ u3m_soft(c3_w mil_w,
//
default: {
u3m_p("invalid mot", u3h(why));
c3_assert(0);
u3_assert(0);
}
}
@ -1667,7 +1667,7 @@ _cm_limits(void)
// Moar stack.
//
{
c3_assert( 0 == getrlimit(RLIMIT_STACK, &rlm) );
u3_assert( 0 == getrlimit(RLIMIT_STACK, &rlm) );
rlm.rlim_cur = c3_min(rlm.rlim_max, (65536 << 10));
@ -1978,7 +1978,7 @@ _cm_pack_rewrite(void)
{
// XX fix u3a_rewrit* to support south roads
//
c3_assert( &(u3H->rod_u) == u3R );
u3_assert( &(u3H->rod_u) == u3R );
// NB: these implementations must be kept in sync with u3m_reclaim();
// anything not reclaimed must be rewritable
@ -2045,8 +2045,8 @@ _migrate_seek(const u3a_road *rod_u)
{
if (!box_u->use_w)
continue;
c3_assert(box_u->siz_w);
c3_assert(box_u->use_w);
u3_assert(box_u->siz_w);
u3_assert(box_u->use_w);
box_w[box_u->siz_w - 1] = new_p;
new_p = c3_align(new_p + box_u->siz_w, 2, C3_ALGHI);
}
@ -2102,8 +2102,8 @@ _migrate_move(u3a_road *rod_u)
continue;
new_w = (void *)u3a_botox(u3a_into(new_p));
c3_assert(box_w[siz_w - 1] == new_p);
c3_assert(new_w <= box_w);
u3_assert(box_w[siz_w - 1] == new_p);
u3_assert(new_w <= box_w);
c3_w i_w;
for (i_w = 0; i_w < siz_w - 1; i_w++)

52
pkg/noun/nock.c
View File

@ -189,7 +189,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
return pro;
}
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 1: {
u3_noun pro = u3k(gal);
@ -197,7 +197,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
u3a_lose(bus); u3a_lose(fol);
return pro;
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 2: {
u3_noun nex = _n_nock_on(u3k(bus), u3k(u3t(gal)));
@ -208,7 +208,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
fol = nex;
continue;
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 3: {
u3_noun gof, pro;
@ -219,7 +219,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
u3a_lose(gof); u3a_lose(fol);
return pro;
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 4: {
u3_noun gof, pro;
@ -230,7 +230,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
u3a_lose(fol);
return pro;
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 5: {
u3_noun wim = _n_nock_on(bus, u3k(gal));
@ -239,7 +239,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
u3a_lose(wim); u3a_lose(fol);
return pro;
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 6: {
u3_noun b_gal, c_gal, d_gal;
@ -260,7 +260,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
continue;
}
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 7: {
u3_noun b_gal, c_gal;
@ -276,7 +276,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
continue;
}
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 8: {
u3_noun b_gal, c_gal;
@ -293,7 +293,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
continue;
}
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 9: {
u3_noun b_gal, c_gal;
@ -326,7 +326,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
}
}
}
c3_assert(!"not reached");
u3_assert(!"not reached");
case 10: {
u3_noun p_gal, q_gal;
@ -389,7 +389,7 @@ _n_nock_on(u3_noun bus, u3_noun fol)
return pro;
}
}
c3_assert(!"not reached");
u3_assert(!"not reached");
}
}
}
@ -556,7 +556,7 @@ _n_arg(c3_y cod_y)
return sizeof(c3_l);
default:
c3_assert( cod_y < LAST );
u3_assert( cod_y < LAST );
return 0;
}
}
@ -592,7 +592,7 @@ _n_melt(u3_noun ops, c3_w* byc_w, c3_w* cal_w,
}
else {
fprintf(stderr, "_n_melt(): over 2^16 registration sites.\r\n");
c3_assert(0);
u3_assert(0);
}
break;
}
@ -634,7 +634,7 @@ _n_melt(u3_noun ops, c3_w* byc_w, c3_w* cal_w,
}
else {
fprintf(stderr, "_n_melt(): over 2^16 memos.\r\n");
c3_assert(0);
u3_assert(0);
}
break;
}
@ -644,7 +644,7 @@ _n_melt(u3_noun ops, c3_w* byc_w, c3_w* cal_w,
case FISK: case FISL: case SUSH: case SANS:
case LISL: case LISK: case SKIS: case SLIS:
case HILS: case HINS:
c3_assert(0); //overflows
u3_assert(0); //overflows
break;
case KICB: case TICB:
@ -657,7 +657,7 @@ _n_melt(u3_noun ops, c3_w* byc_w, c3_w* cal_w,
}
else {
fprintf(stderr, "_n_melt(): over 2^16 call sites.\r\n");
c3_assert(0);
u3_assert(0);
}
break;
@ -674,7 +674,7 @@ _n_melt(u3_noun ops, c3_w* byc_w, c3_w* cal_w,
}
else {
fprintf(stderr, "_n_melt(): over 2^16 literals.\r\n");
c3_assert(0);
u3_assert(0);
}
break;
}
@ -817,7 +817,7 @@ _n_prog_asm(u3_noun ops, u3n_prog* pog_u, u3_noun sip)
u3_noun cod = u3h(op);
switch ( cod ) {
default:
c3_assert(0);
u3_assert(0);
return;
/* memo index args */
@ -924,9 +924,9 @@ _n_prog_asm(u3_noun ops, u3n_prog* pog_u, u3_noun sip)
}
u3z(top);
// this assert will fail if we overflow a c3_w worth of instructions
c3_assert(u3_nul == ops);
u3_assert(u3_nul == ops);
// this is just a sanity check
c3_assert(u3_nul == sip);
u3_assert(u3_nul == sip);
}
/* _n_prog_from_ops(): new program from _n_comp() product
@ -1612,7 +1612,7 @@ _n_print_byc(c3_y* pog, c3_w her_w)
fprintf(stderr, "%u]", _n_rewo(pog, &ip_w));
break;
default:
c3_assert(0);
u3_assert(0);
break;
}
}
@ -1890,7 +1890,7 @@ _n_hilt_hind(u3_noun tok, u3_noun pro)
u3z(delta);
}
else {
c3_assert( u3_nul == tok );
u3_assert( u3_nul == tok );
}
u3z(tok);
@ -1985,7 +1985,7 @@ _n_hint_hind(u3_noun tok, u3_noun pro)
// unpack q_tok to get the priority integer and the tank
// p_q_tok is the priority, q_q_tok is the tank we will work with
u3_noun p_q_tok, q_q_tok;
c3_assert(c3y == u3r_cell(q_tok, &p_q_tok, &q_q_tok));
u3_assert(c3y == u3r_cell(q_tok, &p_q_tok, &q_q_tok));
// format the timing report
c3_c str_c[64];
@ -2000,7 +2000,7 @@ _n_hint_hind(u3_noun tok, u3_noun pro)
u3z(delta);
}
else {
c3_assert( u3_nul == tok );
u3_assert( u3_nul == tok );
}
u3z(tok);
@ -2991,7 +2991,7 @@ _n_ream(u3_noun kev)
void
u3n_ream()
{
c3_assert(u3R == &(u3H->rod_u));
u3_assert(u3R == &(u3H->rod_u));
u3h_walk(u3R->byc.har_p, _n_ream);
}
@ -3118,7 +3118,7 @@ u3n_slam_on(u3_noun gat, u3_noun sam)
#if 0
if ( &u3H->rod_u == u3R ) {
if ( exc_w == 1 ) {
c3_assert(0);
u3_assert(0);
}
exc_w++;
}

58
pkg/noun/retrieve.c
View File

@ -14,7 +14,7 @@
static u3_weak
_frag_word(c3_w a_w, u3_noun b)
{
c3_assert(0 != a_w);
u3_assert(0 != a_w);
{
c3_w dep_w = u3x_dep(a_w);
@ -62,8 +62,8 @@ _frag_deep(c3_w a_w, u3_noun b)
u3_weak
u3r_at(u3_atom a, u3_noun b)
{
c3_assert(u3_none != a);
c3_assert(u3_none != b);
u3_assert(u3_none != a);
u3_assert(u3_none != b);
u3t_on(far_o);
@ -173,7 +173,7 @@ u3r_vmean(u3_noun som, va_list ap)
c3_w len_w;
struct _mean_pair* prs_m;
c3_assert(u3_none != som);
u3_assert(u3_none != som);
// traverse copy of va_list for alloca
//
@ -190,7 +190,7 @@ u3r_vmean(u3_noun som, va_list ap)
va_end(aq);
c3_assert( 0 != len_w );
u3_assert( 0 != len_w );
prs_m = alloca(len_w * sizeof(struct _mean_pair));
// traverse va_list and extract args
@ -445,7 +445,7 @@ _cr_sing_cape(u3a_pile* pil_u, u3p(u3h_root) har_p)
} break;
default: {
c3_assert(0);
u3_assert(0);
} break;
}
@ -548,7 +548,7 @@ _cr_sing(u3_noun a, u3_noun b)
} break;
default: {
c3_assert(0);
u3_assert(0);
} break;
}
@ -695,8 +695,8 @@ u3_atom
u3r_nord(u3_noun a,
u3_noun b)
{
c3_assert(u3_none != a);
c3_assert(u3_none != b);
u3_assert(u3_none != a);
u3_assert(u3_none != b);
if ( a == b ) {
return 1;
@ -762,7 +762,7 @@ c3_o
u3r_sing_c(const c3_c* a_c,
u3_noun b)
{
c3_assert(u3_none != b);
u3_assert(u3_none != b);
if ( !_(u3a_is_atom(b)) ) {
return c3n;
@ -792,7 +792,7 @@ u3r_bush(u3_noun a,
u3_noun* b,
u3_noun* c)
{
c3_assert(u3_none != a);
u3_assert(u3_none != a);
if ( _(u3a_is_atom(a)) ) {
return c3n;
@ -842,7 +842,7 @@ u3r_cell(u3_noun a,
u3_noun* b,
u3_noun* c)
{
c3_assert(u3_none != a);
u3_assert(u3_none != a);
if ( _(u3a_is_atom(a)) ) {
return c3n;
@ -1083,8 +1083,8 @@ c3_b
u3r_bit(c3_w a_w,
u3_atom b)
{
c3_assert(u3_none != b);
c3_assert(_(u3a_is_atom(b)));
u3_assert(u3_none != b);
u3_assert(_(u3a_is_atom(b)));
if ( _(u3a_is_cat(b)) ) {
if ( a_w >= 31 ) {
@ -1116,8 +1116,8 @@ c3_y
u3r_byte(c3_w a_w,
u3_atom b)
{
c3_assert(u3_none != b);
c3_assert(_(u3a_is_atom(b)));
u3_assert(u3_none != b);
u3_assert(_(u3a_is_atom(b)));
if ( _(u3a_is_cat(b)) ) {
if ( a_w > 3 ) {
@ -1151,8 +1151,8 @@ u3r_bytes(c3_w a_w,
c3_y* c_y,
u3_atom d)
{
c3_assert(u3_none != d);
c3_assert(_(u3a_is_atom(d)));
u3_assert(u3_none != d);
u3_assert(_(u3a_is_atom(d)));
if ( _(u3a_is_cat(d)) ) {
c3_w e_w = d >> (c3_min(a_w, 4) << 3);
@ -1231,8 +1231,8 @@ void
u3r_mp(mpz_t a_mp,
u3_atom b)
{
c3_assert(u3_none != b);
c3_assert(_(u3a_is_atom(b)));
u3_assert(u3_none != b);
u3_assert(_(u3a_is_atom(b)));
if ( _(u3a_is_cat(b)) ) {
mpz_init_set_ui(a_mp, b);
@ -1257,8 +1257,8 @@ c3_s
u3r_short(c3_w a_w,
u3_atom b)
{
c3_assert( u3_none != b );
c3_assert( c3y == u3a_is_atom(b) );
u3_assert( u3_none != b );
u3_assert( c3y == u3a_is_atom(b) );
if ( c3y == u3a_is_cat(b) ) {
switch ( a_w ) {
@ -1290,8 +1290,8 @@ c3_w
u3r_word(c3_w a_w,
u3_atom b)
{
c3_assert(u3_none != b);
c3_assert(_(u3a_is_atom(b)));
u3_assert(u3_none != b);
u3_assert(_(u3a_is_atom(b)));
if ( _(u3a_is_cat(b)) ) {
if ( a_w > 0 ) {
@ -1349,8 +1349,8 @@ u3r_words(c3_w a_w,
c3_w* c_w,
u3_atom d)
{
c3_assert(u3_none != d);
c3_assert(_(u3a_is_atom(d)));
u3_assert(u3_none != d);
u3_assert(_(u3a_is_atom(d)));
if ( b_w == 0 ) {
return;
@ -1627,8 +1627,8 @@ u3r_chop(c3_g met_g,
else {
u3a_atom* src_u = u3a_to_ptr(src);
c3_assert(u3_none != src);
c3_assert(_(u3a_is_atom(src)));
u3_assert(u3_none != src);
u3_assert(_(u3a_is_atom(src)));
len_w = src_u->len_w;
src_w = src_u->buf_w;
@ -1865,7 +1865,7 @@ u3r_mug(u3_noun veb)
// sanity check
//
c3_assert( u3_none != veb );
u3_assert( u3_none != veb );
u3a_pile_prep(&pil_u, sizeof(*fam_u));

10
pkg/noun/serial.c
View File

@ -461,7 +461,7 @@ _cs_cue_xeno_next(u3a_pile* pil_u,
}
switch ( tag_e ) {
default: c3_assert(0);
default: u3_assert(0);
case ur_jam_cell: {
_cue_frame_t* fam_u = u3a_push(pil_u);
@ -611,7 +611,7 @@ u3s_cue_xeno_init_with(c3_d pre_d, c3_d siz_d)
{
u3_cue_xeno* sil_u;
c3_assert( &(u3H->rod_u) == u3R );
u3_assert( &(u3H->rod_u) == u3R );
sil_u = c3_calloc(sizeof(*sil_u));
ur_dict32_grow((ur_root_t*)0, &sil_u->dic_u, pre_d, siz_d);
@ -636,7 +636,7 @@ u3s_cue_xeno_with(u3_cue_xeno* sil_u,
{
u3_weak som;
c3_assert( &(u3H->rod_u) == u3R );
u3_assert( &(u3H->rod_u) == u3R );
som = _cs_cue_xeno(sil_u, len_d, byt_y);
ur_dict32_wipe(&sil_u->dic_u);
@ -661,7 +661,7 @@ u3s_cue_xeno(c3_d len_d,
u3_cue_xeno* sil_u;
u3_weak som;
c3_assert( &(u3H->rod_u) == u3R );
u3_assert( &(u3H->rod_u) == u3R );
sil_u = u3s_cue_xeno_init();
som = _cs_cue_xeno(sil_u, len_d, byt_y);
@ -719,7 +719,7 @@ _cs_cue_bytes_next(u3a_pile* pil_u,
_cs_cue_need(ur_bsr_tag(red_u, &tag_e));
switch ( tag_e ) {
default: c3_assert(0);
default: u3_assert(0);
case ur_jam_cell: {
_cue_frame_t* fam_u = u3a_push(pil_u);

14
pkg/noun/trace.c
View File

@ -53,7 +53,7 @@ u3t_mean(u3_noun roc)
void
u3t_drop(void)
{
c3_assert(_(u3du(u3R->bug.tax)));
u3_assert(_(u3du(u3R->bug.tax)));
{
u3_noun tax = u3R->bug.tax;
@ -113,8 +113,8 @@ static void
_ct_sane(u3_noun lab)
{
if ( u3_nul != lab ) {
c3_assert(c3y == u3du(lab));
c3_assert(c3y == u3ud(u3h(lab)));
u3_assert(c3y == u3du(lab));
u3_assert(c3y == u3ud(u3h(lab)));
_ct_sane(u3t(lab));
}
}
@ -237,7 +237,7 @@ u3t_samp(void)
mot_l = c3_s3('f','a','r');
}
else if ( _(u3T.noc_o) ) {
c3_assert(!_(u3T.glu_o));
u3_assert(!_(u3T.glu_o));
mot_l = c3_s3('n','o','c');
}
else if ( _(u3T.glu_o) ) {
@ -252,7 +252,7 @@ u3t_samp(void)
{
u3_noun lab = _t_samp_process(rod_u);
c3_assert(u3R == &u3H->rod_u);
u3_assert(u3R == &u3H->rod_u);
if ( 0 == u3R->pro.day ) {
/* bunt a +doss
*/
@ -464,7 +464,7 @@ u3t_event_trace(const c3_c* name, c3_c type)
void
u3t_print_steps(FILE* fil_u, c3_c* cap_c, c3_d sep_d)
{
c3_assert( 0 != fil_u );
u3_assert( 0 != fil_u );
c3_w gib_w = (sep_d / 1000000000ULL);
c3_w mib_w = (sep_d % 1000000000ULL) / 1000000ULL;
@ -495,7 +495,7 @@ u3t_print_steps(FILE* fil_u, c3_c* cap_c, c3_d sep_d)
void
u3t_damp(FILE* fil_u)
{
c3_assert( 0 != fil_u );
u3_assert( 0 != fil_u );
if ( 0 != u3R->pro.day ) {
u3_noun wol = u3do("pi-tell", u3R->pro.day);

10
pkg/noun/urth.c
View File

@ -44,7 +44,7 @@ _cu_atom_to_ref(ur_root_t* rot_u, u3a_atom* vat_u)
c3_y* byt_y = (c3_y*)vat_u->buf_w;
c3_d len_d = ((c3_d)vat_u->len_w) << 2;
c3_assert( len_d );
u3_assert( len_d );
// NB: this call will account for any trailing null bytes
// caused by an overestimate in [len_d]
@ -254,7 +254,7 @@ static u3_noun
_cu_ref_to_noun(ur_root_t* rot_u, ur_nref ref, _cu_loom* lom_u)
{
switch ( ur_nref_tag(ref) ) {
default: c3_assert(0);
default: u3_assert(0);
// all ur indirect atoms have been pre-reallocated on the loom.
//
@ -369,7 +369,7 @@ static ur_nref
_cu_realloc(FILE* fil_u, ur_root_t** tor_u, ur_nvec_t* doc_u)
{
#ifdef U3_MEMORY_DEBUG
c3_assert(0);
u3_assert(0);
#endif
// bypassing page tracking as an optimization
@ -451,7 +451,7 @@ u3u_meld(void)
ur_root_t* rot_u;
ur_nvec_t cod_u;
c3_assert( &(u3H->rod_u) == u3R );
u3_assert( &(u3H->rod_u) == u3R );
_cu_realloc(stderr, &rot_u, &cod_u);
@ -643,7 +643,7 @@ u3u_cram(c3_c* dir_c, c3_d eve_d)
c3_d len_d;
c3_y* byt_y;
c3_assert( &(u3H->rod_u) == u3R );
u3_assert( &(u3H->rod_u) == u3R );
{
ur_root_t* rot_u;

4
pkg/noun/xtract.h
View File

@ -47,13 +47,13 @@
/* u3x_cap(): root axis, 2 or 3.
*/
# define u3x_cap(a_w) ({ \
c3_assert( 1 < a_w ); \
u3_assert( 1 < a_w ); \
(0x2 | (a_w >> (u3x_dep(a_w) - 1))); })
/* u3x_mas(): remainder after cap.
*/
# define u3x_mas(a_w) ({ \
c3_assert( 1 < a_w ); \
u3_assert( 1 < a_w ); \
( (a_w & ~(1 << u3x_dep(a_w))) | (1 << (u3x_dep(a_w) - 1)) ); })
/* u3x_peg(): connect two axes.

16
pkg/vere/auto.c
View File

@ -12,7 +12,7 @@ u3_auto_plan(u3_auto* car_u, u3_ovum *egg_u)
egg_u->car_u = car_u;
if ( !car_u->ent_u ) {
c3_assert(!car_u->ext_u);
u3_assert(!car_u->ext_u);
egg_u->pre_u = egg_u->nex_u = 0;
car_u->ent_u = car_u->ext_u = egg_u;
@ -42,12 +42,12 @@ u3_auto_plan(u3_auto* car_u, u3_ovum *egg_u)
u3_ovum*
u3_auto_redo(u3_auto* car_u, u3_ovum *egg_u)
{
c3_assert( egg_u->car_u == car_u );
u3_assert( egg_u->car_u == car_u );
egg_u->try_w++;
if ( !car_u->ent_u ) {
c3_assert(!car_u->ext_u);
u3_assert(!car_u->ext_u);
egg_u->pre_u = egg_u->nex_u = 0;
car_u->ent_u = car_u->ext_u = egg_u;
@ -159,7 +159,7 @@ void
u3_auto_drop(u3_auto* car_u, u3_ovum* egg_u)
{
{
c3_assert( egg_u->car_u );
u3_assert( egg_u->car_u );
// the previous ovum (or [ext_u]) will point to our next ovum
//
@ -206,7 +206,7 @@ u3_auto_next(u3_auto* car_u, u3_noun* ovo)
else {
u3_ovum* egg_u = car_u->ext_u;
c3_assert( !egg_u->pre_u );
u3_assert( !egg_u->pre_u );
if ( egg_u->nex_u ) {
egg_u->nex_u->pre_u = 0;
@ -413,9 +413,9 @@ _auto_link(u3_auto* car_u, u3_pier* pir_u, u3_auto* nex_u)
// assert that io callbacks are present (info_f and slog_f are optional)
//
c3_assert( car_u->io.talk_f );
c3_assert( car_u->io.kick_f );
c3_assert( car_u->io.exit_f );
u3_assert( car_u->io.talk_f );
u3_assert( car_u->io.kick_f );
u3_assert( car_u->io.exit_f );
car_u->pir_u = pir_u;
car_u->nex_u = nex_u;

2
pkg/vere/dawn.c
View File

@ -185,7 +185,7 @@ _dawn_fail(u3_noun who, u3_noun rac, u3_noun sas)
c3_c* rac_c;
switch (rac) {
default: c3_assert(0);
default: u3_assert(0);
case c3__czar: {
rac_c = "galaxy";
break;

2
pkg/vere/db/lmdb.c
View File

@ -574,7 +574,7 @@ u3_lmdb_walk_next(u3_lmdb_walk* itr_u, size_t* len_i, void** buf_v)
MDB_val key_u, val_u;
c3_w ret_w, ops_w;
c3_assert( itr_u->nex_d <= itr_u->las_d );
u3_assert( itr_u->nex_d <= itr_u->las_d );
ops_w = ( c3y == itr_u->red_o ) ? MDB_NEXT : MDB_GET_CURRENT;
if ( (ret_w = mdb_cursor_get(itr_u->cur_u, &key_u, &val_u, ops_w)) ) {

40
pkg/vere/disk.c
View File

@ -139,7 +139,7 @@ _disk_commit_start(struct _cd_save* req_u)
{
u3_disk* log_u = req_u->log_u;
c3_assert( c3n == log_u->ted_o );
u3_assert( c3n == log_u->ted_o );
log_u->ted_o = c3y;
log_u->ted_u.data = req_u;
@ -186,8 +186,8 @@ _disk_batch(u3_disk* log_u, c3_d len_d)
{
u3_fact* tac_u = log_u->put_u.ext_u;
c3_assert( (1ULL + log_u->dun_d) == tac_u->eve_d );
c3_assert( log_u->sen_d == log_u->put_u.ent_u->eve_d );
u3_assert( (1ULL + log_u->dun_d) == tac_u->eve_d );
u3_assert( log_u->sen_d == log_u->put_u.ent_u->eve_d );
struct _cd_save* req_u = c3_malloc(sizeof(*req_u));
req_u->log_u = log_u;
@ -198,7 +198,7 @@ _disk_batch(u3_disk* log_u, c3_d len_d)
req_u->siz_i = c3_malloc(len_d * sizeof(size_t));
for ( c3_d i_d = 0ULL; i_d < len_d; ++i_d) {
c3_assert( (req_u->eve_d + i_d) == tac_u->eve_d );
u3_assert( (req_u->eve_d + i_d) == tac_u->eve_d );
req_u->siz_i[i_d] = _disk_serialize_v1(tac_u, &req_u->byt_y[i_d]);
@ -240,11 +240,11 @@ _disk_commit(u3_disk* log_u)
void
u3_disk_plan(u3_disk* log_u, u3_fact* tac_u)
{
c3_assert( (1ULL + log_u->sen_d) == tac_u->eve_d );
u3_assert( (1ULL + log_u->sen_d) == tac_u->eve_d );
log_u->sen_d++;
if ( !log_u->put_u.ent_u ) {
c3_assert( !log_u->put_u.ext_u );
u3_assert( !log_u->put_u.ext_u );
log_u->put_u.ent_u = log_u->put_u.ext_u = tac_u;
}
else {
@ -265,8 +265,8 @@ u3_disk_boot_plan(u3_disk* log_u, u3_noun job)
u3_fact* tac_u = u3_fact_init(++log_u->sen_d, 0, job);
if ( !log_u->put_u.ent_u ) {
c3_assert( !log_u->put_u.ext_u );
c3_assert( 1ULL == log_u->sen_d );
u3_assert( !log_u->put_u.ext_u );
u3_assert( 1ULL == log_u->sen_d );
log_u->put_u.ent_u = log_u->put_u.ext_u = tac_u;
}
@ -285,7 +285,7 @@ u3_disk_boot_plan(u3_disk* log_u, u3_noun job)
void
u3_disk_boot_save(u3_disk* log_u)
{
c3_assert( !log_u->dun_d );
u3_assert( !log_u->dun_d );
_disk_commit(log_u);
}
@ -349,8 +349,8 @@ _disk_read_done_cb(uv_timer_t* tim_u)
u3_disk* log_u = red_u->log_u;
u3_info pay_u = { .ent_u = red_u->ent_u, .ext_u = red_u->ext_u };
c3_assert( red_u->ent_u );
c3_assert( red_u->ext_u );
u3_assert( red_u->ent_u );
u3_assert( red_u->ext_u );
red_u->ent_u = 0;
red_u->ext_u = 0;
@ -395,13 +395,13 @@ _disk_read_one_cb(void* ptr_v, c3_d eve_d, size_t val_i, void* val_p)
}
if ( !red_u->ent_u ) {
c3_assert( !red_u->ext_u );
u3_assert( !red_u->ext_u );
c3_assert( red_u->eve_d == eve_d );
u3_assert( red_u->eve_d == eve_d );
red_u->ent_u = red_u->ext_u = tac_u;
}
else {
c3_assert( (1ULL + red_u->ent_u->eve_d) == eve_d );
u3_assert( (1ULL + red_u->ent_u->eve_d) == eve_d );
red_u->ent_u->nex_u = tac_u;
red_u->ent_u = tac_u;
}
@ -485,7 +485,7 @@ u3_disk_save_meta(MDB_env* mdb_u,
c3_o fak_o,
c3_w lif_w)
{
c3_assert( c3y == u3a_is_cat(lif_w) );
u3_assert( c3y == u3a_is_cat(lif_w) );
if ( (c3n == _disk_save_meta(mdb_u, "version", 1))
|| (c3n == _disk_save_meta(mdb_u, "who", u3i_chubs(2, who_d)))
@ -595,7 +595,7 @@ _disk_lock(c3_c* pax_c)
c3_i wit_i;
wit_i = snprintf(paf_c, len_w, "%s/.vere.lock", pax_c);
c3_assert(wit_i + 1 == len_w);
u3_assert(wit_i + 1 == len_w);
return paf_c;
}
@ -612,7 +612,7 @@ u3_disk_acquire(c3_c* pax_c)
if ( 1 != fscanf(loq_u, "%" SCNu32, &pid_w) ) {
u3l_log("lockfile %s is corrupt!", paf_c);
kill(getpid(), SIGTERM);
sleep(1); c3_assert(0);
sleep(1); u3_assert(0);
}
else if (pid_w != getpid()) {
c3_w i_w;
@ -622,7 +622,7 @@ u3_disk_acquire(c3_c* pax_c)
if ( -1 == ret && errno == EPERM ) {
u3l_log("disk: permission denied when trying to kill process %d!", pid_w);
kill(getpid(), SIGTERM);
sleep(1); c3_assert(0);
sleep(1); u3_assert(0);
}
if ( -1 != ret ) {
@ -645,7 +645,7 @@ u3_disk_acquire(c3_c* pax_c)
}
if ( 16 == i_w ) {
u3l_log("disk: process %d seems unkillable!", pid_w);
c3_assert(0);
u3_assert(0);
}
u3l_log("disk: stopped old process %u", pid_w);
}
@ -656,7 +656,7 @@ u3_disk_acquire(c3_c* pax_c)
if ( NULL == (loq_u = c3_fopen(paf_c, "w")) ) {
u3l_log("disk: unable to open %s", paf_c);
c3_assert(0);
u3_assert(0);
}
fprintf(loq_u, "%u\n", getpid());

2
pkg/vere/foil.c
View File

@ -34,7 +34,7 @@ _foil_fail(const c3_c* why_c, c3_i err_i)
{
if ( err_i ) {
u3l_log("%s: error: %s", why_c, uv_strerror(err_i));
c3_assert(0);
u3_assert(0);
} else {
u3l_log("%s: file error", why_c);
}

18
pkg/vere/io/ames.c
View File

@ -305,7 +305,7 @@ _ames_panc_free(u3_panc* pan_u)
pan_u->pre_u->nex_u = pan_u->nex_u;
}
else {
c3_assert(pan_u == pan_u->pac_u->sam_u->pan_u);
u3_assert(pan_u == pan_u->pac_u->sam_u->pan_u);
pan_u->pac_u->sam_u->pan_u = pan_u->nex_u;
}
}
@ -636,7 +636,7 @@ _ames_etch_head(u3_head* hed_u, c3_y buf_y[4])
{
// only version 0 currently recognized
//
c3_assert( 0 == hed_u->ver_y ); // XX remove after testing
u3_assert( 0 == hed_u->ver_y ); // XX remove after testing
c3_w hed_w = ((hed_u->req_o & 0x1) << 2)
^ ((hed_u->sim_o & 0x1) << 3)
@ -782,7 +782,7 @@ _fine_etch_response(u3_pact* pac_u)
pac_u->len_w - rog_w);
_ames_etch_head(&pac_u->hed_u, pac_u->hun_y);
c3_assert( c3y == _ames_check_mug(pac_u) );
u3_assert( c3y == _ames_check_mug(pac_u) );
}
/* _lane_scry_path(): format scry path for retrieving a lane
@ -1175,13 +1175,13 @@ _ames_ef_send(u3_ames* sam_u, u3_noun lan, u3_noun pac)
u3_noun tag, val;
u3x_cell(lan, &tag, &val);
c3_assert( (c3y == tag) || (c3n == tag) );
u3_assert( (c3y == tag) || (c3n == tag) );
// galaxy lane; do DNS lookup and send packet
//
if ( c3y == tag ) {
c3_assert( c3y == u3a_is_cat(val) );
c3_assert( val < 256 );
u3_assert( c3y == u3a_is_cat(val) );
u3_assert( val < 256 );
//u3l_log("_ames_ef_send imp %s %u", _str_typ(pac_u->typ_y), val);
pac_u->rut_u.imp_y = val;
@ -1568,7 +1568,7 @@ _fine_scry_path(u3_pact* pac_u, c3_o lop_o)
static void _fine_pack_scry_cb(void* vod_p, u3_noun nun)
{
u3_pact* pac_u = vod_p;
c3_assert( PACT_PURR == pac_u->typ_y );
u3_assert( PACT_PURR == pac_u->typ_y );
u3_ames* sam_u = pac_u->sam_u;
u3_peep* pep_u = &pac_u->pur_u.pep_u;
@ -2047,7 +2047,7 @@ _ames_io_start(u3_ames* sam_u)
}
uv_udp_getsockname(&sam_u->wax_u, (struct sockaddr *)&add_u, &add_i);
c3_assert(add_u.sin_port);
u3_assert(add_u.sin_port);
sam_u->pir_u->por_s = ntohs(add_u.sin_port);
}
@ -2393,7 +2393,7 @@ u3_ames_io_init(u3_pier* pir_u)
//
sam_u->lax_p = u3h_new_cache(500000);
c3_assert( !uv_udp_init(u3L, &sam_u->wax_u) );
u3_assert( !uv_udp_init(u3L, &sam_u->wax_u) );
sam_u->wax_u.data = sam_u;
sam_u->sil_u = u3s_cue_xeno_init();

22
pkg/vere/io/conn.c
View File

@ -266,7 +266,7 @@ _conn_poke_bail(u3_ovum* egg_u, u3_noun lud)
{
// wtf?
//
c3_assert(!"not reached");
u3_assert(!"not reached");
u3z(lud); return;
}
can_u = _conn_find_chan(con_u, sev_l, coq_l);
@ -661,11 +661,11 @@ _conn_sock_cb(uv_stream_t* sem_u, c3_i tas_i)
can_u->coq_l = san_u->nex_l++;
can_u->san_u = san_u;
err_i = uv_timer_init(u3L, &can_u->mor_u.tim_u);
c3_assert(!err_i);
u3_assert(!err_i);
err_i = uv_pipe_init(u3L, &can_u->mor_u.pyp_u, 0);
c3_assert(!err_i);
u3_assert(!err_i);
err_i = uv_accept(sem_u, (uv_stream_t*)&can_u->mor_u.pyp_u);
c3_assert(!err_i);
u3_assert(!err_i);
u3_newt_read((u3_moat*)&can_u->mor_u);
can_u->mor_u.nex_u = (u3_moor*)san_u->can_u;
san_u->can_u = can_u;
@ -685,14 +685,14 @@ _conn_init_sock(u3_shan* san_u)
u3z(who);
ret_i = snprintf(pip_c, sizeof(pip_c), "\\\\.\\pipe\\urbit-conn-%s", who_c + 1);
c3_assert(19 + strlen(who_c) == ret_i);
u3_assert(19 + strlen(who_c) == ret_i);
c3_free(who_c);
ret_i = uv_pipe_init(u3L, &san_u->pyp_u, 0);
c3_assert(!ret_i);
u3_assert(!ret_i);
ret_i = uv_pipe_bind(&san_u->pyp_u, pip_c);
c3_assert(!ret_i);
u3_assert(!ret_i);
ret_i = uv_listen((uv_stream_t*)&san_u->pyp_u, 0, _conn_sock_cb);
c3_assert(!ret_i);
u3_assert(!ret_i);
u3l_log("conn: listening on %s", pip_c);
#else // _WIN32
@ -792,7 +792,7 @@ _conn_io_talk(u3_auto* car_u)
// initialize server, opening socket.
//
c3_assert(!con_u->san_u);
u3_assert(!con_u->san_u);
san_u = c3_calloc(sizeof(*san_u));
san_u->nex_l = 1;
san_u->con_u = con_u;
@ -864,8 +864,8 @@ _conn_io_exit(u3_auto* car_u)
c3_i wit_i;
wit_i = snprintf(paf_c, len_w, "%s/%s", pax_c, URB_SOCK_PATH);
c3_assert(wit_i > 0);
c3_assert(len_w == (c3_w)wit_i + 1);
u3_assert(wit_i > 0);
u3_assert(len_w == (c3_w)wit_i + 1);
if ( 0 != unlink(paf_c) ) {
if ( ENOENT != errno ) {

20
pkg/vere/io/cttp.c
View File

@ -323,7 +323,7 @@ _cttp_cres_new(u3_creq* ceq_u, c3_w sas_w)
static void
_cttp_cres_fire_body(u3_cres* res_u, u3_hbod* bod_u)
{
c3_assert(!bod_u->nex_u);
u3_assert(!bod_u->nex_u);
if ( !(res_u->bod_u) ) {
res_u->bod_u = res_u->dob_u = bod_u;
@ -589,7 +589,7 @@ _cttp_creq_new(u3_cttp* ctp_u, c3_l num_l, u3_noun hes)
// XX this should be checked against a whitelist
//
c3_assert( c3y == u3ud(method) );
u3_assert( c3y == u3ud(method) );
ceq_u->met_c = u3r_string(method);
ceq_u->url_c = _cttp_creq_url(u3k(pul));
@ -612,7 +612,7 @@ _cttp_creq_new(u3_cttp* ctp_u, c3_l num_l, u3_noun hes)
static void
_cttp_creq_fire_body(u3_creq* ceq_u, u3_hbod *rub_u)
{
c3_assert(!rub_u->nex_u);
u3_assert(!rub_u->nex_u);
if ( !(ceq_u->rub_u) ) {
ceq_u->rub_u = ceq_u->bur_u = rub_u;
@ -826,7 +826,7 @@ _cttp_creq_on_connect(h2o_http1client_t* cli_u, const c3_c* err_c,
ceq_u->sat_e = u3_csat_quit;
}
else {
c3_assert( u3_csat_ripe == ceq_u->sat_e );
u3_assert( u3_csat_ripe == ceq_u->sat_e );
_cttp_creq_fail(ceq_u, err_c);
}
return 0;
@ -853,8 +853,8 @@ _cttp_creq_on_connect(h2o_http1client_t* cli_u, const c3_c* err_c,
static void
_cttp_creq_connect(u3_creq* ceq_u)
{
c3_assert( u3_csat_conn == ceq_u->sat_e );
c3_assert( ceq_u->ipf_c );
u3_assert( u3_csat_conn == ceq_u->sat_e );
u3_assert( ceq_u->ipf_c );
// connect by ip/port, avoiding synchronous getaddrinfo()
//
@ -872,7 +872,7 @@ _cttp_creq_connect(u3_creq* ceq_u)
// connect() failed, cb invoked synchronously
//
if ( u3_csat_conn != ceq_u->sat_e ) {
c3_assert( u3_csat_quit == ceq_u->sat_e );
u3_assert( u3_csat_quit == ceq_u->sat_e );
// only one such failure case
//
_cttp_creq_fail(ceq_u, "socket create error");
@ -885,7 +885,7 @@ _cttp_creq_connect(u3_creq* ceq_u)
// must be synchronous, after successfull connect() call
//
if ( ceq_u->hot_c && (c3y == ceq_u->sec) ) {
c3_assert( ceq_u->cli_u );
u3_assert( ceq_u->cli_u );
c3_free(ceq_u->cli_u->ssl.server_name);
ceq_u->cli_u->ssl.server_name = strdup(ceq_u->hot_c);
}
@ -925,8 +925,8 @@ _cttp_creq_resolve_cb(uv_getaddrinfo_t* adr_u,
static void
_cttp_creq_resolve(u3_creq* ceq_u)
{
c3_assert(u3_csat_addr == ceq_u->sat_e);
c3_assert(ceq_u->hot_c);
u3_assert(u3_csat_addr == ceq_u->sat_e);
u3_assert(ceq_u->hot_c);
uv_getaddrinfo_t* adr_u = c3_malloc(sizeof(*adr_u));
adr_u->data = ceq_u;

28
pkg/vere/io/http.c
View File

@ -370,7 +370,7 @@ _http_req_is_auth(u3_hfig* fig_u, h2o_req_t* rec_u)
}
u3_noun aut = u3kdi_has(u3k(fig_u->ses), u3i_bytes(val_y, (c3_y*)val_c));
c3_assert(c3y == aut || c3n == aut);
u3_assert(c3y == aut || c3n == aut);
return aut;
}
@ -596,7 +596,7 @@ _http_seq_new(u3_hcon* hon_u, h2o_req_t* rec_u)
static void
_http_req_dispatch(u3_hreq* req_u, u3_noun req)
{
c3_assert(u3_rsat_init == req_u->sat_e);
u3_assert(u3_rsat_init == req_u->sat_e);
req_u->sat_e = u3_rsat_plan;
{
@ -658,7 +658,7 @@ _http_cache_scry_cb(void* vod_p, u3_noun nun)
static c3_o
_http_req_cache(u3_hreq* req_u)
{
c3_assert(u3_rsat_init == req_u->sat_e);
u3_assert(u3_rsat_init == req_u->sat_e);
u3_httd* htd_u = req_u->hon_u->htp_u->htd_u;
@ -699,7 +699,7 @@ _http_hgen_dispose(void* ptr_v)
static void
_http_hgen_send(u3_hgen* gen_u)
{
c3_assert( c3y == gen_u->red );
u3_assert( c3y == gen_u->red );
u3_hreq* req_u = gen_u->req_u;
h2o_req_t* rec_u = req_u->rec_u;
@ -759,7 +759,7 @@ _http_hgen_proceed(h2o_generator_t* neg_u, h2o_req_t* rec_u)
u3_hreq* req_u = gen_u->req_u;
// sanity check
c3_assert( rec_u == req_u->rec_u );
u3_assert( rec_u == req_u->rec_u );
gen_u->red = c3y;
@ -881,7 +881,7 @@ _http_continue_respond(u3_hreq* req_u,
// return;
// }
//
// c3_assert( sequence == ++gen_u->sequence );
// u3_assert( sequence == ++gen_u->sequence );
gen_u->dun = complete;
@ -950,7 +950,7 @@ _http_rec_sock(h2o_req_t* rec_u)
// sanity check
//
c3_assert( hon_u->sok_u == &suv_u->sok_u );
u3_assert( hon_u->sok_u == &suv_u->sok_u );
return hon_u;
}
@ -1125,7 +1125,7 @@ _http_conn_free(uv_handle_t* han_t)
u3_http* htp_u = hon_u->htp_u;
u3_h2o_serv* h2o_u = htp_u->h2o_u;
c3_assert( 0 == hon_u->req_u );
u3_assert( 0 == hon_u->req_u );
#if 0
{
@ -1315,7 +1315,7 @@ _http_h2o_context_dispose(h2o_context_t* ctx)
static void
_http_serv_really_free(u3_http* htp_u)
{
c3_assert( 0 == htp_u->hon_u );
u3_assert( 0 == htp_u->hon_u );
if ( 0 != htp_u->h2o_u ) {
u3_h2o_serv* h2o_u = htp_u->h2o_u;
@ -1361,7 +1361,7 @@ _http_serv_free(u3_http* htp_u)
u3l_log("http serv free %d", htp_u->sev_l);
#endif
c3_assert( 0 == htp_u->hon_u );
u3_assert( 0 == htp_u->hon_u );
if ( 0 == htp_u->h2o_u ) {
_http_serv_really_free(htp_u);
@ -1803,8 +1803,8 @@ _http_release_ports_file(c3_c *pax_c)
c3_i wit_i;
wit_i = snprintf(paf_c, len_w, "%s/%s", pax_c, nam_c);
c3_assert(wit_i > 0);
c3_assert(len_w == (c3_w)wit_i + 1);
u3_assert(wit_i > 0);
u3_assert(len_w == (c3_w)wit_i + 1);
c3_unlink(paf_c);
c3_free(paf_c);
@ -1857,7 +1857,7 @@ _http_serv_start_all(u3_httd* htd_u)
u3_noun dis;
u3_form* for_u = htd_u->fig_u.for_u;
c3_assert( 0 != for_u );
u3_assert( 0 != for_u );
// if the SSL_CTX existed, it'll be freed with the servers
htd_u->tls_u = 0;
@ -1914,7 +1914,7 @@ _http_serv_start_all(u3_httd* htd_u)
// send listening ports to %eyre
{
c3_assert( u3_none != non );
u3_assert( u3_none != non );
// XX remove [sen]
//

24
pkg/vere/io/term.c
View File

@ -49,7 +49,7 @@ u3_write_fd(c3_i fid_i, const void* buf_v, size_t len_i)
//
if ( ret_i < 0 ) {
fprintf(stderr, "term: write failed %s\r\n", strerror(errno));
c3_assert(0);
u3_assert(0);
}
// continue partial writes
//
@ -188,7 +188,7 @@ u3_term_log_init(void)
// Start raw input.
//
if ( c3n == uty_u->sta_f(uty_u) ) {
c3_assert(!"init-tcsetattr");
u3_assert(!"init-tcsetattr");
}
// initialize spinner timeout
@ -211,7 +211,7 @@ u3_term_log_exit(void)
for ( uty_u = u3_Host.uty_u; uty_u; uty_u = uty_u->nex_u ) {
if ( uty_u->fid_i == -1 ) { continue; }
if ( c3n == uty_u->sto_f(uty_u) ) {
c3_assert(!"exit-tcsetattr");
u3_assert(!"exit-tcsetattr");
}
u3_write_fd(uty_u->fid_i, "\r\n", 2);
}
@ -603,8 +603,8 @@ _term_io_belt(u3_utty* uty_u, u3_noun blb)
u3_noun wir = u3nt(c3__term, '1', u3_nul);
u3_noun cad = u3nc(c3__belt, blb);
c3_assert( 1 == uty_u->tid_l );
c3_assert( uty_u->car_u );
u3_assert( 1 == uty_u->tid_l );
u3_assert( uty_u->car_u );
{
u3_ovum* egg_u = _term_ovum_plan(uty_u->car_u, wir, cad);
@ -1072,7 +1072,7 @@ u3_term_ef_winc(void)
u3_noun wir = u3nt(c3__term, '1', u3_nul);
u3_noun cad = u3nc(c3__blew, u3_term_get_blew(1));
c3_assert( 1 == u3_Host.uty_u->tid_l );
u3_assert( 1 == u3_Host.uty_u->tid_l );
_term_ovum_plan(u3_Host.uty_u->car_u, wir, cad);
}
@ -1089,7 +1089,7 @@ u3_term_ef_ctlc(void)
u3_noun wir = u3nt(c3__term, '1', u3_nul);
u3_noun cad = u3nq(c3__belt, c3__mod, c3__ctl, 'c');
c3_assert( 1 == uty_u->tid_l );
u3_assert( 1 == uty_u->tid_l );
_term_ovum_plan(uty_u->car_u, wir, cad);
}
}
@ -1465,12 +1465,12 @@ u3_term_io_hija(void)
// We *should* in fact, produce some kind of fake FILE* for
// non-console terminals. If we use this interface enough...
//
c3_assert(0);
u3_assert(0);
}
else {
if ( c3n == u3_Host.ops_u.tem ) {
if ( c3y != uty_u->hij_f(uty_u) ) {
c3_assert(!"hija-tcsetattr");
u3_assert(!"hija-tcsetattr");
}
// move the cursor to the bottom left corner,
@ -1496,7 +1496,7 @@ u3_term_io_loja(int x, FILE* f)
// We *should* in fact, produce some kind of fake FILE* for
// non-console terminals. If we use this interface enough...
//
c3_assert(0);
u3_assert(0);
}
else {
if ( c3y == u3_Host.ops_u.tem ) {
@ -1505,7 +1505,7 @@ u3_term_io_loja(int x, FILE* f)
}
else {
if ( c3y != uty_u->loj_f(uty_u) ) {
c3_assert(!"loja-tcsetattr");
u3_assert(!"loja-tcsetattr");
}
// push the printfs up one more line,
@ -1775,7 +1775,7 @@ u3_term_io_init(u3_pier* pir_u)
{
u3_auto* car_u = c3_calloc(sizeof(*car_u));
c3_assert( u3_Host.uty_u );
u3_assert( u3_Host.uty_u );
u3_Host.uty_u->car_u = car_u;
car_u->nam_m = c3__term;

52
pkg/vere/io/unix.c
View File

@ -176,15 +176,15 @@ u3_readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
static u3_atom
_unix_string_to_knot(c3_c* pax_c)
{
c3_assert(pax_c);
u3_assert(pax_c);
// XX this can happen if we encounter a file without an extension.
//
// c3_assert(*pax_c);
c3_assert(!strchr(pax_c, '/'));
// u3_assert(*pax_c);
u3_assert(!strchr(pax_c, '/'));
// XX horrible
//
# ifdef _WIN32
c3_assert(!strchr(pax_c, '\\'));
u3_assert(!strchr(pax_c, '\\'));
# endif
if ( '!' == *pax_c ) {
pax_c++;
@ -214,9 +214,9 @@ _unix_knot_to_string(u3_atom pon)
u3r_bytes(0, met_w, (c3_y*)ret_c + 1, pon);
ret_c[met_w + 1] = 0;
}
c3_assert(!strchr(ret_c, '/'));
u3_assert(!strchr(ret_c, '/'));
# ifdef _WIN32
c3_assert(!strchr(ret_c, '\\'));
u3_assert(!strchr(ret_c, '\\'));
# endif
return ret_c;
}
@ -247,7 +247,7 @@ _unix_string_to_path_helper(c3_c* pax_c)
{
u3_noun not;
c3_assert(pax_c[-1] == '/');
u3_assert(pax_c[-1] == '/');
c3_c* end_c = strchr(pax_c, '/');
if ( !end_c ) {
end_c = strrchr(pax_c, '.');
@ -332,7 +332,7 @@ u3_unix_save(c3_c* pax_c, u3_atom pad)
len_w = lod_w + sizeof("/.urb/put/") + strlen(pax_c);
ful_c = c3_malloc(len_w);
rit_w = snprintf(ful_c, len_w, "%s/.urb/put/%s", u3_Host.dir_c, pax_c);
c3_assert(len_w == rit_w + 1);
u3_assert(len_w == rit_w + 1);
_unix_mkdirp(ful_c);
fid_i = c3_open(ful_c, O_WRONLY | O_CREAT | O_TRUNC, 0666);
@ -374,7 +374,7 @@ _unix_rm_r_cb(const c3_c* pax_c,
if ( 0 != c3_unlink(pax_c) && ENOENT != errno ) {
u3l_log("error unlinking (in rm_r) %s: %s",
pax_c, strerror(errno));
c3_assert(0);
u3_assert(0);
}
break;
case FTW_D:
@ -389,7 +389,7 @@ _unix_rm_r_cb(const c3_c* pax_c,
case FTW_DP:
if ( 0 != c3_rmdir(pax_c) && ENOENT != errno ) {
u3l_log("error rmdiring %s: %s", pax_c, strerror(errno));
c3_assert(0);
u3_assert(0);
}
break;
case FTW_SL:
@ -421,7 +421,7 @@ _unix_mkdir(c3_c* pax_c)
{
if ( 0 != c3_mkdir(pax_c, 0755) && EEXIST != errno) {
u3l_log("error mkdiring %s: %s", pax_c, strerror(errno));
c3_assert(0);
u3_assert(0);
}
}
@ -540,7 +540,7 @@ static u3_umon*
_unix_get_mount_point(u3_unix* unx_u, u3_noun mon)
{
if ( c3n == u3ud(mon) ) {
c3_assert(!"mount point must be an atom");
u3_assert(!"mount point must be an atom");
u3z(mon);
return NULL;
}
@ -598,7 +598,7 @@ _unix_scan_mount_point(u3_unix* unx_u, u3_umon* mon_u)
u3l_log("erroring loading pier directory %s: %s",
mon_u->dir_u.pax_c, strerror(errno));
c3_assert(0);
u3_assert(0);
}
else if ( !out_u ) {
break;
@ -659,7 +659,7 @@ _unix_free_file(u3_ufil *fil_u)
{
if ( 0 != c3_unlink(fil_u->pax_c) && ENOENT != errno ) {
u3l_log("error unlinking %s: %s", fil_u->pax_c, strerror(errno));
c3_assert(0);
u3_assert(0);
}
c3_free(fil_u->pax_c);
@ -759,7 +759,7 @@ static void
_unix_delete_mount_point(u3_unix* unx_u, u3_noun mon)
{
if ( c3n == u3ud(mon) ) {
c3_assert(!"mount point must be an atom");
u3_assert(!"mount point must be an atom");
u3z(mon);
return;
}
@ -887,7 +887,7 @@ static u3_noun _unix_update_node(u3_unix* unx_u, u3_unod* nod_u);
static u3_noun
_unix_update_file(u3_unix* unx_u, u3_ufil* fil_u)
{
c3_assert( c3n == fil_u->dir );
u3_assert( c3n == fil_u->dir );
if ( c3y == fil_u->dry ) {
return u3_nul;
@ -960,7 +960,7 @@ _unix_update_dir(u3_unix* unx_u, u3_udir* dir_u)
{
u3_noun can = u3_nul;
c3_assert( c3y == dir_u->dir );
u3_assert( c3y == dir_u->dir );
if ( c3y == dir_u->dry ) {
return u3_nul;
@ -1023,7 +1023,7 @@ _unix_update_dir(u3_unix* unx_u, u3_udir* dir_u)
if ( !rid_u ) {
u3l_log("error opening directory %s: %s",
dir_u->pax_c, strerror(errno));
c3_assert(0);
u3_assert(0);
}
while ( 1 ) {
@ -1035,7 +1035,7 @@ _unix_update_dir(u3_unix* unx_u, u3_udir* dir_u)
if ( (err_w = u3_readdir_r(rid_u, &ent_u, &out_u)) != 0 ) {
u3l_log("error loading directory %s: %s",
dir_u->pax_c, strerror(err_w));
c3_assert(0);
u3_assert(0);
}
else if ( !out_u ) {
break;
@ -1060,13 +1060,13 @@ _unix_update_dir(u3_unix* unx_u, u3_udir* dir_u)
if ( S_ISDIR(buf_u.st_mode) ) {
if ( c3n == nod_u->dir ) {
u3l_log("not a directory: %s", nod_u->pax_c);
c3_assert(0);
u3_assert(0);
}
}
else {
if ( c3y == nod_u->dir ) {
u3l_log("not a file: %s", nod_u->pax_c);
c3_assert(0);
u3_assert(0);
}
}
break;
@ -1235,7 +1235,7 @@ _unix_initial_update_dir(c3_c* pax_c, c3_c* bas_c)
u3l_log("error loading initial directory %s: %s",
pax_c, strerror(errno));
c3_assert(0);
u3_assert(0);
}
else if ( !out_u ) {
break;
@ -1290,8 +1290,8 @@ u3_unix_initial_into_card(c3_c* arv_c)
static void
_unix_sync_file(u3_unix* unx_u, u3_udir* par_u, u3_noun nam, u3_noun ext, u3_noun mim)
{
c3_assert( par_u );
c3_assert( c3y == par_u->dir );
u3_assert( par_u );
u3_assert( c3y == par_u->dir );
// form file path
@ -1354,7 +1354,7 @@ _unix_sync_file_out:
static void
_unix_sync_change(u3_unix* unx_u, u3_udir* dir_u, u3_noun pax, u3_noun mim)
{
c3_assert( c3y == dir_u->dir );
u3_assert( c3y == dir_u->dir );
if ( c3n == u3du(pax) ) {
if ( u3_nul == pax ) {
@ -1398,7 +1398,7 @@ _unix_sync_change(u3_unix* unx_u, u3_udir* dir_u, u3_noun pax, u3_noun mim)
if ( c3n == nod_u->dir ) {
u3l_log("weird, we got a file when we weren't expecting to");
c3_assert(0);
u3_assert(0);
}
_unix_sync_change(unx_u, (u3_udir*) nod_u, u3k(t_pax), mim);

38
pkg/vere/king.c
View File

@ -106,8 +106,8 @@ _king_doom(u3_noun doom)
u3_noun load;
void (*next)(u3_noun);
c3_assert(_(u3a_is_cell(doom)));
c3_assert(_(u3a_is_cat(u3h(doom))));
u3_assert(_(u3a_is_cell(doom)));
u3_assert(_(u3a_is_cat(u3h(doom))));
switch ( u3h(doom) ) {
case c3__boot:
@ -133,9 +133,9 @@ _king_boot(u3_noun bul)
u3_noun boot, pill, path;
void (*next)(u3_noun, u3_noun, u3_noun);
c3_assert(_(u3a_is_cell(bul)));
u3_assert(_(u3a_is_cell(bul)));
u3x_trel(bul, &boot, &pill, &path);
c3_assert(_(u3a_is_cat(u3h(boot))));
u3_assert(_(u3a_is_cat(u3h(boot))));
switch ( u3h(boot) ) {
case c3__fake: {
@ -319,7 +319,7 @@ _king_get_pace(void)
c3_i ret_i, fid_i;
ret_i = asprintf(&pat_c, "%s/.bin/pace", u3_Host.dir_c);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
fid_i = c3_open(pat_c, O_RDONLY, 0644);
@ -364,7 +364,7 @@ u3_king_next(c3_c* pac_c, c3_c** out_c)
c3_i ret_i;
ret_i = asprintf(&url_c, "%s/%s/%s/next", ver_hos_c, pac_c, URBIT_VERSION);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
// skip printfs on failed requests (/next is usually not present)
//
@ -372,7 +372,7 @@ u3_king_next(c3_c* pac_c, c3_c** out_c)
c3_free(url_c);
ret_i = asprintf(&url_c, "%s/%s/last", ver_hos_c, pac_c);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
// enable printfs on failed requests (/last must be present)
// XX support channel redirections
@ -485,7 +485,7 @@ _boothack_pill(void)
_git_pill_url(url_c, u3_Host.ops_u.arv_c);
}
else {
c3_assert( 0 != u3_Host.ops_u.url_c );
u3_assert( 0 != u3_Host.ops_u.url_c );
strcpy(url_c, u3_Host.ops_u.url_c);
}
@ -934,7 +934,7 @@ u3_pier*
u3_king_stub(void)
{
if ( !u3K.pir_u ) {
c3_assert(!"king: no pier");
u3_assert(!"king: no pier");
}
else {
return u3K.pir_u;
@ -1022,7 +1022,7 @@ _king_make_pace(c3_c* pac_c)
c3_i ret_i;
ret_i = asprintf(&bin_c, "%s/.bin", u3_Host.dir_c);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
ret_i = c3_mkdir(bin_c, 0700);
@ -1035,7 +1035,7 @@ _king_make_pace(c3_c* pac_c)
c3_free(bin_c);
ret_i = asprintf(&bin_c, "%s/.bin/%s/", u3_Host.dir_c, pac_c);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
// XX asserting wrapper conflicts here (and is bypassed for .urb)
//
@ -1061,7 +1061,7 @@ _king_init_pace(c3_c* pac_c)
{
c3_c* bin_c;
c3_i fid_i, ret_i = asprintf(&bin_c, "%s/.bin/pace", u3_Host.dir_c);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
if ( (-1 == (fid_i = open(bin_c, O_WRONLY | O_CREAT | O_EXCL, 0644))) ) {
if ( EEXIST == errno ) {
@ -1106,7 +1106,7 @@ _king_link_run(c3_c* bin_c)
c3_i ret_i;
ret_i = asprintf(&lin_c, "%s/%s", u3_Host.dir_c, U3_BIN_ALIAS);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
ret_i = unlink(lin_c);
@ -1144,7 +1144,7 @@ u3_king_vere(c3_c* pac_c, // pace
c3_i fid_i, ret_i;
ret_i = asprintf(&bin_c, "%s/vere-v%s-%s", dir_c, ver_c, arc_c);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
if ( (-1 == (fid_i = open(bin_c, O_WRONLY | O_CREAT | O_EXCL, 0755)))
|| !(fil_u = fdopen(fid_i, "wb")) )
@ -1163,7 +1163,7 @@ u3_king_vere(c3_c* pac_c, // pace
ret_i = asprintf(&url_c, "%s/%s/v%s/vere-v%s-%s",
ver_hos_c, pac_c, ver_c, ver_c, arc_c);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
if ( (ret_i = _king_save_file(url_c, fil_u)) ) {
u3l_log("unable to save %s to %s: %d", url_c, bin_c, ret_i);
@ -1235,7 +1235,7 @@ _king_do_upgrade(c3_c* pac_c, c3_c* ver_c)
{
c3_i ret_i = asprintf(&dir_c, "%s/.bin/%s", u3_Host.dir_c, pac_c);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
}
// XX get link option
@ -1429,7 +1429,7 @@ _king_copy_vere(c3_c* pac_c, c3_c* ver_c, c3_c* arc_c, c3_t lin_t)
ret_i = asprintf(&bin_c, "%s/.bin/%s/vere-v%s-%s",
u3_Host.dir_c, pac_c, ver_c, arc_c);
c3_assert( ret_i > 0 );
u3_assert( ret_i > 0 );
ret_i = _king_copy_file(u3_Host.dem_c, bin_c);
@ -1540,7 +1540,7 @@ u3_king_done(void)
c3_free(ver_c);
} break;
default: c3_assert(0);
default: u3_assert(0);
}
c3_free(pac_c);
@ -1596,7 +1596,7 @@ u3_king_grab(void* vod_p)
c3_w tot_w = 0;
FILE* fil_u;
c3_assert( u3R == &(u3H->rod_u) );
u3_assert( u3R == &(u3H->rod_u) );
#ifdef U3_MEMORY_LOG
{

18
pkg/vere/lord.c
View File

@ -74,7 +74,7 @@ static void
_lord_writ_free(u3_writ* wit_u)
{
switch ( wit_u->typ_e ) {
default: c3_assert(0);
default: u3_assert(0);
case u3_writ_work: {
// XX confirm
@ -170,7 +170,7 @@ _lord_writ_pop(u3_lord* god_u)
{
u3_writ* wit_u = god_u->ext_u;
c3_assert( wit_u );
u3_assert( wit_u );
if ( !wit_u->nex_u ) {
god_u->ent_u = god_u->ext_u = 0;
@ -191,7 +191,7 @@ static inline const c3_c*
_lord_writ_str(u3_writ_type typ_e)
{
switch ( typ_e ) {
default: c3_assert(0);
default: u3_assert(0);
case u3_writ_work: return "work";
case u3_writ_peek: return "peek";
@ -530,7 +530,7 @@ _lord_work_spin(u3_lord* god_u)
// complete spinner
//
c3_assert( c3y == god_u->pin_o );
u3_assert( c3y == god_u->pin_o );
god_u->cb_u.spun_f(god_u->cb_u.ptr_v);
god_u->pin_o = c3n;
@ -764,7 +764,7 @@ _lord_writ_make(u3_lord* god_u, u3_writ* wit_u)
u3_noun msg;
switch ( wit_u->typ_e ) {
default: c3_assert(0);
default: u3_assert(0);
case u3_writ_work: {
u3_noun mil = u3i_words(1, &wit_u->wok_u.egg_u->mil_w);
@ -855,8 +855,8 @@ static void
_lord_writ_plan(u3_lord* god_u, u3_writ* wit_u)
{
if ( !god_u->ent_u ) {
c3_assert( !god_u->ext_u );
c3_assert( !god_u->dep_w );
u3_assert( !god_u->ext_u );
u3_assert( !god_u->dep_w );
god_u->dep_w = 1;
god_u->ent_u = god_u->ext_u = wit_u;
}
@ -886,7 +886,7 @@ u3_lord_peek(u3_lord* god_u, u3_pico* pic_u)
{
u3_noun sam;
switch ( pic_u->typ_e ) {
default: c3_assert(0);
default: u3_assert(0);
case u3_pico_full: {
sam = u3k(pic_u->ful);
@ -919,7 +919,7 @@ u3_lord_play(u3_lord* god_u, u3_info fon_u)
// XX wat do?
//
// c3_assert( !pay_u.ent_u->nex_u );
// u3_assert( !pay_u.ent_u->nex_u );
_lord_writ_plan(god_u, wit_u);
}

22
pkg/vere/main.c
View File

@ -120,7 +120,7 @@ _main_repath(c3_c* pax_c)
c3_w len_w;
c3_i wit_i;
c3_assert(pax_c);
u3_assert(pax_c);
if ( 0 != (rel_c = realpath(pax_c, 0)) ) {
return rel_c;
}
@ -129,10 +129,10 @@ _main_repath(c3_c* pax_c)
c3_c rec_c[2048];
wit_i = snprintf(rec_c, sizeof(rec_c), "./%s", pax_c);
c3_assert(sizeof(rec_c) > wit_i);
u3_assert(sizeof(rec_c) > wit_i);
return _main_repath(rec_c);
}
c3_assert(u3_unix_cane(fas_c + 1));
u3_assert(u3_unix_cane(fas_c + 1));
*fas_c = 0;
dir_c = realpath(pax_c, 0);
*fas_c = '/';
@ -142,7 +142,7 @@ _main_repath(c3_c* pax_c)
len_w = strlen(dir_c) + strlen(fas_c) + 1;
rel_c = c3_malloc(len_w);
wit_i = snprintf(rel_c, len_w, "%s%s", dir_c, fas_c);
c3_assert(len_w == wit_i + 1);
u3_assert(len_w == wit_i + 1);
c3_free(dir_c);
return rel_c;
}
@ -1019,12 +1019,12 @@ _cw_init_io(uv_loop_t* lup_u)
{
c3_i err_i;
err_i = uv_timer_init(lup_u, &inn_u.tim_u);
c3_assert(!err_i);
u3_assert(!err_i);
err_i = uv_pipe_init(lup_u, &inn_u.pyp_u, 0);
c3_assert(!err_i);
u3_assert(!err_i);
uv_pipe_open(&inn_u.pyp_u, inn_i);
err_i = uv_pipe_init(lup_u, &out_u.pyp_u, 0);
c3_assert(!err_i);
u3_assert(!err_i);
uv_pipe_open(&out_u.pyp_u, out_i);
uv_stream_set_blocking((uv_stream_t*)&out_u.pyp_u, 1);
@ -1318,7 +1318,7 @@ _cw_eval(c3_i argc, c3_c* argv[])
{
c3_i err_i;
err_i = uv_pipe_init(uv_default_loop(), &std_u.pyp_u, 0);
c3_assert(!err_i);
u3_assert(!err_i);
uv_pipe_open(&std_u.pyp_u, 1);
std_u.ptr_v = NULL;
@ -2228,7 +2228,7 @@ _cw_vere(c3_i argc, c3_c* argv[])
fprintf(stderr, "vere: next (%%%s): %s\n", pac_c, ver_c);
} break;
default: c3_assert(0);
default: u3_assert(0);
}
}
@ -2300,7 +2300,7 @@ _cw_vile(c3_i argc, c3_c* argv[])
switch ( u3h(res) ) {
default: c3_assert(0);
default: u3_assert(0);
case c3n: {
fprintf(stderr, "vile: unable to retrieve key file\r\n");
@ -2415,7 +2415,7 @@ main(c3_i argc,
// parse for subcommands
//
switch ( _cw_utils(argc, argv) ) {
default: c3_assert(0);
default: u3_assert(0);
// no matching subcommand, parse arguments
//

68
pkg/vere/pier.c
View File

@ -20,7 +20,7 @@ static void
_pier_peek_plan(u3_pier* pir_u, u3_pico* pic_u)
{
if (!pir_u->pec_u.ent_u) {
c3_assert( !pir_u->pec_u.ext_u );
u3_assert( !pir_u->pec_u.ext_u );
pir_u->pec_u.ent_u = pir_u->pec_u.ext_u = pic_u;
}
else {
@ -128,7 +128,7 @@ _pier_work_send(u3_work* wok_u)
static void
_pier_gift_plan(u3_work* wok_u, u3_gift* gif_u)
{
c3_assert( gif_u->eve_d > wok_u->fec_u.rel_d );
u3_assert( gif_u->eve_d > wok_u->fec_u.rel_d );
#ifdef VERBOSE_PIER
fprintf(stderr, "pier: (%" PRIu64 "): compute: complete\r\n", gif_u->eve_d);
@ -137,7 +137,7 @@ _pier_gift_plan(u3_work* wok_u, u3_gift* gif_u)
gif_u->nex_u = 0;
if ( !wok_u->fec_u.ent_u ) {
c3_assert( !wok_u->fec_u.ext_u );
u3_assert( !wok_u->fec_u.ext_u );
wok_u->fec_u.ent_u = wok_u->fec_u.ext_u = gif_u;
}
else {
@ -165,7 +165,7 @@ _pier_gift_next(u3_work* wok_u)
wok_u->fec_u.ent_u = 0;
}
c3_assert( (1ULL + wok_u->fec_u.rel_d) == gif_u->eve_d );
u3_assert( (1ULL + wok_u->fec_u.rel_d) == gif_u->eve_d );
wok_u->fec_u.rel_d = gif_u->eve_d;
return gif_u;
@ -195,7 +195,7 @@ static void
_pier_wall_plan(u3_pier* pir_u, c3_d eve_d,
void* ptr_v, void (*wal_f)(void*, c3_d))
{
c3_assert( u3_psat_work == pir_u->sat_e );
u3_assert( u3_psat_work == pir_u->sat_e );
u3_wall* wal_u = c3_malloc(sizeof(*wal_u));
wal_u->ptr_v = ptr_v;
@ -271,7 +271,7 @@ _pier_work(u3_work* wok_u)
_pier_work_send(wok_u);
}
else {
c3_assert( u3_psat_done == pir_u->sat_e );
u3_assert( u3_psat_done == pir_u->sat_e );
}
}
@ -282,7 +282,7 @@ _pier_on_lord_work_spin(void* ptr_v, u3_atom pin, c3_o del_o)
{
u3_pier* pir_u = ptr_v;
c3_assert( (u3_psat_wyrd == pir_u->sat_e)
u3_assert( (u3_psat_wyrd == pir_u->sat_e)
|| (u3_psat_work == pir_u->sat_e)
|| (u3_psat_done == pir_u->sat_e) );
@ -296,7 +296,7 @@ _pier_on_lord_work_spun(void* ptr_v)
{
u3_pier* pir_u = ptr_v;
c3_assert( (u3_psat_wyrd == pir_u->sat_e)
u3_assert( (u3_psat_wyrd == pir_u->sat_e)
|| (u3_psat_work == pir_u->sat_e)
|| (u3_psat_done == pir_u->sat_e) );
@ -313,7 +313,7 @@ _pier_on_lord_work_done(void* ptr_v,
{
u3_pier* pir_u = ptr_v;
c3_assert( (u3_psat_work == pir_u->sat_e)
u3_assert( (u3_psat_work == pir_u->sat_e)
|| (u3_psat_done == pir_u->sat_e) );
#ifdef VERBOSE_PIER
@ -341,7 +341,7 @@ _pier_on_lord_work_bail(void* ptr_v, u3_ovum* egg_u, u3_noun lud)
fprintf(stderr, "pier: work: bail\r\n");
#endif
c3_assert( (u3_psat_work == pir_u->sat_e)
u3_assert( (u3_psat_work == pir_u->sat_e)
|| (u3_psat_done == pir_u->sat_e) );
u3_auto_bail(egg_u, lud);
@ -537,7 +537,7 @@ _pier_work_init(u3_pier* pir_u)
{
u3_work* wok_u;
c3_assert( u3_psat_wyrd == pir_u->sat_e );
u3_assert( u3_psat_wyrd == pir_u->sat_e );
pir_u->sat_e = u3_psat_work;
pir_u->wok_u = wok_u = c3_calloc(sizeof(*wok_u));
@ -728,7 +728,7 @@ _pier_on_lord_wyrd_done(void* ptr_v,
{
u3_pier* pir_u = ptr_v;
c3_assert( u3_psat_wyrd == pir_u->sat_e );
u3_assert( u3_psat_wyrd == pir_u->sat_e );
// arvo's side of version negotiation succeeded
// traverse [gif_y] and validate
@ -764,7 +764,7 @@ _pier_on_lord_wyrd_bail(void* ptr_v, u3_ovum* egg_u, u3_noun lud)
{
u3_pier* pir_u = ptr_v;
c3_assert( u3_psat_wyrd == pir_u->sat_e );
u3_assert( u3_psat_wyrd == pir_u->sat_e );
// XX add cli argument to bypass negotiation failure
//
@ -851,7 +851,7 @@ _pier_wyrd_init(u3_pier* pir_u)
god_u->cb_u.work_done_f = _pier_on_lord_wyrd_done;
god_u->cb_u.work_bail_f = _pier_on_lord_wyrd_bail;
c3_assert( u3_auto_next(car_u, &ovo) == egg_u );
u3_assert( u3_auto_next(car_u, &ovo) == egg_u );
{
struct timeval tim_tv;
@ -870,7 +870,7 @@ _pier_play_plan(u3_play* pay_u, u3_info fon_u)
c3_d old_d;
if ( !pay_u->ext_u ) {
c3_assert( !pay_u->ent_u );
u3_assert( !pay_u->ent_u );
ext_u = &pay_u->ext_u;
old_d = pay_u->sen_d;
}
@ -886,7 +886,7 @@ _pier_play_plan(u3_play* pay_u, u3_info fon_u)
old_d);
#endif
c3_assert( (1ULL + old_d) == fon_u.ext_u->eve_d );
u3_assert( (1ULL + old_d) == fon_u.ext_u->eve_d );
*ext_u = fon_u.ext_u;
pay_u->ent_u = fon_u.ent_u;
@ -1055,7 +1055,7 @@ _pier_play(u3_play* pay_u)
}
}
else {
c3_assert( god_u->eve_d < pay_u->eve_d );
u3_assert( god_u->eve_d < pay_u->eve_d );
_pier_play_send(pay_u);
_pier_play_read(pay_u);
}
@ -1070,7 +1070,7 @@ _pier_on_lord_play_done(void* ptr_v, u3_info fon_u, c3_l mug_l)
u3_fact* tac_u = fon_u.ent_u;
u3_fact* nex_u;
c3_assert( u3_psat_play == pir_u->sat_e );
u3_assert( u3_psat_play == pir_u->sat_e );
u3l_log("pier: (%" PRIu64 "): play: done", tac_u->eve_d);
@ -1107,7 +1107,7 @@ _pier_on_lord_play_bail(void* ptr_v, u3_info fon_u,
{
u3_pier* pir_u = ptr_v;
c3_assert( u3_psat_play == pir_u->sat_e );
u3_assert( u3_psat_play == pir_u->sat_e );
{
u3_fact* tac_u = fon_u.ext_u;
@ -1182,11 +1182,11 @@ _pier_play_init(u3_pier* pir_u, c3_d eve_d)
u3_disk* log_u = pir_u->log_u;
u3_play* pay_u;
c3_assert( (u3_psat_init == pir_u->sat_e)
u3_assert( (u3_psat_init == pir_u->sat_e)
|| (u3_psat_boot == pir_u->sat_e) );
c3_assert( eve_d > god_u->eve_d );
c3_assert( eve_d <= log_u->dun_d );
u3_assert( eve_d > god_u->eve_d );
u3_assert( eve_d <= log_u->dun_d );
pir_u->sat_e = u3_psat_play;
pir_u->pay_u = pay_u = c3_calloc(sizeof(*pay_u));
@ -1216,7 +1216,7 @@ _pier_on_disk_read_done(void* ptr_v, u3_info fon_u)
{
u3_pier* pir_u = ptr_v;
c3_assert( u3_psat_play == pir_u->sat_e );
u3_assert( u3_psat_play == pir_u->sat_e );
_pier_play_plan(pir_u->pay_u, fon_u);
_pier_play(pir_u->pay_u);
@ -1229,7 +1229,7 @@ _pier_on_disk_read_bail(void* ptr_v, c3_d eve_d)
{
u3_pier* pir_u = ptr_v;
c3_assert( u3_psat_play == pir_u->sat_e );
u3_assert( u3_psat_play == pir_u->sat_e );
// XX s/b play_bail_cb
//
@ -1261,7 +1261,7 @@ _pier_on_disk_write_done(void* ptr_v, c3_d eve_d)
}
}
else {
c3_assert( (u3_psat_work == pir_u->sat_e)
u3_assert( (u3_psat_work == pir_u->sat_e)
|| (u3_psat_done == pir_u->sat_e) );
_pier_work(pir_u->wok_u);
@ -1394,7 +1394,7 @@ _pier_on_lord_live(void* ptr_v)
fprintf(stderr, "pier: (%" PRIu64 "): boot at mug %x\r\n", god_u->eve_d, god_u->mug_l);
#endif
c3_assert( god_u->eve_d <= log_u->dun_d );
u3_assert( god_u->eve_d <= log_u->dun_d );
if ( u3_psat_boot == pir_u->sat_e ) {
// boot-sequence commit complete
@ -1408,8 +1408,8 @@ _pier_on_lord_live(void* ptr_v)
}
}
else {
c3_assert( u3_psat_init == pir_u->sat_e );
c3_assert( log_u->sen_d == log_u->dun_d );
u3_assert( u3_psat_init == pir_u->sat_e );
u3_assert( log_u->sen_d == log_u->dun_d );
if ( god_u->eve_d < log_u->dun_d ) {
c3_d eve_d;
@ -1737,7 +1737,7 @@ _pier_pill_parse(u3_noun pil)
u3_boot bot_u;
u3_noun pil_p, pil_q;
c3_assert( c3y == u3du(pil) );
u3_assert( c3y == u3du(pil) );
u3x_cell(pil, &pil_p, &pil_q);
{
@ -1803,7 +1803,7 @@ _pier_pill_parse(u3_noun pil)
u3_noun tag = u3h(u3t(ovo));
if ( ( c3__into == tag ) || ( c3__park == tag ) ) {
c3_assert( 0 == len_w );
u3_assert( 0 == len_w );
len_w++;
ovo = u3t(pil_q);
}
@ -1812,7 +1812,7 @@ _pier_pill_parse(u3_noun pil)
ova = u3t(ova);
}
c3_assert( 1 == len_w );
u3_assert( 1 == len_w );
u3z(bot_u.use);
bot_u.use = u3kb_flop(new);
@ -1874,7 +1874,7 @@ _pier_boot_make(u3_noun who,
// XX do something about this wire
// XX route directly to %jael?
//
c3_assert( c3y == u3a_is_cell(ven) );
u3_assert( c3y == u3a_is_cell(ven) );
u3_noun wir = u3nq(c3__d, c3__term, '1', u3_nul);
u3_noun cad = u3nt(c3__boot, u3_Host.ops_u.lit, ven); // transfer
@ -2163,7 +2163,7 @@ _pier_done(u3_pier* pir_u)
static void
_pier_exit(u3_pier* pir_u)
{
c3_assert( u3_psat_done == pir_u->sat_e );
u3_assert( u3_psat_done == pir_u->sat_e );
if ( pir_u->log_u ) {
u3_disk_exit(pir_u->log_u);
@ -2221,7 +2221,7 @@ u3_pier_exit(u3_pier* pir_u)
switch ( pir_u->sat_e ) {
default: {
fprintf(stderr, "pier: unknown exit: %u\r\n", pir_u->sat_e);
c3_assert(0);
u3_assert(0);
}
case u3_psat_done: return;

4
pkg/vere/platform/darwin/daemon.c
View File

@ -31,7 +31,7 @@ static void _on_boot_completed_cb() {
}
if ( 0 == write(_child_process_booted_signal_fd, buf, 1) ) {
c3_assert(!"_on_boot_completed_cb: Can't write to parent FD");
u3_assert(!"_on_boot_completed_cb: Can't write to parent FD");
}
close(_child_process_booted_signal_fd);
@ -65,7 +65,7 @@ u3_daemon_init()
c3_i pipefd[2];
if ( 0 != pipe(pipefd) ) {
c3_assert(!"Failed to create pipe");
u3_assert(!"Failed to create pipe");
}
pid_t childpid = fork();

24
pkg/vere/platform/darwin/ptty.c
View File

@ -47,7 +47,7 @@ _ttyf_start_raw_input(u3_utty* uty_u)
return c3n;
}
if ( -1 == fcntl(uty_u->fid_i, F_SETFL, pty_u->nob_i) ) {
c3_assert(!"init-fcntl");
u3_assert(!"init-fcntl");
}
return c3y;
}
@ -62,7 +62,7 @@ _ttyf_end_raw_input(u3_utty* uty_u)
return c3n;
}
if ( -1 == fcntl(uty_u->fid_i, F_SETFL, pty_u->cug_i) ) {
c3_assert(!"exit-fcntl");
u3_assert(!"exit-fcntl");
}
return c3y;
}
@ -75,19 +75,19 @@ _ttyf_hija(u3_utty* uty_u)
u3_ptty* pty_u = (u3_ptty*)uty_u;
if ( 0 != _term_tcsetattr(1, TCSADRAIN, &pty_u->bak_u) ) {
perror("hija-tcsetattr-1");
c3_assert(!"hija-tcsetattr");
u3_assert(!"hija-tcsetattr");
}
if ( -1 == fcntl(1, F_SETFL, pty_u->cug_i) ) {
perror("hija-fcntl-1");
c3_assert(!"hija-fcntl");
u3_assert(!"hija-fcntl");
}
if ( 0 != _term_tcsetattr(0, TCSADRAIN, &pty_u->bak_u) ) {
perror("hija-tcsetattr-0");
c3_assert(!"hija-tcsetattr");
u3_assert(!"hija-tcsetattr");
}
if ( -1 == fcntl(0, F_SETFL, pty_u->cug_i) ) {
perror("hija-fcntl-0");
c3_assert(!"hija-fcntl");
u3_assert(!"hija-fcntl");
}
return c3y;
}
@ -100,19 +100,19 @@ _ttyf_loja(u3_utty* uty_u)
u3_ptty* pty_u = (u3_ptty*)uty_u;
if ( 0 != _term_tcsetattr(1, TCSADRAIN, &pty_u->raw_u) ) {
perror("loja-tcsetattr-1");
c3_assert(!"loja-tcsetattr");
u3_assert(!"loja-tcsetattr");
}
if ( -1 == fcntl(1, F_SETFL, pty_u->nob_i) ) {
perror("hija-fcntl-1");
c3_assert(!"loja-fcntl");
u3_assert(!"loja-fcntl");
}
if ( 0 != _term_tcsetattr(0, TCSADRAIN, &pty_u->raw_u) ) {
perror("loja-tcsetattr-0");
c3_assert(!"loja-tcsetattr");
u3_assert(!"loja-tcsetattr");
}
if ( -1 == fcntl(0, F_SETFL, pty_u->nob_i) ) {
perror("hija-fcntl-0");
c3_assert(!"loja-fcntl");
u3_assert(!"loja-fcntl");
}
return c3y;
}
@ -156,10 +156,10 @@ u3_ptty_init(uv_loop_t* lup_u, const c3_c** err_c)
//
{
if ( 0 != tcgetattr(uty_u->fid_i, &pty_u->bak_u) ) {
c3_assert(!"init-tcgetattr");
u3_assert(!"init-tcgetattr");
}
if ( -1 == fcntl(uty_u->fid_i, F_GETFL, &pty_u->cug_i) ) {
c3_assert(!"init-fcntl");
u3_assert(!"init-fcntl");
}
pty_u->cug_i &= ~O_NONBLOCK; // could fix?
pty_u->nob_i = pty_u->cug_i | O_NONBLOCK; // O_NDELAY on older unix

4
pkg/vere/platform/linux/daemon.c
View File

@ -31,7 +31,7 @@ static void _on_boot_completed_cb() {
}
if ( 0 == write(_child_process_booted_signal_fd, buf, 1) ) {
c3_assert(!"_on_boot_completed_cb: Can't write to parent FD");
u3_assert(!"_on_boot_completed_cb: Can't write to parent FD");
}
close(_child_process_booted_signal_fd);
@ -65,7 +65,7 @@ u3_daemon_init()
c3_i pipefd[2];
if ( 0 != pipe(pipefd) ) {
c3_assert(!"Failed to create pipe");
u3_assert(!"Failed to create pipe");
}
pid_t childpid = fork();

24
pkg/vere/platform/linux/ptty.c
View File

@ -47,7 +47,7 @@ _ttyf_start_raw_input(u3_utty* uty_u)
return c3n;
}
if ( -1 == fcntl(uty_u->fid_i, F_SETFL, pty_u->nob_i) ) {
c3_assert(!"init-fcntl");
u3_assert(!"init-fcntl");
}
return c3y;
}
@ -62,7 +62,7 @@ _ttyf_end_raw_input(u3_utty* uty_u)
return c3n;
}
if ( -1 == fcntl(uty_u->fid_i, F_SETFL, pty_u->cug_i) ) {
c3_assert(!"exit-fcntl");
u3_assert(!"exit-fcntl");
}
return c3y;
}
@ -75,19 +75,19 @@ _ttyf_hija(u3_utty* uty_u)
u3_ptty* pty_u = (u3_ptty*)uty_u;
if ( 0 != _term_tcsetattr(1, TCSADRAIN, &pty_u->bak_u) ) {
perror("hija-tcsetattr-1");
c3_assert(!"hija-tcsetattr");
u3_assert(!"hija-tcsetattr");
}
if ( -1 == fcntl(1, F_SETFL, pty_u->cug_i) ) {
perror("hija-fcntl-1");
c3_assert(!"hija-fcntl");
u3_assert(!"hija-fcntl");
}
if ( 0 != _term_tcsetattr(0, TCSADRAIN, &pty_u->bak_u) ) {
perror("hija-tcsetattr-0");
c3_assert(!"hija-tcsetattr");
u3_assert(!"hija-tcsetattr");
}
if ( -1 == fcntl(0, F_SETFL, pty_u->cug_i) ) {
perror("hija-fcntl-0");
c3_assert(!"hija-fcntl");
u3_assert(!"hija-fcntl");
}
return c3y;
}
@ -100,19 +100,19 @@ _ttyf_loja(u3_utty* uty_u)
u3_ptty* pty_u = (u3_ptty*)uty_u;
if ( 0 != _term_tcsetattr(1, TCSADRAIN, &pty_u->raw_u) ) {
perror("loja-tcsetattr-1");
c3_assert(!"loja-tcsetattr");
u3_assert(!"loja-tcsetattr");
}
if ( -1 == fcntl(1, F_SETFL, pty_u->nob_i) ) {
perror("hija-fcntl-1");
c3_assert(!"loja-fcntl");
u3_assert(!"loja-fcntl");
}
if ( 0 != _term_tcsetattr(0, TCSADRAIN, &pty_u->raw_u) ) {
perror("loja-tcsetattr-0");
c3_assert(!"loja-tcsetattr");
u3_assert(!"loja-tcsetattr");
}
if ( -1 == fcntl(0, F_SETFL, pty_u->nob_i) ) {
perror("hija-fcntl-0");
c3_assert(!"loja-fcntl");
u3_assert(!"loja-fcntl");
}
return c3y;
}
@ -156,10 +156,10 @@ u3_ptty_init(uv_loop_t* lup_u, const c3_c** err_c)
//
{
if ( 0 != tcgetattr(uty_u->fid_i, &pty_u->bak_u) ) {
c3_assert(!"init-tcgetattr");
u3_assert(!"init-tcgetattr");
}
if ( -1 == fcntl(uty_u->fid_i, F_GETFL, &pty_u->cug_i) ) {
c3_assert(!"init-fcntl");
u3_assert(!"init-fcntl");
}
pty_u->cug_i &= ~O_NONBLOCK; // could fix?
pty_u->nob_i = pty_u->cug_i | O_NONBLOCK; // O_NDELAY on older unix

4
pkg/vere/save.c
View File

@ -27,10 +27,10 @@ u3_save_ef_chld(u3_pier *pir_u)
u3l_log("checkpoint: complete %d", sav_u->pid_w);
pid_w = wait(&loc_i);
if (0 != sav_u->pid_w) {
c3_assert(pid_w == sav_u->pid_w);
u3_assert(pid_w == sav_u->pid_w);
}
else {
c3_assert(pid_w > 0);
u3_assert(pid_w > 0);
}
sav_u->pid_w = 0;
}

14
pkg/vere/serf.c
View File

@ -222,7 +222,7 @@ _serf_grab(u3_noun sac)
}
#endif
c3_assert( u3R == &(u3H->rod_u) );
u3_assert( u3R == &(u3H->rod_u) );
fprintf(fil_u, "\r\n");
tot_w += u3a_maid(fil_u, "total userspace", _serf_prof(fil_u, 0, sac));
@ -254,7 +254,7 @@ u3_serf_grab(void)
{
u3_noun sac = u3_nul;
c3_assert( u3R == &(u3H->rod_u) );
u3_assert( u3R == &(u3H->rod_u) );
{
u3_noun sam, gon;
@ -550,7 +550,7 @@ _serf_work(u3_serf* sef_u, c3_w mil_w, u3_noun job)
// event numbers must be continuous
//
c3_assert( sef_u->sen_d == sef_u->dun_d);
u3_assert( sef_u->sen_d == sef_u->dun_d);
sef_u->sen_d++;
gon = _serf_poke(sef_u, "work", mil_w, job); // retain
@ -639,7 +639,7 @@ u3_serf_work(u3_serf* sef_u, c3_w mil_w, u3_noun job)
// %work must be performed against an extant kernel
//
c3_assert( 0 != sef_u->mug_l);
u3_assert( 0 != sef_u->mug_l);
pro = u3nc(c3__work, _serf_work(sef_u, mil_w, job));
@ -657,11 +657,11 @@ _serf_play_life(u3_serf* sef_u, u3_noun eve)
{
u3_noun gon;
c3_assert( 0ULL == sef_u->sen_d );
u3_assert( 0ULL == sef_u->sen_d );
{
u3_noun len = u3qb_lent(eve);
c3_assert( c3y == u3r_safe_chub(len, &sef_u->sen_d) );
u3_assert( c3y == u3r_safe_chub(len, &sef_u->sen_d) );
u3z(len);
}
@ -787,7 +787,7 @@ _serf_play_list(u3_serf* sef_u, u3_noun eve)
u3_noun
u3_serf_play(u3_serf* sef_u, c3_d eve_d, u3_noun lit)
{
c3_assert( eve_d == 1ULL + sef_u->sen_d );
u3_assert( eve_d == 1ULL + sef_u->sen_d );
// XX better condition for no kernel?
//

2
pkg/vere/ward.c
View File

@ -170,7 +170,7 @@ u3_pico_free(u3_pico* pic_u)
u3z(pic_u->gan);
switch ( pic_u->typ_e ) {
default: c3_assert(0);
default: u3_assert(0);
case u3_pico_full: {
u3z(pic_u->ful);