ose: Port run_erl and to_erl

4 files changed, 200 insertions, 34 deletions

diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index f5df53ec01..5be0942952 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -86,6 +86,16 @@ OSEETC	  = ../ose
 WINETC	  = ../win32
 
 ifeq ($(TARGET), win32)
+ETC       = $(WINETC)
+else
+ifeq ($(findstring ose,$(TARGET)),ose)
+ETC       = $(OSEETC)
+else
+ETC       = $(UXETC)
+endif
+endif
+
+ifeq ($(TARGET), win32)
 ERLEXEC = erlexec.dll
 else
 ERLEXEC = erlexec
@@ -172,7 +182,7 @@ ENTRY_OBJ=
 ERLSRV_OBJECTS=
 MC_OUTPUTS=
 INET_GETHOST =
-INSTALL_EMBEDDED_PROGS =
+INSTALL_EMBEDDED_PROGS = $(BINDIR)/run_erl_lm
 INSTALL_EMBEDDED_DATA =
 INSTALL_TOP = Install
 INSTALL_TOP_BIN =
@@ -183,7 +193,7 @@ INSTALL_LIBS =
 INSTALL_OBJS =
 INSTALL_INCLUDES =
 TEXTFILES = Install erl.src
-INSTALL_PROGS =
+INSTALL_PROGS = $(INSTALL_EMBEDDED_PROGS)
 else # UNIX (!win32 && !ose)
 ENTRY_LDFLAGS=
 ENTRY_OBJ=
@@ -193,11 +203,11 @@ INET_GETHOST = $(BINDIR)/inet_gethost@EXEEXT@
 INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer@EXEEXT@ $(BINDIR)/dialyzer@EXEEXT@ \
  $(BINDIR)/erlc@EXEEXT@ $(BINDIR)/escript@EXEEXT@ $(BINDIR)/ct_run@EXEEXT@ \
  $(BINDIR)/run_erl $(BINDIR)/to_erl $(BINDIR)/dyn_erl
-INSTALL_EMBEDDED_DATA = ../unix/start.src ../unix/start_erl.src
+INSTALL_EMBEDDED_DATA = $(UXETC)/start.src $(UXETC)/start_erl.src
 INSTALL_TOP = Install
 INSTALL_TOP_BIN = 
-INSTALL_MISC = ../unix/format_man_pages ../unix/makewhatis
-INSTALL_SRC = ../unix/setuid_socket_wrap.c #delivered as an example
+INSTALL_MISC = $(UXETC)/format_man_pages $(UXETC)/makewhatis
+INSTALL_SRC = $(UXETC)/setuid_socket_wrap.c #delivered as an example
 ERLEXECDIR = .
 INSTALL_LIBS =
 INSTALL_OBJS =
