ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 01:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test' into demo

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2015-06-01 10:59:17 -07:00
commit d7ec8c1880
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
n/m.c
View File

@ -1371,7 +1371,8 @@ _cm_limits(void)
{ {
ret_i = getrlimit(RLIMIT_NOFILE, &rlm); ret_i = getrlimit(RLIMIT_NOFILE, &rlm);
c3_assert(0 == ret_i); c3_assert(0 == ret_i);
rlm.rlim_cur = 4096; rlm.rlim_cur = 10240; // default OSX max, not in rlim_max irritatingly
printf("files: %llu\n", rlm.rlim_cur);
if ( 0 != setrlimit(RLIMIT_NOFILE, &rlm) ) { if ( 0 != setrlimit(RLIMIT_NOFILE, &rlm) ) {
perror("file limit"); perror("file limit");
// no exit, not a critical limit // no exit, not a critical limit

6
v/unix.c
View File

@ -272,7 +272,7 @@ _unix_file_watch(u3_ufil* fil_u,
&fil_u->was_u // uv_fs_event_t &fil_u->was_u // uv_fs_event_t
); );
if (0 != ret_w){ if (0 != ret_w){
uL(fprintf(uH, "event init: %s\n", strerror(ret_w))); uL(fprintf(uH, "event init: %s\n", uv_strerror(ret_w)));
c3_assert(0); c3_assert(0);
} }
@ -281,8 +281,8 @@ _unix_file_watch(u3_ufil* fil_u,
_unix_fs_event_cb, // callback _unix_fs_event_cb, // callback
pax_c, // dir as strings pax_c, // dir as strings
0); // flags 0); // flags
if (0 != ret_w){ if ( 0 != ret_w ){
uL(fprintf(uH, "event start: %s\n", strerror(ret_w))); uL(fprintf(uH, "event start: %s\n", uv_strerror(ret_w)));
c3_assert(0); c3_assert(0);
} }