Skip to content

Commit

Permalink
add some comments for code added under commit "Merge branch 'jn/stati…
Browse files Browse the repository at this point in the history 
…c_compile_3'"
  • Loading branch information
@vtjnash
vtjnash committed Oct 21, 2014
1 parent e3a74ee commit bd205a0
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 28 deletions.
6 changes: 4 additions & 2 deletions src/builtins.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1147,8 +1147,10 @@ DLLEXPORT size_t jl_static_show(JL_STREAM *out, jl_value_t *v)
else {
n += JL_PRINTF(out, "(?)");
}
JL_PRINTF(out, " -> ");
jl_static_show(out, !jl_is_expr(li->ast) ? jl_uncompress_ast(li, li->ast) : li->ast);
// The following is nice for debugging, but allocates memory and generates a lot of output
// so it may not be a good idea to to have it active
//JL_PRINTF(out, " -> ");
//jl_static_show(out, !jl_is_expr(li->ast) ? jl_uncompress_ast(li, li->ast) : li->ast);
}
else if (jl_is_tuple(v)) {
n += jl_show_tuple(out, (jl_tuple_t*)v, "(", ")", 1);
Expand Down
58 changes: 46 additions & 12 deletions src/dump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,36 @@
extern "C" {
#endif

// hash of definitions for predefined tagged object
static htable_t ser_tag;
// array of definitions for the predefined tagged object types
// (reverse of ser_tag)
static jl_value_t* deser_tag[256];

// table of all objects that have been deserialized, indexed by pos
// (the location in the serializer stream) in MODE_MODULE, the low
// bit is reserved for flagging certain entries and pos is
// left shift by 1
static htable_t backref_table;
// list of (jl_value_t *value, jl_value_t **loc, size_t pos) entries
// for anything that was flagged by the serializer for later rework of
// some sort

This comment has been minimized.

Sign in to view

Copy link
@JeffBezanson

JeffBezanson Oct 21, 2014

Member

Could you say more about why some entries are flagged? What kind of rework is needed? These sorts of tricky data representation issues tend to be the most important things to document.

This comment has been minimized.

Sign in to view

Copy link
@vtjnash

vtjnash Oct 21, 2014

Author Member

currently, it is used for ensuring the uniqueness of types and singletons. so after deserializing Ptr{Void}, we can go back afterwards and replace all uses of that with the Ptr{Void} from the type->name->cache, and then also assign uid's to any other newly created type. it could perhaps be used for restoring WeakRef's also.
static arraylist_t flagref_list;

// list of any methtable objects that were deserialized in MODE_MODULE
// and need to be rehashed after assigning the uid fields to types
// (only used in MODE_MODULE and MODE_MODULE_LAMBDAS)
static arraylist_t methtable_list;

// hash of definitions for predefined function pointers
static htable_t fptr_to_id;
// array of definitions for the predefined function pointers
// (reverse of fptr_to_id)
static htable_t id_to_fptr;

// pointers to non-AST-ish objects in a compressed tree
static jl_array_t *tree_literal_values=NULL; // (only used in MODE_AST)

static const ptrint_t LongSymbol_tag = 23;
static const ptrint_t LongTuple_tag = 24;
static const ptrint_t LongExpr_tag = 25;
Expand All @@ -39,20 +61,30 @@ static const ptrint_t BackRef_tag = 255;
static ptrint_t VALUE_TAGS;

typedef enum _DUMP_MODES {
// not in the serializer at all, or
// something is seriously wrong
MODE_INVALID = 0,
MODE_MODULE, MODE_MODULE_LAMBDAS,

// jl_uncompress_ast
// compressing / decompressing an AST Expr in a LambdaStaticData
MODE_AST,

// jl_restore_system_image
// restoring an entire system image from disk
MODE_SYSTEM_IMAGE,

// jl_restore_new_module
// restoring a single module from disk for integration
// into the currently running system image / environment
MODE_MODULE, // first-stage (pre type-uid assignment)
MODE_MODULE_LAMBDAS, // second-stage (post type-uid assignment)
} DUMP_MODES;
static DUMP_MODES mode = 0;

// pointers to non-AST-ish objects in a compressed tree
static jl_array_t *tree_literal_values=NULL;

static jl_value_t *jl_idtable_type=NULL;

// queue of types to cache
static jl_array_t *datatype_list=NULL;
static jl_array_t *datatype_list=NULL; // (only used in MODE_SYSTEM_IMAGE)

#define write_uint8(s, n) ios_putc((n), (s))
#define read_uint8(s) ((uint8_t)ios_getc(s))
Expand Down Expand Up @@ -692,6 +724,7 @@ void jl_serialize_methtable_from_mod(ios_t *s, jl_module_t *m, jl_sym_t *name, j
mt = jl_gf_mtable(mt->kwsorter);
assert(!mt->kwsorter);
}
//XXX: we are reversing the list of methods due to #8652
struct _chain {
jl_methlist_t *ml;
struct _chain *next;
Expand Down Expand Up @@ -1168,7 +1201,7 @@ static jl_value_t *jl_deserialize_value_(ios_t *s, int pos, jl_value_t *vtag, jl
jl_set_nth_field(v, i, jl_deserialize_value(s,
(dt->fields[i].isptr) ? (jl_value_t**)(data+jl_field_offset(dt, i)) : NULL));
}
if (mode == MODE_MODULE && jl_is_mtable(v))
if ((mode == MODE_MODULE || mode == MODE_MODULE_LAMBDAS) && jl_is_mtable(v))
arraylist_push(&methtable_list, v);
}
}
Expand Down Expand Up @@ -1332,7 +1365,7 @@ void jl_restore_system_image(char *fname)
datatype_list = jl_alloc_cell_1d(0);

jl_array_type->env = jl_deserialize_value(&f, NULL);

jl_main_module = (jl_module_t*)jl_deserialize_value(&f, NULL);
jl_internal_main_module = jl_main_module;
jl_core_module = (jl_module_t*)jl_get_global(jl_main_module,
Expand Down Expand Up @@ -1513,7 +1546,7 @@ int jl_save_new_module(char *fname, jl_module_t *mod)
mode = last_mode;
jl_gc_ephemeral_off();
if (en) jl_gc_enable();

htable_reset(&backref_table, 0);
ios_close(&f);

Expand All @@ -1539,7 +1572,7 @@ jl_module_t *jl_restore_new_module(char *fname)
ptrhash_put(&backref_table, (void*)(((uintptr_t)-4)>>1), jl_main_module);
arraylist_new(&flagref_list, 0);
arraylist_new(&methtable_list, 0);

int en = jl_gc_is_enabled();
jl_gc_disable();
DUMP_MODES last_mode = mode;
Expand Down Expand Up @@ -1614,6 +1647,9 @@ jl_module_t *jl_restore_new_module(char *fname)
}
}