@@ -403,24 +413,24 @@ $(BINDIR)/inet_gethost@EXEEXT@: $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(ERTS_LIB
 # run_erl
 $(BINDIR)/run_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl_common.o
 	$(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-$(OBJDIR)/run_erl.o: ../unix/run_erl.c ../common/run_erl_common.h $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -I ../common/ -o $@ -c ../unix/run_erl.c
+$(OBJDIR)/run_erl.o: $(ETC)/run_erl.c ../common/run_erl_common.h $(RC_GENERATED)
+	$(V_CC) $(CFLAGS) -I ../common/ -o $@ -c $(ETC)/run_erl.c
 $(OBJDIR)/run_erl_common.o: ../common/run_erl_common.c ../common/run_erl_common.h $(RC_GENERATED)
 	$(V_CC) $(CFLAGS) -o $@ -c $<
 
 # to_erl
 $(BINDIR)/to_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/to_erl.o $(OBJDIR)/to_erl_common.o
 	$(V_LD) $(LDFLAGS) -o $@  $^
-$(OBJDIR)/to_erl.o: ../unix/to_erl.c ../common/safe_string.h $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -I ../common/ -o $@ -c ../unix/to_erl.c
+$(OBJDIR)/to_erl.o: $(ETC)/to_erl.c ../common/safe_string.h $(RC_GENERATED)
+	$(V_CC) $(CFLAGS) -I ../common/ -o $@ -c $(ETC)/to_erl.c
 $(OBJDIR)/to_erl_common.o: ../common/to_erl_common.c ../common/to_erl_common.h $(RC_GENERATED)
 	$(V_CC) $(CFLAGS) -o $@ -c $<
 
 # dyn_erl
 $(BINDIR)/dyn_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/dyn_erl.o
 	$(V_LD) $(LDFLAGS) -o $@  $(OBJDIR)/safe_string.o $(OBJDIR)/dyn_erl.o
-$(OBJDIR)/dyn_erl.o: ../unix/dyn_erl.c $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -o $@ -c ../unix/dyn_erl.c
+$(OBJDIR)/dyn_erl.o: $(UXETC)/dyn_erl.c $(RC_GENERATED)
+	$(V_CC) $(CFLAGS) -o $@ -c $(UXETC)/dyn_erl.c
 $(OBJDIR)/safe_string.o: ../common/safe_string.c $(RC_GENERATED)
 	$(V_CC) $(CFLAGS) -o $@ -c ../common/safe_string.c
 
@@ -464,18 +474,42 @@ $(OBJDIR)/ct_run.o: ct_run.c $(RC_GENERATED)
 
 
 
-Install:	../unix/Install.src ../../vsn.mk $(TARGET)/Makefile
+Install:	$(UXETC)/Install.src ../../vsn.mk $(TARGET)/Makefile
 	$(vsn_verbose)sed -e 's;%I_VSN%;$(VSN);' \
 	    -e 's;%EMULATOR%;$(EMULATOR);' \
             -e 's;%EMULATOR_NUMBER%;$(EMULATOR_NUMBER);' \
 	    -e 's;%I_SYSTEM_VSN%;$(SYSTEM_VSN);' \
-          ../unix/Install.src > Install
+          $(UXETC)/Install.src > Install
 
-erl.src: ../unix/erl.src.src ../../vsn.mk $(TARGET)/Makefile
+erl.src: $(UXETC)/erl.src.src ../../vsn.mk $(TARGET)/Makefile
 	$(vsn_verbose)sed -e 's;%EMULATOR%;$(EMULATOR);' \
             -e 's;%EMULATOR_NUMBER%;$(EMULATOR_NUMBER);' \
             -e 's;%VSN%;$(VSN);' \
-                  ../unix/erl.src.src > erl.src
+                  $(UXETC)/erl.src.src > erl.src
+
+#---------------------------------------------------------
+# OSE specific targets
+#---------------------------------------------------------
+ifeq ($(findstring ose,$(TARGET)),ose)
+$(OBJDIR)/ose_confd.o: $(OSE_CONFD)
+	$(V_CC) $(CFLAGS) -o $@ -c $<
+$(OBJDIR)/crt0_lm.o: $(CRT0_LM)
+	$(V_CC) $(CFLAGS) -o $@ -c $<
+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))
+
+
+$(OBJDIR)/run_erl_main.o: $(OSEETC)/run_erl_main.c $(OSEETC)/run_erl.h ../common/to_erl_common.h $(RC_GENERATED)
+	$(V_CC) $(CFLAGS) -I ../common/ -o $@ -c $(OSEETC)/run_erl_main.c
+
+endif
+
+#---------------------------------------------------------
+# End of ose specific targets.
+#---------------------------------------------------------
+
 
 # ----------------------------------------------------
 # Release Target
diff --git a/erts/etc/common/run_erl_common.c b/erts/etc/common/run_erl_common.c
index dc899c5349..bf55056090 100644
--- a/erts/etc/common/run_erl_common.c
+++ b/erts/etc/common/run_erl_common.c
@@ -36,6 +36,10 @@
 #  include <syslog.h>
 #endif
 
