diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-17 18:58:46 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-17 18:58:46 +0100 |
| commit | d89b69eb3a8c53e0026e9dfffb1fa5d8da5569f7 (patch) | |
| tree | b33203dec0dba5294f3ee754e7c495c999978631 /unix/main.c | |
| parent | d0f9f6cd3f4b541dd4324dd73371638185178cdb (diff) | |
| parent | e1e4249a674397ab837a31b8b4821f64e655c74e (diff) | |
| download | micropython-d89b69eb3a8c53e0026e9dfffb1fa5d8da5569f7.tar.gz micropython-d89b69eb3a8c53e0026e9dfffb1fa5d8da5569f7.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'unix/main.c')
| -rw-r--r-- | unix/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/unix/main.c b/unix/main.c index b9b8fe0b9f..fd3419a1c7 100644 --- a/unix/main.c +++ b/unix/main.c @@ -250,6 +250,7 @@ int usage(char **argv) { mp_obj_t mem_info(void) { printf("mem: total=%d, current=%d, peak=%d\n", m_get_total_bytes_allocated(), m_get_current_bytes_allocated(), m_get_peak_bytes_allocated()); + gc_dump_info(); return mp_const_none; } @@ -356,10 +357,6 @@ int main(int argc, char **argv) { mp_store_name(qstr_from_str("gc"), (mp_obj_t)&pyb_gc_obj); #endif - microsocket_init(); -#if MICROPY_MOD_TIME - time_init(); -#endif #if MICROPY_MOD_FFI ffi_init(); #endif |