mode = MODE_MODULE_LAMBDAS;
jl_deserialize_lambdas_from_mod(&f);

for (i = 0; i < methtable_list.len; i++) {
jl_methtable_t *mt = (jl_methtable_t*)methtable_list.items[i];
jl_array_t *cache_targ = mt->cache_targ;
Expand Down Expand Up @@ -1644,8 +1680,6 @@ jl_module_t *jl_restore_new_module(char *fname)
}
}

mode = MODE_MODULE_LAMBDAS;
jl_deserialize_lambdas_from_mod(&f);

mode = last_mode;
if (en) jl_gc_enable();
Expand Down Expand Up @@ -1694,7 +1728,7 @@ void jl_init_serializer(void)
jl_symbol("T"), jl_symbol("S"),
jl_symbol("X"), jl_symbol("Y"),
jl_symbol("add_int"), jl_symbol("sub_int"),
jl_symbol("mul_int"),
jl_symbol("mul_int"),
jl_symbol("add_float"), jl_symbol("sub_float"),
jl_symbol("mul_float"), jl_symbol("ccall"),
jl_symbol("box"), jl_symbol("unbox"),
Expand Down
29 changes: 15 additions & 14 deletions ui/repl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,25 +137,26 @@ void parse_opts(int *argcp, char ***argvp)
exit(0);
case 'c':
if (optarg != NULL) {
if (!strcmp(optarg,"user"))
codecov = JL_LOG_USER;
else if (!strcmp(optarg,"all"))
codecov = JL_LOG_ALL;
else if (!strcmp(optarg,"none"))
codecov = JL_LOG_NONE;
if (!strcmp(optarg,"user"))
codecov = JL_LOG_USER;
else if (!strcmp(optarg,"all"))
codecov = JL_LOG_ALL;
else if (!strcmp(optarg,"none"))
codecov = JL_LOG_NONE;
break;
}
else
codecov = JL_LOG_USER;
else {
codecov = JL_LOG_USER;
}
break;
case 'm':
if (optarg != NULL) {
if (!strcmp(optarg,"user"))
malloclog = JL_LOG_USER;
else if (!strcmp(optarg,"all"))
malloclog = JL_LOG_ALL;
else if (!strcmp(optarg,"none"))
malloclog = JL_LOG_NONE;
if (!strcmp(optarg,"user"))
malloclog = JL_LOG_USER;
else if (!strcmp(optarg,"all"))
malloclog = JL_LOG_ALL;
else if (!strcmp(optarg,"none"))
malloclog = JL_LOG_NONE;
break;
}
case 300:
Expand Down

1 comment on commit bd205a0

@JeffBezanson
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, this is very helpful.

Please sign in to comment.