+#ifdef __OSE__
+#  include "ramlog.h"
+#endif
+
 #include "run_erl_common.h"
 #include "safe_string.h"
 
@@ -57,7 +61,9 @@
 #define PIPE_STUBLEN    strlen(PIPE_STUBNAME)
 #define PERM            (S_IWUSR | S_IRUSR | S_IWOTH | S_IROTH | S_IWGRP | S_IRGRP)
 
-#if !defined(O_SYNC)
+/* OSE has defined O_SYNC but it is not recognized by open */
+#if !defined(O_SYNC) || defined(__OSE__)
+#undef O_SYNC
 #define O_SYNC 0
 #define USE_FSYNC 1
 #endif
@@ -81,8 +87,6 @@ static char log_alive_format[ALIVE_BUFFSIZ+1];
 static int run_daemon = 0;
 static unsigned protocol_ver = RUN_ERL_LO_VER; /* assume lowest to begin with */
 
-int erts_run_erl_log_alive_minutes = DEFAULT_LOG_ALIVE_MINUTES;
-
 /*
  * Current log number and log fd
  */
@@ -94,7 +98,11 @@ static int lfd=0;
  * getenv_int:
  */
 static char *getenv_int(const char *name) {
+#ifdef __OSE__
+   return get_env(get_bid(current_process()),name);
+#else
    return getenv(name);
+#endif
 }
 
 /*
@@ -189,9 +197,7 @@ static int open_log(int log_num, int flags)
   /* Create or continue on the current log file */
   sn_printf(buf, sizeof(buf), "%s/%s%d", log_dir, LOG_STUBNAME, log_num);
 
-  do {
-    lfd = open(buf, flags, LOG_PERM);
-  } while (lfd < 0 && errno == EINTR);
+  lfd = sf_open(buf, flags, LOG_PERM);
 
   if(lfd <0){
       ERRNO_ERR1(LOG_ERR,"Can't open log file '%s'.", buf);
@@ -307,7 +313,11 @@ void erts_run_erl_log_status(const char *format,...)
     return;
   now = time(NULL);
   fprintf(stdstatus, "run_erl [%d] %s",
+#ifdef __OSE__
+	  (int)current_process(),
+#else
 	  (int)getpid(),
+#endif
 	  ctime(&now));
   va_start(args, format);
   vfprintf(stdstatus, format, args);
@@ -331,10 +341,22 @@ void erts_run_erl_log_error(int priority, int line, const char *format, ...)
     }
     else
 #endif
+#ifdef __OSE__
+    if (RUN_DAEMON) {
+      char *buff = malloc(sizeof(char)*1024);
+      vsnprintf(buff,1024,format, args);
+      ramlog_printf(buff);
+    }
+    else
+#endif
     {
 	time_t now = time(NULL);
 	fprintf(stderr, "run_erl:%d [%d] %s", line,
+#ifdef __OSE__
+		(int)current_process(),
+#else
 		(int)getpid(),
+#endif
 		ctime(&now));
 	vfprintf(stderr, format, args);
     }
@@ -544,10 +566,12 @@ int erts_run_erl_open_fifo(char *pipename,char *w_pipename,char *r_pipename) {
 			PIPE_STUBNAME, highest_pipe_num+1);
 	      continue;
 	  }
