From f6570cf6201bf6476d903def9b04fe9c33f13a3d Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Mon, 17 Mar 2014 15:49:50 +0100
Subject: ose: Break lmconf into one per load module

---
 erts/etc/common/Makefile.in |  2 +-
 erts/etc/ose/etc.lmconf     | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 erts/etc/ose/etc.lmconf

(limited to 'erts/etc')

diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index 5c2cd8aded..f74c670731 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -507,7 +507,7 @@ $(OBJDIR)/crt0_lm.o: $(CRT0_LM)
 OSE_LM_OBJS += $(OBJDIR)/ose_confd.o $(OBJDIR)/crt0_lm.o
 
 $(BINDIR)/run_erl_lm: $(OBJDIR)/run_erl_main.o $(OBJDIR)/safe_string.o $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl_common.o $(OBJDIR)/to_erl_common.o $(OSE_LM_OBJS)
-	$(call build-ose-load-module, $@, $^, $(LIBS), $(LMCONF))
+	$(call build-ose-load-module, $@, $^, $(LIBS), $(RUN_ERL_LMCONF))
 
 
 $(OBJDIR)/run_erl_main.o: $(OSEETC)/run_erl_main.c $(OSEETC)/run_erl.h ../common/to_erl_common.h $(RC_GENERATED)
diff --git a/erts/etc/ose/etc.lmconf b/erts/etc/ose/etc.lmconf
new file mode 100644
index 0000000000..b402b325b1
--- /dev/null
+++ b/erts/etc/ose/etc.lmconf
@@ -0,0 +1,20 @@
+OSE_LM_STACK_SIZES=256,512,1024,2048,4096,8192,16384,65536
+OSE_LM_SIGNAL_SIZES=31,63,127,255,1023,4095,16383,65535
+OSE_LM_POOL_SIZE=0x200000
+OSE_LM_MAIN_NAME=main
+OSE_LM_MAIN_STACK_SIZE=0xF000
+OSE_LM_MAIN_PRIORITY=20
+## Has to be of a type that allows MAM
+OSE_LM_PROGRAM_TYPE=APP_RAM
+OSE_LM_DATA_INIT=YES
+OSE_LM_BSS_INIT=YES
+OSE_LM_EXEC_MODEL=SHARED
+HEAP_MAX_SIZE=1000000000
+HEAP_SMALL_BUF_INIT_SIZE=64000000
+HEAP_LARGE_BUF_THRESHOLD=16000000
+HEAP_LOCK_TYPE=2
+
+# Setting the environment variable EFS_RESOLVE_TMO on the block to 0.
+# This will eliminiate delays when trying to open files on not mounted
+# volumes.
+EFS_RESOLVE_TMO=0
-- 
cgit v1.2.3


From 675e046c886f358fdd80d9b818282cf714b577d2 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Mon, 17 Mar 2014 16:43:20 +0100
Subject: ose: Initiate stdin/stdout/stderr

Needed to get std io to work in some OSE systems where stdio
is not opened when the program starts.
---
 erts/etc/ose/run_erl_main.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'erts/etc')

diff --git a/erts/etc/ose/run_erl_main.c b/erts/etc/ose/run_erl_main.c
index d396ebe93b..2d92924ff2 100644
--- a/erts/etc/ose/run_erl_main.c
+++ b/erts/etc/ose/run_erl_main.c
@@ -45,6 +45,8 @@ int main(int argc, char **argv)
   char run_erl_usage[320],
     to_erl_usage[120];
 
+  (void)stdin;(void)stdout;(void)stderr;
+
   sprintf(run_erl_usage,RUN_ERL_USAGE,"run_erl [-daemon] [-block blockname]");
   sprintf(to_erl_usage,TO_ERL_USAGE,"pipename");
 
-- 
cgit v1.2.3


From c4e7924f48e629319a8a0f74e73116319ba98423 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Thu, 13 Mar 2014 18:37:02 +0100
Subject: ose: Prinout errno when to_erl read fails

---
 erts/etc/common/to_erl_common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/to_erl_common.c b/erts/etc/common/to_erl_common.c
index a49be44b6c..ab706fffe0 100644
--- a/erts/etc/common/to_erl_common.c
+++ b/erts/etc/common/to_erl_common.c
@@ -126,7 +126,8 @@ static int version_handshake(char* buf, int len, int wfd);
 #define READ_AIO(REQ,FD,SIZE,BUFF)					\
   SET_AIO(REQ,FD,SIZE,BUFF);						\
   if (aio_read(&(REQ)) != 0)						\
-    fprintf(stderr,"aio_read of child_read_req(%d) failed\n",FD)
+    fprintf(stderr,"aio_read of child_read_req(%d) failed"		\
+	    "with error %d\n",FD,errno)
 
 union SIGNAL {
   SIGSELECT signo;
-- 
cgit v1.2.3