-	  fprintf(stderr, "Erlang already running on pipe %s.\n", pipename);
+	  ERROR1(LOG_ERR, "Erlang already running on pipe %s.\n", pipename);
+	  unlink(w_pipename);
 	  return 1;
       }
       if (create_fifo(r_pipename, PERM) < 0) {
+	  unlink(w_pipename);
 	  ERRNO_ERR1(LOG_ERR,"Cannot create FIFO %s for reading.",
 		     r_pipename);
 	  return 1;
diff --git a/erts/etc/common/run_erl_common.h b/erts/etc/common/run_erl_common.h
index dca1af93f2..3b763ad927 100644
--- a/erts/etc/common/run_erl_common.h
+++ b/erts/etc/common/run_erl_common.h
@@ -51,8 +51,12 @@ int erts_run_erl_write_all(int fd, const char* buf, int len);
 char *simple_basename(char *path);
 
 #ifndef LOG_ERR
+#ifdef __OSE__
+#define LOG_ERR 0
+#else
 #define LOG_ERR NULL
 #endif
+#endif
 
 #define ERROR0(Prio,Format) erts_run_erl_log_error(Prio,__LINE__,Format"\n")
 #define ERROR1(Prio,Format,A1) erts_run_erl_log_error(Prio,__LINE__,Format"\n",A1)
diff --git a/erts/etc/common/to_erl_common.c b/erts/etc/common/to_erl_common.c
index 4c38877277..1b2f27fa04 100644
--- a/erts/etc/common/to_erl_common.c
+++ b/erts/etc/common/to_erl_common.c
@@ -49,10 +49,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <termios.h>
 #include <dirent.h>
-#include <signal.h>
 #include <errno.h>
+
+#ifdef __OSE__
+#include <aio.h>
+#include "ose.h"
+#include "efs.h"
+#include "ose_spi/fm.sig"
+#else /* __UNIX__ */
+#include <termios.h>
+#include <signal.h>
+#endif
+
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 #endif
@@ -78,7 +87,11 @@
 
 #define noDEBUG
 
+#ifdef __OSE__
+#define PIPE_DIR        "/pipe/"
+#else
 #define PIPE_DIR        "/tmp/"
+#endif
 #define PIPE_STUBNAME   "erlang.pipe"
 #define PIPE_STUBLEN    strlen(PIPE_STUBNAME)
 
@@ -92,14 +105,38 @@
 #define FILENAME_MAX 250
 #endif
 
-static struct termios tty_smode, tty_rmode;
 static int tty_eof = 0;
-static int recv_sig = 0;
 static int protocol_ver = RUN_ERL_LO_VER; /* assume lowest to begin with */
 
 static int write_all(int fd, const char* buf, int len);
-static int window_size_seq(char* buf, size_t bufsz);
 static int version_handshake(char* buf, int len, int wfd);
+
+
+#ifdef __OSE__
+
+#define SET_AIO(REQ,FD,SIZE,BUFF)					\
+  /* Make sure to clean data structure of previous request */		\
+  memset(&(REQ),0,sizeof(REQ));						\
+  (REQ).aio_fildes = FD;						\
+  (REQ).aio_offset = FM_POSITION_CURRENT;				\
+  (REQ).aio_nbytes = SIZE;						\
+  (REQ).aio_buf = BUFF;							\
+  (REQ).aio_sigevent.sigev_notify = SIGEV_NONE
+
+#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)
+
+union SIGNAL {
+  SIGSELECT signo;
+  struct FmReadPtr fm_read_ptr;
+};
+
+#else /* __UNIX__ */
+static int recv_sig = 0;
+static struct termios tty_smode, tty_rmode;
+static int window_size_seq(char* buf, size_t bufsz);
 #ifdef DEBUG
 static void show_terminal_settings(struct termios *);
 #endif
@@ -115,6 +152,7 @@ static void handle_sigwinch(int sig)
 {
     recv_sig = SIGWINCH;
 }
+#endif
 
 static void usage(char *pname)
 {
@@ -126,13 +164,22 @@ int to_erl(int argc, char **argv)
 {
     char  FIFO1[FILENAME_MAX], FIFO2[FILENAME_MAX];
     int i, len, wfd, rfd;
-    fd_set readfds;
-    char buf[BUFSIZ];
     char pipename[FILENAME_MAX];
     int pipeIx = 1;
     int force_lock = 0;
     int got_some = 0;
 
+#ifdef __OSE__
+    struct aiocb stdin_read_req, pipe_read_req;
+    FmHandle stdin_fh, pipe_fh;
+    char *stdin_buf, *pipe_buf;
+    char *buf;
+    union SIGNAL *sig;
+#else /* __UNIX__ */
+    char buf[BUFSIZ];
+    fd_set readfds;
+#endif
+
     if (argc >= 2 && argv[1][0]=='-') {
 	switch (argv[1][1]) {
 	case 'h':
@@ -149,7 +196,13 @@ int to_erl(int argc, char **argv)
     }
 
 #ifdef DEBUG
-    fprintf(stderr, "%s: pid is : %d\n", argv[0], (int)getpid());
+    fprintf(stderr, "%s: pid is : %d\n", argv[0],(int)
+#ifdef __OSE__
+	    current_process()
+#else /* __UNIX__ */
+	    getpid()
+#endif
+	    );
 #endif
 
     strn_cpy(pipename, sizeof(pipename),
@@ -187,6 +240,7 @@ int to_erl(int argc, char **argv)
     /* write FIFO */
     sn_printf(FIFO2,sizeof(FIFO2),"%s.w",pipename);
 
+#ifndef __OSE__
     /* Check that nobody is running to_erl on this pipe already */
     if ((wfd = open (FIFO1, O_WRONLY|DONT_BLOCK_PLEASE, 0)) >= 0) {
 	/* Open as server succeeded -- to_erl is already running! */
@@ -200,6 +254,7 @@ int to_erl(int argc, char **argv)
 	    exit(1);
 	}
     }
+#endif
 
     if ((rfd = open (FIFO1, O_RDONLY|DONT_BLOCK_PLEASE, 0)) < 0) {
 #ifdef DEBUG
@@ -226,6 +281,7 @@ int to_erl(int argc, char **argv)
 
     fprintf(stderr, "Attaching to %s (^D to exit)\n\n", pipename);
 
+#ifndef __OSE__
     /* Set break handler to our handler */
     signal(SIGINT,handle_ctrlc);
 
@@ -344,6 +400,8 @@ int to_erl(int argc, char **argv)
 #ifdef DEBUG
     show_terminal_settings(&tty_smode);
 #endif
+
+#endif /* !__OSE__ */
     /*
      * 	 "Write a ^L to the FIFO which causes the other end to redisplay
      *    the input line."
@@ -357,10 +415,22 @@ int to_erl(int argc, char **argv)
 	fprintf(stderr, "Error in writing ^L to FIFO.\n");
     }
 
+#ifdef __OSE__
+    /* we have a tiny stack so we malloc the buffers */
+    stdin_buf = malloc(sizeof(char) * BUFSIZ);
+    pipe_buf = malloc(sizeof(char) * BUFSIZ);
+
+    efs_examine_fd(rfd,FLIB_FD_HANDLE,&pipe_fh);
+    efs_examine_fd(0,FLIB_FD_HANDLE,&stdin_fh);
+    READ_AIO(stdin_read_req,0,BUFSIZ,stdin_buf);
+    READ_AIO(pipe_read_req,rfd,BUFSIZ,pipe_buf);
+#endif
+
     /*
      * read and write
      */
     while (1) {
+#ifndef __OSE__
 	FD_ZERO(&readfds);
 	FD_SET(0, &readfds);
 	FD_SET(rfd, &readfds);
@@ -393,8 +463,21 @@ int to_erl(int argc, char **argv)
 	    }
 	    recv_sig = 0;
 	}
-	else if (FD_ISSET(0, &readfds)) {
+	else
+#else /* __OSE__ */
+	SIGSELECT sigsel[] = {0};
+	sig = receive(sigsel);
+	len = 0;
+#endif
+#ifndef __OSE__
+	  if (FD_ISSET(0,&readfds)) {
 	    len = read(0, buf, sizeof(buf));
+#else /* __OSE__ */
+	  if (sig->signo == FM_READ_PTR_REPLY &&
+	      sig->fm_read_ptr.handle == stdin_fh) {
+	    len = sig->fm_read_ptr.status == EFS_SUCCESS ? sig->fm_read_ptr.actual : -1;
+	    buf = sig->fm_read_ptr.buffer;
+#endif
 	    if (len <= 0) {
 		close(rfd);
 		close(wfd);
@@ -406,7 +489,7 @@ int to_erl(int argc, char **argv)
 		break;
 	    }
 	    /* check if there is an eof character in input */
-	    for (i = 0; i < len && buf[i] != tty_eof; i++);
+	    for (i = 0; i < len-1 && buf[i] != tty_eof; i++);
 	    if (buf[i] == tty_eof) {
 		fprintf(stderr, "[Quit]\n\r");
 		break;
@@ -424,14 +507,25 @@ int to_erl(int argc, char **argv)
 		break;
 	    }
 	    STATUS("\" OK\r\n");
+#ifdef __OSE__
+	    aio_dispatch(sig);
+	    READ_AIO(stdin_read_req, 0, BUFSIZ, stdin_buf);
+#endif
 	}
 
 	/*
 	 * Read from FIFO, write to terminal.
 	 */
+#ifndef __OSE__
 	if (FD_ISSET(rfd, &readfds)) {
 	    STATUS("FIFO read: ");
 	    len = read(rfd, buf, BUFSIZ);
+#else /* __OSE__ */
+        if (sig->signo == FM_READ_PTR_REPLY &&
+	    sig->fm_read_ptr.handle == pipe_fh) {
+	    len = sig->fm_read_ptr.status == EFS_SUCCESS ? sig->fm_read_ptr.actual : -1;
+	    buf = sig->fm_read_ptr.buffer;
+#endif
 	    if (len < 0 && errno == EAGAIN) {
 		/*
 		 * No data this time, but the writing end of the FIFO is still open.
@@ -457,11 +551,13 @@ int to_erl(int argc, char **argv)
 			close(wfd);
 			break;
 		    }
+#ifndef __OSE__
 		    if (protocol_ver >= 1) {
 			/* Tell run_erl size of terminal window */
 			signal(SIGWINCH, handle_sigwinch);
 			raise(SIGWINCH);
 		    }
+#endif
 		    got_some = 1;
 		}
 
@@ -476,15 +572,21 @@ int to_erl(int argc, char **argv)
 		    break;
 		}
 		STATUS("\" OK\r\n");
+#ifdef __OSE__
+		aio_dispatch(sig);
+		READ_AIO(pipe_read_req, rfd, BUFSIZ, pipe_buf);
+#endif
 	    }
 	}
     }
 
+#ifndef __OSE__
     /*
      * Reset terminal characterstics
      * XXX
      */
     tcsetattr(0, TCSADRAIN, &tty_rmode);
+#endif
     return 0;
 }
 
@@ -506,6 +608,7 @@ static int write_all(int fd, const char* buf, int len)
     return len;
 }
 
+#ifndef __OSE__
 static int window_size_seq(char* buf, size_t bufsz)
 {
 #ifdef TIOCGWINSZ
@@ -523,6 +626,7 @@ static int window_size_seq(char* buf, size_t bufsz)
 #endif /* TIOCGWINSZ */
     return 0;
 }
+#endif /* !__OSE__ */
 
 /*   to_erl                     run_erl
  *     |                           |
@@ -574,7 +678,7 @@ static int version_handshake(char* buf, int len, int wfd)
 }
 
 
-#ifdef DEBUG
+#if defined(DEBUG) && !defined(__OSE__)
 #define S(x)  ((x) > 0 ? 1 : 0)
 
 static void show_terminal_settings(struct termios *t)
@@ -604,4 +708,4 @@ static void show_terminal_settings(struct termios *t)
   fprintf(stderr,"c_cc:\n");
   fprintf(stderr,"c_cc[VEOF]                           %d\n", t->c_cc[VEOF]);
 }
-#endif
+#endif /* DEBUG && !__OSE__ */