From a9ad9336a33ffbe0979a8e8e34bd69d0d87ede84 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 22 Jun 2016 19:27:50 +0200
Subject: erts: Fix etp-carrier-blocks for non smp

---
 erts/etc/unix/etp-commands.in | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 15fb718c47..e2bf302cca 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -3581,9 +3581,24 @@ document etp-block
 %---------------------------------------------------------------------------
 end
 
+define etp-smp-atomic
+  if (etp_smp_compiled)
+    set $arg1 = (($arg0).counter)
+  else
+    set $arg1 = ($arg0)
+  end
+end
+
+document etp-smp-atomic
+%---------------------------------------------------------------------------
+% Read an erts_smp_atomic_t value from $arg0 into $arg1
+%---------------------------------------------------------------------------
+end
+
 define etp-carrier-blocks
   set $etp_crr = (Carrier_t*) $arg0
-  set $etp_alc = (Allctr_t*)($etp_crr->allctr.counter & ~7)
+  etp-smp-atomic $etp_crr->allctr $etp_alc
+  set $etp_alc = (Allctr_t*)($etp_alc & ~7)
   set $etp_crr_end = ((char*)$etp_crr + ($etp_crr->chdr & ~7) - (sizeof(void*) & ~8))
   set $etp_blk = (Block_t*) ((char*)$etp_crr + $etp_alc->mbc_header_size)
   set $etp_prev_blk = 0
-- 
cgit v1.2.3


From e77c49f0e80740531405a49494fe5431326a0ba7 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 5 Jul 2016 15:34:48 +0200
Subject: run_erl: Beautify #ifdef jungle

---
 erts/etc/unix/run_erl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index 30210ac172..d7cfbe675e 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -912,12 +912,12 @@ static int open_pty_master(char **ptyslave, int *sfdp)
    slave device properly. */
 #if defined(HAVE_WORKING_POSIX_OPENPT) || (defined(__sun) && defined(__SVR4))
 #  ifdef HAVE_WORKING_POSIX_OPENPT
-  if ((mfd = posix_openpt(O_RDWR)) >= 0) {
+  mfd = posix_openpt(O_RDWR);
 #  elif defined(__sun) && defined(__SVR4)
   mfd = sf_open("/dev/ptmx", O_RDWR, 0);
+#  endif
 
   if (mfd >= 0) {
-#  endif
       if ((*ptyslave = ptsname(mfd)) != NULL &&
 	  grantpt(mfd) == 0 && 
 	  unlockpt(mfd) == 0) {
-- 
cgit v1.2.3


From acf0330b0f5b1f4b8fc411cac45f57348b459525 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 5 Jul 2016 15:51:23 +0200
Subject: run_erl: Fix failing run_erl invokation on OpenBSD

Symptom: run_erl does exit(0) and child program (erl) does
not seem to start.  Running run_erl again however brings the previous
child program to life.

Problem: A race causing run_erl to read 0 from master pty and exit
because the child has not yet opened its corresponding slave pty.

Solution: Use the non standard openpty() function instead that does
not expose this race as the slave fd is opened in the parent.


Question:
Is there a race free way to do this with posix_openpt on OpenBSD?
---
 erts/etc/unix/run_erl.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index d7cfbe675e..f8b5da47ab 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -904,14 +904,26 @@ static int create_fifo(char *name, int perm)
  * Find a master device, open and return fd and slave device name.
  */
 
+#ifdef HAVE_WORKING_POSIX_OPENPT
+   /*
+    * Use openpty() on OpenBSD even if we have posix_openpt()
+    * as there is a race when read from master pty returns 0
+    * if child has not yet opened slave pty.
+    * (maybe other BSD's have the same problem?)
+    */
+#  if !(defined(__OpenBSD__) && defined(HAVE_OPENPTY))
+#    define TRY_POSIX_OPENPT
+#  endif
+#endif
+
 static int open_pty_master(char **ptyslave, int *sfdp)
 {
   int mfd;
 
 /* Use the posix_openpt if working, as this guarantees creation of the 
    slave device properly. */
-#if defined(HAVE_WORKING_POSIX_OPENPT) || (defined(__sun) && defined(__SVR4))
-#  ifdef HAVE_WORKING_POSIX_OPENPT
+#if defined(TRY_POSIX_OPENPT) || (defined(__sun) && defined(__SVR4))
+#  ifdef TRY_POSIX_OPENPT
   mfd = posix_openpt(O_RDWR);
 #  elif defined(__sun) && defined(__SVR4)
   mfd = sf_open("/dev/ptmx", O_RDWR, 0);
-- 
cgit v1.2.3


From 7f86a0fedf5a18d82817ceb530aae0f8167c9354 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 10 Aug 2016 15:24:30 +0200
Subject: run_erl: Add sleepy_child test case

with run_erl option -sleepy-child
to provoke race when slave pty is late
---
 erts/etc/unix/run_erl.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index f8b5da47ab..6a92e18648 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -240,6 +240,7 @@ int main(int argc, char **argv)
   int off_argv;
   int calculated_pipename = 0;
   int highest_pipe_num = 0;
+  int sleepy_child = 0;
 
   program_name = argv[0];
 
@@ -250,6 +251,11 @@ int main(int argc, char **argv)
 
   init_outbuf();
 
+  if (!strcmp(argv[1],"-sleepy-child")) {  /* For test purpose only */
+      sleepy_child = 1;
+      ++i;
+  }
+
   if (!strcmp(argv[1],"-daemon")) {
       daemon_init();
       ++i;
@@ -392,6 +398,9 @@ int main(int argc, char **argv)
     exit(1);
   }
   if (childpid == 0) {
+      if (sleepy_child)
+	  sleep(1);
+
     /* Child */
     sf_close(mfd);
     /* disassociate from control terminal */
-- 
cgit v1.2.3


From 71538417952de8c8dfa3b48221f4b52cd197dc2d Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Tue, 6 Sep 2016 12:04:21 +0200
Subject: doc: Use groff with -Tutf8

---
 erts/etc/unix/format_man_pages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/format_man_pages b/erts/etc/unix/format_man_pages
index 54f2d90c28..0afff13571 100644
--- a/erts/etc/unix/format_man_pages
+++ b/erts/etc/unix/format_man_pages
@@ -107,7 +107,7 @@ case :"$TARGET" in
 	    if [ -f $file ]; then
 		name=`echo $file | sed 's/\.[^.]*$//'`
 		sec=`echo $file | sed 's/.*\.//'`
-		/usr/bin/groff -Tascii -mandoc $ERL_ROOT/man/man$sec/$file \
+		/usr/bin/groff -Tutf8 -mandoc $ERL_ROOT/man/man$sec/$file \
 			> $ERL_ROOT/man/cat$sec/$file
 	    fi
 	done
-- 
cgit v1.2.3


From 8ade9adf36d2b0d55187db3e36b84365b01c4e57 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Fri, 23 Sep 2016 15:11:08 +0200
Subject: erts: Make cerl -dump core work on mac

---
 erts/etc/unix/cerl.src | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index c5422ab2ed..30f2d831b5 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -399,19 +399,29 @@ elif [ "x$GDB" = "xdump" ]; then
     cmdfile="/tmp/.cerlgdb.$$"
     case "x$core" in
 	x/*)
-	    gdbcmd="$EMU_NAME ${core}"
 	    ;;
 	*)
 	    dir=`pwd`
-	    gdbcmd="$EMU_NAME ${dir}/${core}"
+	    core="${dir}/${core}"
 	    ;;
     esac
-    echo "set width 0
+    case `uname` in
+        Darwin)
+            echo "
+thread backtrace all
+quit
+" > $cmdfile
+            exec lldb -s $cmdfile -c ${core} $EMU_NAME
+            ;;
+        *)
+	    echo "set width 0
 set height 0
 set verbose off
 
 source $ROOTDIR/erts/etc/unix/etp-commands
 thread apply all bt
 " > $cmdfile
-    exec gdb --batch --command=$cmdfile $gdbcmd
+	    exec gdb --batch --command=$cmdfile $EMU_NAME $core
+	    ;;
+    esac
 fi
-- 
cgit v1.2.3


From 855b3a9be724ffd3c9f7e311cf9d810099fa36ef Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Mon, 27 Jun 2016 20:18:22 +0200
Subject: erts: Refactor out func_info into struct

This commit adds two new structs to be used to represent
erlang code in erts.

ErtsCodeInfo is used to describe the i_func_info header
that is part of all Export entries and the prelude of
each function. This replaces all the BeamInstr * that
were previously used to point to these locations.
After this change the code should never use BeamInstr *
with offsets to figure out different parts of the
func_info header.

ErtsCodeMFA is a struct that is used to descripe a
MFA in code. It is used within ErtsCodeInfo and also
in Process->current.

All function that previously took Eterm * or BeamInstr *
to identify a MFA now use the ErtsCodeMFA or ErtsCodeInfo
where appropriate.

The code has been tested to work when adding a new field to the
ErtsCodeInfo struct, but some updates are needed in ops.tab to
make it work.
---
 erts/etc/unix/etp-commands.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index e2bf302cca..ff38dc1221 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -1311,7 +1311,9 @@ define etp-stacktrace
   set $etp_stacktrace_p = ($arg0)->stop
   set $etp_stacktrace_end = ($arg0)->hend
   printf "%% Stacktrace (%u): ", $etp_stacktrace_end-$etp_stacktrace_p
-  etp ($arg0)->cp
+  if ($arg0)->cp != 0
+    etp ($arg0)->cp
+  end
   while $etp_stacktrace_p < $etp_stacktrace_end
     if ($etp_stacktrace_p[0] & 0x3) == 0x0
       # Continuation pointer
@@ -1339,7 +1341,9 @@ define etp-stackdump
   set $etp_stackdump_p = ($arg0)->stop
   set $etp_stackdump_end = ($arg0)->hend
   printf "%% Stackdump (%u): ", $etp_stackdump_end-$etp_stackdump_p
-  etp ($arg0)->cp
+  if ($arg0)->cp != 0
+    etp ($arg0)->cp
+  end
   while $etp_stackdump_p < $etp_stackdump_end
     etp $etp_stackdump_p[0]
     set $etp_stackdump_p++
-- 
cgit v1.2.3


From 2d32c9a84458818d438cf849b86be364affabf31 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 6 Oct 2016 10:51:45 +0200
Subject: erts: Improve printouts for some etp commands

Specifically etp-stacktrace/stackdump/process-info have been changed
---
 erts/etc/unix/etp-commands.in | 63 ++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 27 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index ff38dc1221..157cbfb0ad 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -1301,25 +1301,30 @@ document etpf-msgq
 %---------------------------------------------------------------------------
 end
 
-
+define etp-stack-preamble
+  set $etp_stack_p = ($arg0)->stop
+  set $etp_stack_end = ($arg0)->hend
+  printf "%% Stacktrace (%u)\n", $etp_stack_end-$etp_stack_p
+  etp-1 ((Eterm)($arg0)->i) 0
+  printf "  (I)\n"
+  if ($arg0)->cp != 0
+    etp-1 ((Eterm)($arg0)->cp) 0
+    printf "  (cp)\n"
+  end
+end
 
 define etp-stacktrace
 # Args: Process*
 #
 # Non-reentrant
 #
-  set $etp_stacktrace_p = ($arg0)->stop
-  set $etp_stacktrace_end = ($arg0)->hend
-  printf "%% Stacktrace (%u): ", $etp_stacktrace_end-$etp_stacktrace_p
-  if ($arg0)->cp != 0
-    etp ($arg0)->cp
-  end
-  while $etp_stacktrace_p < $etp_stacktrace_end
-    if ($etp_stacktrace_p[0] & 0x3) == 0x0
+  etp-stack-preamble ($arg0)
+  while $etp_stack_p < $etp_stack_end
+    if ($etp_stack_p[0] & 0x3) == 0x0
       # Continuation pointer
-      etp $etp_stacktrace_p[0]
+      etp $etp_stack_p[0]
     end
-    set $etp_stacktrace_p++
+    set $etp_stack_p++
   end
 end
 
@@ -1338,15 +1343,10 @@ define etp-stackdump
 #
 # Non-reentrant
 #
-  set $etp_stackdump_p = ($arg0)->stop
-  set $etp_stackdump_end = ($arg0)->hend
-  printf "%% Stackdump (%u): ", $etp_stackdump_end-$etp_stackdump_p
-  if ($arg0)->cp != 0
-    etp ($arg0)->cp
-  end
-  while $etp_stackdump_p < $etp_stackdump_end
-    etp $etp_stackdump_p[0]
-    set $etp_stackdump_p++
+  etp-stack-preamble ($arg0)
+  while $etp_stack_p < $etp_stack_end
+    etp $etp_stack_p[0]
+    set $etp_stack_p++
   end
 end
 
@@ -1828,26 +1828,35 @@ define etp-process-info
       printf "\n"
     end
   end
+  printf "  Current function: "
   if ($etp_proc->current)
-    printf "  Current function: "
-    etp-1 $etp_proc->current[0]
+    etp-1 $etp_proc->current->module
     printf ":"
-    etp-1 $etp_proc->current[1]
-    printf "/%d\n", $etp_proc->current[2]
+    etp-1 $etp_proc->current->function
+    printf "/%d\n", $etp_proc->current->arity
+  else
+    printf "unknown\n"
   end
+  printf "  CP: "
   if ($etp_proc->cp)
-    printf "  CP: "
     etp-cp-1 $etp_proc->cp
     printf "\n"
+  else
+    printf "unknown\n"
   end
+  printf "  I: "
   if ($etp_proc->i)
-    printf "  I: "
     etp-cp-1 $etp_proc->i
     printf "\n"
+  else
+    printf "unknown\n"
   end
   printf "  Heap size: %ld\n", $etp_proc->heap_sz
+  printf "  Old-heap size: "
   if ($etp_proc->old_heap)
-    printf "  Old-heap size: %ld\n", $etp_proc->old_hend - $etp_proc->old_heap
+    printf "%ld\n", $etp_proc->old_hend - $etp_proc->old_heap
+  else
+    printf "0\n"
   end
   printf "  Mbuf size: %ld\n", $etp_proc->mbuf_sz
   if (etp_smp_compiled)
-- 
cgit v1.2.3


From b277e1ef5e29300b216da297004a8e327bb53b8f Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 18 Oct 2016 10:11:38 +0200
Subject: erts: Add etp-disasm gdb macro

---
 erts/etc/unix/etp-commands.in | 72 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 65 insertions(+), 7 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index e2bf302cca..1a4f641301 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -52,7 +52,7 @@ document etp-help
 %   etpf-cons, etpf-boxed, 
 % 
 % Special commands for not really terms:
-%   etp-mfa, etp-cp, 
+%   etp-mfa, etp-cp, etp-disasm,
 %   etp-msgq, etpf-msgq, 
 %   etp-stacktrace, etp-stackdump, etpf-stackdump, etp-dictdump
 %   etp-process-info, etp-process-memory-info
@@ -1090,12 +1090,10 @@ document etp-mfa
 %---------------------------------------------------------------------------
 end
 
-
-
-define etp-cp-1
+define etp-cp-func-info-1
 # Args: Eterm cp
 #
-# Non-reentrant
+# Non-reentrant, takes cp, sets $etp_cp_p to MFA in func_info
 #
   set $etp_cp = (Eterm)($arg0)
   set $etp_ranges = &r[(int)the_active_code_index]
@@ -1136,9 +1134,22 @@ define etp-cp-1
       end
     end
   end
+  if $etp_cp_p
+    set $cp_cp_p_offset = ($etp_cp-((Eterm)($etp_cp_p-2)))
+  else
+    set $cp_cp_p_offset = 0
+  end
+end
+
+define etp-cp-1
+# Args: Eterm cp
+#
+# Non-reentrant
+#
+  etp-cp-func-info-1 $arg0
   if $etp_cp_p
     printf "#Cp"
-    etp-mfa-1 ($etp_cp_p) ($etp_cp-((Eterm)($etp_cp_p-2)))
+    etp-mfa-1 $etp_cp_p $cp_cp_p_offset
   else
     if $etp_cp == beam_apply+1
       printf "#Cp<terminate process normally>"
@@ -2478,11 +2489,58 @@ end
 document etp-schedulers
 %---------------------------------------------------------------------------
 % etp-schedulers
-% 
+%
 % Print misc info about all schedulers
 %---------------------------------------------------------------------------
 end
 
+define etp-disasm-1
+  set $code_ptr = ((BeamInstr*)$arg0)
+  set $addr = *$code_ptr
+  set $i = 0
+  while $i < (sizeof(opc) / sizeof(OpEntry))
+    if $addr == beam_ops[$i]
+      printf "%s %d", opc[$i].name, opc[$i].sz
+      set $next_i = $code_ptr + opc[$i].sz
+      set $i += 4999
+    end
+    set $i++
+  end
+end
+
+define etp-disasm
+  etp-cp-func-info-1 $arg0
+  if $etp_cp_p == 0
+    printf "invalid argument"
+  else
+    etp-mfa-1 $etp_cp_p $cp_cp_p_offset
+    printf ": "
+    etp-disasm-1 $arg0
+    printf "\r\n"
+    while $next_i < ((BeamInstr*)$arg1)
+      set $prev_i = $next_i
+      etp-cp-func-info-1 $next_i
+      etp-mfa-1 $etp_cp_p $cp_cp_p_offset
+      printf ": "
+      etp-disasm-1 $next_i
+      if $prev_i == $next_i
+        # ptr did not advance, we are inside some strange opcode with argument
+        set $next_i++
+        printf "instr argument"
+      end
+      printf "\r\n"
+    end
+  end
+end
+
+document etp-disasm
+%---------------------------------------------------------------------------
+% etp-disasm StartI EndI
+%
+% Disassemble the code inbetween StartI and EndI
+%---------------------------------------------------------------------------
+end
+
 define etp-migration-info
   set $minfo = (ErtsMigrationPaths *) *((UWord *) &erts_migration_paths)
   set $rq_ix = 0
-- 
cgit v1.2.3


From 27e865d01ad49664897662ccc123d825505c0ff6 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 9 Nov 2016 18:41:43 +0100
Subject: erts: Fix all -Wundef errors

---
 erts/etc/unix/run_erl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index 6a92e18648..a997297f65 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -863,7 +863,7 @@ static int open_log(int log_num, int flags)
   if (write_all(lfd, buf, strlen(buf)) < 0)
       status("Error in writing to log.\n");
 
-#if USE_FSYNC
+#ifdef USE_FSYNC
   fsync(lfd);
 #endif
 
@@ -893,7 +893,7 @@ static void write_to_log(int* lfd, int* log_num, char* buf, int len)
     status("Error in writing to log.\n");
   }
 
-#if USE_FSYNC
+#ifdef USE_FSYNC
   fsync(*lfd);
 #endif
 }
-- 
cgit v1.2.3


From 5b9265ad19d6596a8b599eccc64accb67e3c664e Mon Sep 17 00:00:00 2001
From: Magnus Henoch <magnus@erlang-solutions.com>
Date: Mon, 21 Nov 2016 11:48:54 +0000
Subject: Remove vestiges of watchdog support in heart

Hardware watchdog support was removed from heart in R13A, but there were
still some vestiges in the code and the documentation.

- Remove mentions of the HW_WD_DISABLE variable, as it's no longer used.
- Remove the HEART_BEAT_BOOT_DELAY variable, as it was only used for the
  hardware watchdog.
---
 erts/etc/common/heart.c | 40 ++++++----------------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index d67b997d6d..bc353e384e 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -48,13 +48,10 @@
  *
  *  HEART_BEATING
  *
- *  This program expects a heart beat messages. If it does not receive a 
- *  heart beat message from Erlang within heart_beat_timeout seconds, it 
- *  reboots the system. The variable heart_beat_timeout is exported (so
- *  that it can be set from the shell in VxWorks, as is the variable
- *  heart_beat_report_delay). When using Solaris, the system is rebooted
- *  by executing the command stored in the environment variable
- *  HEART_COMMAND.
+ *  This program expects a heart beat message. If it does not receive a
+ *  heart beat message from Erlang within heart_beat_timeout seconds, it
+ *  reboots the system. The system is rebooted by executing the command
+ *  stored in the environment variable HEART_COMMAND.
  *
  *  BLOCKING DESCRIPTORS
  *
@@ -149,27 +146,17 @@ struct msg {
 /*  Maybe interesting to change */
 
 /* Times in seconds */
-#define  HEART_BEAT_BOOT_DELAY       60  /* 1 minute */
 #define  SELECT_TIMEOUT               5  /* Every 5 seconds we reset the
 					    watchdog timer */
 
 /* heart_beat_timeout is the maximum gap in seconds between two
-   consecutive heart beat messages from Erlang, and HEART_BEAT_BOOT_DELAY
-   is the the extra delay that wd_keeper allows for, to give heart a
-   chance to reboot in the "normal" way before the hardware watchdog
-   enters the scene. heart_beat_report_delay is the time allowed for reporting
-   before rebooting under VxWorks. */
+   consecutive heart beat messages from Erlang. */
 
 int heart_beat_timeout = 60;
-int heart_beat_report_delay = 30;
-int heart_beat_boot_delay = HEART_BEAT_BOOT_DELAY;
 /* All current platforms have a process identifier that
    fits in an unsigned long and where 0 is an impossible or invalid value */
 unsigned long heart_beat_kill_pid = 0;
 
-#define VW_WD_TIMEOUT (heart_beat_timeout+heart_beat_report_delay+heart_beat_boot_delay)
-#define SOL_WD_TIMEOUT (heart_beat_timeout+heart_beat_boot_delay)
-
 /* reasons for reboot */
 #define  R_TIMEOUT          (1)
 #define  R_CLOSED           (2)
@@ -297,7 +284,6 @@ free_env_val(char *value)
 static void get_arguments(int argc, char** argv) {
     int i = 1;
     int h;
-    int w;
     unsigned long p;
 
     while (i < argc) {
@@ -313,15 +299,6 @@ static void get_arguments(int argc, char** argv) {
 			    i++;
 			}
 		break;
-	    case 'w':
-		if (strcmp(argv[i], "-wt") == 0)
-		    if (sscanf(argv[i+1],"%i",&w) ==1)
-			if ((w > 10) && (w <= 65535)) {
-			    heart_beat_boot_delay = w;
-			    fprintf(stderr,"heart_beat_boot_delay = %d\n",w);
-			    i++;
-			}
-		break;
 	    case 'p':
 		if (strcmp(argv[i], "-pid") == 0)
 		    if (sscanf(argv[i+1],"%lu",&p) ==1){
@@ -347,7 +324,7 @@ static void get_arguments(int argc, char** argv) {
 	}
 	i++;
     }
-    debugf("arguments -ht %d -wt %d -pid %lu\n",h,w,p);
+    debugf("arguments -ht %d -pid %lu\n",h,p);
 }
 
 int main(int argc, char **argv) {
@@ -674,11 +651,6 @@ void win_system(char *command)
  */
 static void 
 do_terminate(int erlin_fd, int reason) {
-  /*
-    When we get here, we have HEART_BEAT_BOOT_DELAY secs to finish
-    (plus heart_beat_report_delay if under VxWorks), so we don't need
-    to call wd_reset().
-    */
   int ret = 0, tmo=0;
   char *tmo_env;
 
-- 
cgit v1.2.3


From 00e6b41fd5a83bd3823a62f06e650159b1c73e1c Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 22 Nov 2016 15:32:28 +0100
Subject: Update etp-commands for dirty schedulers

---
 erts/etc/unix/etp-commands.in | 123 +++++++++++++++++++++++++++++-------------
 1 file changed, 87 insertions(+), 36 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index e2bf302cca..04c42e624c 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -2432,46 +2432,36 @@ define etp-schedulers
   if (!erts_initialized)
     printf "No schedulers, since system isn't initialized!\n"
   else
+    set $sched_type = 0
     set $sched_ix = 0
     while $sched_ix < erts_no_schedulers
-      printf "--- Scheduler %d ---\n", $sched_ix+1
-      printf " IX: %d\n", $sched_ix
-      if (erts_aligned_scheduler_data[$sched_ix].esd.cpu_id < 0)
-        printf " CPU Binding: unbound\n"
-      else
-        printf " CPU Binding: %d\n", erts_aligned_scheduler_data[$sched_ix].esd.cpu_id
-      end
-      printf " Aux work Flags:"
-      set $aux_work_flags = *((Uint32 *) &erts_aligned_scheduler_data[$sched_ix].esd.ssi->aux_work)
-      etp-aux-work-flags $aux_work_flags
-      printf " Sleep Info Flags:"
-      set $ssi_flags = *((Uint32 *) &erts_aligned_scheduler_data[$sched_ix].esd.ssi->flags)
-      etp-ssi-flags $ssi_flags
-      printf " Pointer: (ErtsSchedulerData *) %p\n", &erts_aligned_scheduler_data[$sched_ix].esd
-      printf " - Run Queue -\n"
-      if (etp_smp_compiled)
-        set $runq = erts_aligned_scheduler_data[$sched_ix].esd.run_queue
-      else
-        set $runq = &erts_aligned_run_queues[0].runq
-      end
-      printf "  Length: total=%d", *((Uint32 *) &($runq->len))
-      printf ", max=%d", *((Uint32 *) &($runq->procs.prio_info[0].len))
-      printf ", high=%d", *((Uint32 *) &($runq->procs.prio_info[1].len))
-      printf ", normal=%d", *((Uint32 *) &($runq->procs.prio_info[2].len))
-      printf ", low=%d", *((Uint32 *) &($runq->procs.prio_info[3].len))
-      printf ", port=%d\n", *((Uint32 *) &($runq->ports.info.len))
-      if ($runq->misc.start)
-        printf "  Misc Jobs: yes\n"
-      else
-        printf "  Misc Jobs: no\n"
-      end
-      set $rq_flags = *((Uint32 *) &($runq->flags))
-      etp-rq-flags-int $rq_flags
-      printf "  Pointer: (ErtsRunQueue *) %p\n", $runq
-
+      etp-scheduler-info-internal
+      etp-run-queue-info-internal
       set $sched_ix++
     end
-    printf "-------------------\n",
+    printf "---------------------\n"
+    if (erts_no_dirty_cpu_schedulers)
+       printf "\n\n"
+       set $sched_type = 1
+       set $sched_ix = 0
+       while $sched_ix < erts_no_dirty_cpu_schedulers
+         etp-scheduler-info-internal
+         set $sched_ix++
+       end
+       etp-run-queue-info-internal
+       printf "---------------------\n"
+    end
+    if (erts_no_dirty_io_schedulers)
+       printf "\n\n"
+       set $sched_type = 2
+       set $sched_ix = 0
+       while $sched_ix < erts_no_dirty_io_schedulers
+         etp-scheduler-info-internal
+         set $sched_ix++
+       end
+       etp-run-queue-info-internal
+       printf "---------------------\n"
+    end
   end
 end
 
@@ -2483,6 +2473,67 @@ document etp-schedulers
 %---------------------------------------------------------------------------
 end
 
+define etp-scheduler-info-internal
+  if ($sched_type == 0)
+    printf "--- Scheduler %d ---\n", $sched_ix+1
+    set $sched_data=&erts_aligned_scheduler_data[$sched_ix].esd
+  else
+    if ($sched_type == 1)
+      printf "--- Dirty CPU Scheduler %d ---\n", $sched_ix+1
+      set $sched_data=&erts_aligned_dirty_cpu_scheduler_data[$sched_ix].esd
+    else
+      printf "--- Dirty I/O Scheduler %d ---\n", $sched_ix+1
+      set $sched_data=&erts_aligned_dirty_io_scheduler_data[$sched_ix].esd
+    end
+  end
+  printf " IX: %d\n", $sched_ix
+  if ($sched_data->cpu_id < 0)
+    printf " CPU Binding: unbound\n"
+  else
+    printf " CPU Binding: %d\n", $sched_data->cpu_id
+  end
+  printf " Aux work Flags:"
+  set $aux_work_flags = *((Uint32 *) &$sched_data->ssi->aux_work)
+  etp-aux-work-flags $aux_work_flags
+  printf " Sleep Info Flags:"
+  set $ssi_flags = *((Uint32 *) &$sched_data->ssi->flags)
+  etp-ssi-flags $ssi_flags
+  printf " Pointer: (ErtsSchedulerData *) %p\n", $sched_data
+end
+
+define etp-run-queue-info-internal
+  if ($sched_type == 0)
+    printf " - Run Queue -\n"
+    if (etp_smp_compiled)
+      set $runq = erts_aligned_scheduler_data[$sched_ix].esd.run_queue
+    else
+      set $runq = &erts_aligned_run_queues[0].runq
+    end
+  else
+    if ($sched_type == 1)
+      printf "\n--- Dirty CPU Run Queue ---\n"
+      set $runq = &erts_aligned_run_queues[-1].runq
+    else
+      printf "\n--- Dirty I/O Run Queue ---\n"
+      set $runq = &erts_aligned_run_queues[-2].runq
+    end
+  end
+  printf "  Length: total=%d", *((Uint32 *) &($runq->len))
+  printf ", max=%d", *((Uint32 *) &($runq->procs.prio_info[0].len))
+  printf ", high=%d", *((Uint32 *) &($runq->procs.prio_info[1].len))
+  printf ", normal=%d", *((Uint32 *) &($runq->procs.prio_info[2].len))
+  printf ", low=%d", *((Uint32 *) &($runq->procs.prio_info[3].len))
+  printf ", port=%d\n", *((Uint32 *) &($runq->ports.info.len))
+  if ($runq->misc.start)
+    printf "  Misc Jobs: yes\n"
+  else
+    printf "  Misc Jobs: no\n"
+  end
+  set $rq_flags = *((Uint32 *) &($runq->flags))
+  etp-rq-flags-int $rq_flags
+  printf "  Pointer: (ErtsRunQueue *) %p\n", $runq
+end
+
 define etp-migration-info
   set $minfo = (ErtsMigrationPaths *) *((UWord *) &erts_migration_paths)
   set $rq_ix = 0
-- 
cgit v1.2.3


From 3eddb0f762de248d3230b38bc9d478bfbc8e7331 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 7 Dec 2016 13:15:31 +0100
Subject: Update copyright-year

---
 erts/etc/unix/run_erl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index 6a92e18648..debd643da7 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2015. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
-- 
cgit v1.2.3


From 0612bcedf520388d58a9441e9e6490bf86bf5a4b Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 28 Nov 2016 18:13:38 +0100
Subject: Fix stactrace for apply on error/[1,2], exit/1, or throw/1

---
 erts/etc/unix/etp-commands.in | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index fa68bd26ee..f2babc48d2 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -1322,7 +1322,11 @@ define etp-stacktrace
   set $etp_stacktrace_p = ($arg0)->stop
   set $etp_stacktrace_end = ($arg0)->hend
   printf "%% Stacktrace (%u): ", $etp_stacktrace_end-$etp_stacktrace_p
-  etp ($arg0)->cp
+  if ($arg0)->cp == 0x0
+    printf "NULL\n"
+  else
+    etp ($arg0)->cp
+  end
   while $etp_stacktrace_p < $etp_stacktrace_end
     if ($etp_stacktrace_p[0] & 0x3) == 0x0
       # Continuation pointer
@@ -1350,7 +1354,11 @@ define etp-stackdump
   set $etp_stackdump_p = ($arg0)->stop
   set $etp_stackdump_end = ($arg0)->hend
   printf "%% Stackdump (%u): ", $etp_stackdump_end-$etp_stackdump_p
-  etp ($arg0)->cp
+  if ($arg0)->cp == 0x0
+    printf "NULL\n"
+  else
+    etp ($arg0)->cp
+  end
   while $etp_stackdump_p < $etp_stackdump_end
     etp $etp_stackdump_p[0]
     set $etp_stackdump_p++
-- 
cgit v1.2.3


From 1d8dbc7123245a536df6bb09e891d3a075fb70ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kan=20Mattsson?= <hm@tail-f.com>
Date: Thu, 22 Dec 2016 09:57:21 +0100
Subject: escript: Handle symbolic link to a standalone escript
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The code has been rearranged to make use of the actual path
"get_default_emulator(scriptname)" to the escript instead of
the given one "get_default_emulator(argv[0])".

TL;DR

Assume a source system with some Erlang applications (app1, app2 etc.)
and an escript called "mytool". When generating a standalone target
system (with reltool for example), the escript(s) are located in the
same top bin directory as "erl". See mytool* below.

In such a system the original "mytool" escript is given the extension
".escript" and the file with the same name as the original escript is
a copy of the "escript" executable. One purpose of the escript
executable is to determine which "erl" to use to start the system.

In a standalone system we want it to find the runtime system bundled
with the escript(s). This is done by analyzing the path in order to
find the "erl" located in the same directory as the escript.

A dilemma here is that we do not want to put the top bin directory
in the execution path (PATH env var) as we then would cause other
Erlang applications to make use of our bundled run-time system.

One way of solving this is to choose some suitable bin directory in
the execution path (such as /user/local/bin) and put a symbolic link
there to our mytool executable.

Unfortunately this did not work as the escript executable (in this
case called mytool) would try to find "erl" in /usr/local/bin and when
it did not find such a file it resorted to use the command "erl" which
would find some (unwanted) "erl" in the execution path.

My fix solves that problem.

├── bin/
│   ├── erl* (dyn_erl.c)
│   ├── mytool* (escript.c)
│   ├── mytool.escript* (original mytool escript)
│   └── start_clean.boot
├── erts-vsn/
│   └── bin/
│       ├── beam*
│       ├── beam.smp*
│       ├── erl*
│       ├── erl_child_setup*
│       ├── erlexec*
│       └── inet_gethost*
└── lib/
    ├── app1-vsn
    ├── app2-vsn
    └── ...
---
 erts/etc/common/escript.c | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 71c278881c..4134a3ff36 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -428,14 +428,6 @@ main(int argc, char** argv)
     argv[argc] = NULL;
 #endif
 
-    emulator = env = get_env("ESCRIPT_EMULATOR");
-    if (emulator == NULL) {
-	emulator = get_default_emulator(argv[0]);
-    }
-
-    if (strlen(emulator) >= PMAX)
-        error("Value of environment variable ESCRIPT_EMULATOR is too large");
-
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
      * Arrange for starting to pushing information in the middle of
@@ -446,21 +438,10 @@ main(int argc, char** argv)
     eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
     eargv = eargv_base;
     eargc = 0;
-    push_words(emulator);
     eargc_base = eargc;
     eargv = eargv + eargv_size/2;
     eargc = 0;
 
-    free_env_val(env);
-
-    /*
-     * Push initial arguments.
-     */
-
-    PUSH("+B");
-    PUSH2("-boot", "start_clean");
-    PUSH("-noshell");
-
     /* Determine basename of the executable */
     for (basename = argv[0]+strlen(argv[0]);
 	 basename > argv[0] && !(IS_DIRSEP(basename[-1]));
@@ -510,6 +491,27 @@ main(int argc, char** argv)
 	efree(absname);
     }
 
+    /* Determine path to emulator */
+    emulator = env = get_env("ESCRIPT_EMULATOR");
+
+    if (emulator == NULL) {
+	emulator = get_default_emulator(scriptname);
+    }
+
+    if (strlen(emulator) >= PMAX)
+        error("Value of environment variable ESCRIPT_EMULATOR is too large");
+
+    /*
+     * Push initial arguments.
+     */
+
+    push_words(emulator);
+    free_env_val(env);
+
+    PUSH("+B");
+    PUSH2("-boot", "start_clean");
+    PUSH("-noshell");
+
     /*
      * Read options from the %%! row in the script and add them as args
      */
-- 
cgit v1.2.3


From 43eebdd25a0d4a17f076f017cb3ea7da5cfd1808 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Thu, 22 Dec 2016 17:48:51 +0100
Subject: Switch between scheduler types when multi-scheduling is blocked

---
 erts/etc/unix/etp-commands.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 0990fcf8a7..f00f3d83aa 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -2389,6 +2389,9 @@ define etp-ssi-flags
   if ($arg0 & 0x10)
     printf " suspended"
   end
+  if ($arg0 & 0x20)
+    printf " msb_exec"
+  end
   printf "\n"
 end
 
-- 
cgit v1.2.3


From bc2dd09390cb6876470093f1754db22ceb53d370 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Wed, 28 Dec 2016 18:28:34 +0100
Subject: Improve etp-commands

---
 erts/etc/unix/etp-commands.in | 276 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 273 insertions(+), 3 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index f00f3d83aa..c7e2ac169d 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -1817,6 +1817,262 @@ document etp-proc-state
 % Print state of process
 %---------------------------------------------------------------------------
 end
+define etp-proc-state-int
+# Args: int
+#
+  if ($arg0 & 0x80000000)
+    printf "GARBAGE<0x80000000> | "
+  end
+  if ($arg0 & 0x40000000)
+    printf "dirty-running-sys | "
+  end
+  if ($arg0 & 0x20000000)
+    printf "dirty-running | "
+  end
+  if ($arg0 & 0x10000000)
+    printf "dirty-active-sys | "
+  end
+  if ($arg0 & 0x8000000)
+    printf "dirty-io-proc | "
+  end
+  if ($arg0 & 0x4000000)
+    printf "dirty-cpu-proc | "
+  end
+  if ($arg0 & 0x2000000)
+    printf "on-heap-msgq | "
+  end
+  if ($arg0 & 0x1000000)
+    printf "off-heap-msgq | "
+  end
+  if ($arg0 & 0x800000)
+    printf "delayed-sys | "
+  end
+  if ($arg0 & 0x400000)
+    printf "proxy | "
+    set $proxy_process = 1
+  else
+    set $proxy_process = 0
+  end
+  if ($arg0 & 0x200000)
+    printf "running-sys | "
+  end
+  if ($arg0 & 0x100000)
+    printf "active-sys | "
+  end
+  if ($arg0 & 0x80000)
+    printf "trapping-exit | "
+  end
+  if ($arg0 & 0x40000)
+    printf "bound | "
+  end
+  if ($arg0 & 0x20000)
+    printf "garbage-collecting | "
+  end
+  if ($arg0 & 0x10000)
+    printf "suspended | "
+  end
+  if ($arg0 & 0x8000)
+    printf "running | "
+  end
+  if ($arg0 & 0x4000)
+    printf "in-run-queue | "
+  end
+  if ($arg0 & 0x2000)
+    printf "active | "
+  end
+  if ($arg0 & 0x1000)
+    printf "pending-exit | "
+  end
+  if ($arg0 & 0x800)
+    printf "exiting | "
+  end
+  if ($arg0 & 0x400)
+    printf "free | "
+  end
+  if ($arg0 & 0x200)
+    printf "in-prq-low | "
+  end
+  if ($arg0 & 0x100)
+    printf "in-prq-normal | "
+  end
+  if ($arg0 & 0x80)
+    printf "in-prq-high | "
+  end
+  if ($arg0 & 0x40)
+    printf "in-prq-max | "
+  end
+  if ($arg0 & 0x30) == 0x0
+    printf "prq-prio-max | "
+  else
+    if ($arg0 & 0x30) == 0x10
+      printf "prq-prio-high | "
+    else
+      if ($arg0 & 0x30) == 0x20
+        printf "prq-prio-normal | "
+      else
+        printf "prq-prio-low | "
+      end
+    end
+  end
+  if ($arg0 & 0xc) == 0x0
+    printf "usr-prio-max | "
+  else
+    if ($arg0 & 0xc) == 0x4
+      printf "usr-prio-high | "
+    else
+      if ($arg0 & 0xc) == 0x8
+        printf "usr-prio-normal | "
+      else
+        printf "usr-prio-low | "
+      end
+    end
+  end
+  if ($arg0 & 0x3) == 0x0
+    printf "act-prio-max\n"
+  else
+    if ($arg0 & 0x3) == 0x1
+      printf "act-prio-high\n"
+    else
+      if ($arg0 & 0x3) == 0x2
+        printf "act-prio-normal\n"
+      else
+        printf "act-prio-low\n"
+      end
+    end
+  end
+end
+
+document etp-proc-state-int
+%---------------------------------------------------------------------------
+% etp-proc-state-int int
+% 
+% Print state of process state value
+%---------------------------------------------------------------------------
+end
+
+
+define etp-proc-state
+# Args: Process*
+#
+  set $state_int = *(((Uint32 *) &(((Process *) $arg0)->state)))
+  etp-proc-state-int $state_int
+end
+
+document etp-proc-state
+%---------------------------------------------------------------------------
+% etp-proc-state Process*
+% 
+% Print state of process
+%---------------------------------------------------------------------------
+end
+
+define etp-proc-flags-int
+# Args: int
+#
+  if ($arg0 & ~0x1ffffff)
+    printf "GARBAGE<%x> ", ($arg0 & ~0x1ffffff)
+  end
+  if ($arg0 & 0x1000000)
+    printf "dirty-minor-gc "
+  end
+  if ($arg0 & 0x800000)
+    printf "dirty-major-gc "
+  end
+  if ($arg0 & 0x400000)
+    printf "dirty-gc-hibernate "
+  end
+  if ($arg0 & 0x200000)
+    printf "dirty-cla "
+  end
+  if ($arg0 & 0x100000)
+    printf "delayed-del-proc "
+  end
+  if ($arg0 & 0x80000)
+    printf "hipe-mode "
+  end
+  if ($arg0 & 0x40000)
+    printf "have-blocked-nmsb "
+  end
+  if ($arg0 & 0x20000)
+    printf "shdlr-onln-wait-q "
+  end
+  if ($arg0 & 0x10000)
+    printf "delay-gc "
+  end
+  if ($arg0 & 0x8000)
+    printf "abandoned-heap-use "
+  end
+  if ($arg0 & 0x4000)
+    printf "off-heap-msgq-chng "
+  end
+  if ($arg0 & 0x2000)
+    printf "on-heap-msgq "
+  end
+  if ($arg0 & 0x1000)
+    printf "off-heap-msgq "
+  end
+  if ($arg0 & 0x800)
+    printf "disable-gc "
+  end
+  if ($arg0 & 0x400)
+    printf "force-gc "
+  end
+  if ($arg0 & 0x200)
+    printf "p2pnr-resched "
+  end
+  if ($arg0 & 0x100)
+    printf "have-blocked-msb "
+  end
+  if ($arg0 & 0x80)
+    printf "using-ddll "
+  end
+  if ($arg0 & 0x40)
+    printf "distribution "
+  end
+  if ($arg0 & 0x20)
+    printf "using-db "
+  end
+  if ($arg0 & 0x10)
+    printf "need-fullsweep "
+  end
+  if ($arg0 & 0x8)
+    printf "heap-grow "
+  end
+  if ($arg0 & 0x4)
+    printf "timo "
+  end
+  if ($arg0 & 0x2)
+    printf "inslpqueue "
+  end
+  if ($arg0 & 0x1)
+    printf "hibernate-sched "
+  end
+  printf "\n"
+end
+
+document etp-proc-flags-int
+%---------------------------------------------------------------------------
+% etp-proc-flags-int int
+% 
+% Print flags of process flags value
+%---------------------------------------------------------------------------
+end
+
+
+define etp-proc-flags
+# Args: Process*
+#
+  set $flags_int = ((Process *) $arg0)->flags
+  etp-proc-flags-int $flags_int
+end
+
+document etp-proc-flags
+%---------------------------------------------------------------------------
+% etp-proc-flags Process*
+% 
+% Print flags of process
+%---------------------------------------------------------------------------
+end
 
 define etp-process-info
 # Args: Process*
@@ -1826,6 +2082,8 @@ define etp-process-info
   etp-1 $etp_proc->common.id
   printf "\n  State: "
   etp-proc-state $etp_proc
+  printf "\n  Flags: "
+  etp-proc-flags $etp_proc
   if $proxy_process != 0
     printf "  Pointer: (Process *) %p\n", $etp_proc
     printf "  *** PROXY process struct *** refer to: \n"
@@ -2356,8 +2614,20 @@ define etp-rq-flags-int
     if ($arg0 & 0x4000000)
       printf " protected"
     end
-    if ($arg0 & ~0x7ffffff)
-      printf " GARBAGE(0x%x)", ($arg0 & ~0x3ffffff)
+    if ($arg0 & 0x8000000)
+      printf " exec"
+    end
+    if ($arg0 & 0x10000000)
+      printf " msb_exec"
+    end
+    if ($arg0 & 0x20000000)
+      printf " misc_op"
+    end
+    if ($arg0 & 0x40000000)
+      printf " halting"
+    end
+    if ($arg0 & ~0x7fffffff)
+      printf " GARBAGE(0x%x)", ($arg0 & ~0x7fffffff)
     end
     printf "\n"
   end
@@ -2559,7 +2829,7 @@ define etp-run-queue-info-internal
   set $rq_flags = *((Uint32 *) &($runq->flags))
   etp-rq-flags-int $rq_flags
   printf "  Pointer: (ErtsRunQueue *) %p\n", $runq
-
+end
 
 define etp-disasm-1
   set $code_ptr = ((BeamInstr*)$arg0)
-- 
cgit v1.2.3


From b079018e38272604ffacfece9b97924a9e39df5c Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 23 Jan 2017 17:10:18 +0100
Subject: Implement magic references

Magic references are *intentionally* indistinguishable from ordinary
references for the Erlang software. Magic references do not change
the language, and are intended as a pure runtime internal optimization.

An ordinary reference is typically used as a key in some table. A
magic reference has a direct pointer to a reference counted magic
binary. This makes it possible to implement various things without
having to do lookups in a table, but instead access the data directly.
Besides very fast lookups this can also improve scalability by
removing a potentially contended table. A couple of examples of
planned future usage of magic references are ETS table identifiers,
and BIF timer identifiers.

Besides future optimizations using magic references it should also
be possible to replace the exposed magic binary cludge with magic
references. That is, magic binaries that are exposed as empty
binaries to the Erlang software.
---
 erts/etc/unix/etp-commands.in | 53 +++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index c7e2ac169d..2bf04a6518 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -775,7 +775,7 @@ define etp-pid-1
   set $etp_pid_1 = (Eterm)($arg0)
   if ($etp_pid_1 & 0xF) == 0x3
     if (etp_arch_bits == 64)
-      if (etp_big_endian)
+      if (etp_endianness > 0)
       	set $etp_pid_data = (unsigned) ((((Uint64) $etp_pid_1) >> 35) & 0x0fffffff)
       else
         set $etp_pid_data = (unsigned) ((((Uint64) $etp_pid_1) >> 4) & 0x0fffffff)
@@ -835,7 +835,7 @@ define etp-port-1
   set $etp_port_1 = (Eterm)($arg0)
   if ($etp_port_1 & 0xF) == 0x7
     if (etp_arch_bits == 64)
-      if (etp_big_endian)
+      if (etp_endianness > 0)
       	set $etp_port_data = (unsigned) ((((Uint64) $etp_port_1) >> 36) & 0x0fffffff)
       else
         set $etp_port_data = (unsigned) ((((Uint64) $etp_port_1) >> 4) & 0x0fffffff)
@@ -952,30 +952,31 @@ define etp-ref-1
   if ((Eterm)($arg0) & 0x3) != 0x2
     printf "#NotBoxed<%#x>", (Eterm)($arg0)
   else
-    set $etp_ref_1_p = (RefThing *)((Eterm)($arg0) & ~0x3)
+    set $etp_ref_1_p = (ErtsORefThing *)((Eterm)($arg0) & ~0x3)
     if ($etp_ref_1_p->header & 0x3b) != 0x10
       printf "#NotRef<%#x>", $etp_ref_1_p->header
     else
-      set $etp_ref_1_nump = (Uint32 *) 0
-      set $etp_ref_1_error = 0
-      if ($etp_ref_1_p->header >> 6) == 0
-        set $etp_ref_1_error = 1
+      if $etp_ref_1_p->header != etp_ref_header && $etp_ref_1_p->header != etp_magic_ref_header
+        printf "#InternalRefError<%#x>", ($arg0)
       else
-        if $etp_arch64
-          set $etp_ref_1_i = (int) $etp_ref_1_p->data.ui32[0]
-          if (($etp_ref_1_i + 1) > (2 * ($etp_ref_1_p->header >> 6)))
-            set $etp_ref_1_error = 1
-          else
-            set $etp_ref_1_nump = &$etp_ref_1_p->data.ui32[1]
+	set $etp_magic_ref = 0
+	set $etp_ref_1_i = 3
+	set $etp_ref_1_error = 0
+	set $etp_ref_1_nump = (Uint32 *) 0
+	if etp_ref_header == etp_magic_ref_header
+          if $etp_ref_1_p->marker != 0xffffffff
+      	     set $etp_magic_ref = 1
           end
+	else
+	  if $etp_ref_1_p->header == etp_magic_ref_header
+      	     set $etp_magic_ref = 1
+          end
+	end
+        if $etp_magic_ref == 0
+          set $etp_ref_1_nump = $etp_ref_1_p->num
         else
-          set $etp_ref_1_i = (int) ($etp_ref_1_p->header >> 6)
-          set $etp_ref_1_nump = &$etp_ref_1_p->data.ui32[0]
+          set $etp_ref_1_nump = ((ErtsMRefThing *) $etp_ref_1_p)->mb->refn
         end
-      end
-      if $etp_ref_1_error
-        printf "#InternalRefError<%#x>", ($arg0)
-      else
         printf "#Ref<0"
         set $etp_ref_1_i--
         while $etp_ref_1_i >= 0
@@ -1593,7 +1594,7 @@ define etp-term-dump-pid
   set $etp_pid_1 = (Eterm)($arg0)
   if ($etp_pid_1 & 0xF) == 0x3
     if (etp_arch_bits == 64)
-      if (etp_big_endian)
+      if (etp_endianness > 0)
         set $etp_pid_data = (unsigned) ((((Uint64) $etp_pid_1) >> 36) & 0x0fffffff)
       else
         set $etp_pid_data = (unsigned) ((((Uint64) $etp_pid_1) >> 4) & 0x0fffffff)
@@ -1638,7 +1639,7 @@ define etp-pid2pix-1
 # Args: Eterm
 #
    if (etp_arch_bits == 64)
-      if (etp_big_endian)
+      if (etp_endianness > 0)
       	 set $etp_pix = (int) (((Uint64) $arg0) & 0x0fffffff)
       else
       	 set $etp_pix = (int) ((((Uint64) $arg0) >> 32) & 0x0fffffff)
@@ -2271,7 +2272,7 @@ define etp-port-id2pix-1
 # Args: Eterm
 #
    if (etp_arch_bits == 64)
-      if (etp_big_endian)
+      if (etp_endianness > 0)
       	 set $etp_pix = (int) (((Uint64) $arg0) & 0x0fffffff)
       elser
       	 set $etp_pix = (int) ((((Uint64) $arg0) >> 32) & 0x0fffffff)
@@ -2906,10 +2907,14 @@ define etp-system-info
   printf "Compile date: %s\n", etp_compile_date
   printf "Arch: %s\n", etp_arch
   printf "Endianness: "
-  if (etp_big_endian)
+  if (etp_endianness > 0)
     printf "Big\n"
   else
-    printf "Little\n"
+    if (etp_endianness < 0)
+      printf "Little\n"
+    else
+      printf "Unknown\n"
+    end
   end
   printf "Word size: %d-bit\n", etp_arch_bits
   printf "HiPE support: "
-- 
cgit v1.2.3


From 7c06ca6231b812965305522284dd9f2653ced98d Mon Sep 17 00:00:00 2001
From: Andrew Dryga <andrew@dryga.com>
Date: Tue, 14 Feb 2017 11:30:41 +0200
Subject: Fixed typos in erts

---
 erts/etc/common/inet_gethost.c | 2 +-
 erts/etc/unix/README           | 2 +-
 erts/etc/unix/etp-commands.in  | 2 +-
 erts/etc/unix/run_erl.c        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c
index bc4893b0eb..ccafd95e51 100644
--- a/erts/etc/common/inet_gethost.c
+++ b/erts/etc/common/inet_gethost.c
@@ -2717,7 +2717,7 @@ BOOL close_mesq(MesQ *q)
 	LeaveCriticalSection(&(q->crit));
 	return FALSE;
     }
-    /* Noone else is supposed to use this object any more */
+    /* No one else is supposed to use this object any more */
     LeaveCriticalSection(&(q->crit));
     DeleteCriticalSection(&(q->crit));
     CloseHandle(q->data_present);
diff --git a/erts/etc/unix/README b/erts/etc/unix/README
index adc6db4300..9985f2675d 100644
--- a/erts/etc/unix/README
+++ b/erts/etc/unix/README
@@ -42,7 +42,7 @@ Note that the Install script will terminate if it detects problems -
 you will have to correct them and re-run the script. If everything
 goes well, the last printout should be:
 
-Erlang installation sucessfully completed
+Erlang installation successfully completed
 
 If it isn't, something went wrong - check the printouts to find out
 what it was.
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 2bf04a6518..c689d495e6 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -2875,7 +2875,7 @@ document etp-disasm
 %---------------------------------------------------------------------------
 % etp-disasm StartI EndI
 %
-% Disassemble the code inbetween StartI and EndI
+% Disassemble the code between StartI and EndI
 %---------------------------------------------------------------------------
 end
 
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index 447720af7e..8f87c59131 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -553,7 +553,7 @@ static void pass_on(pid_t childpid)
 		FD_ZERO(&readfds);
 		FD_ZERO(&writefds);
 	    } else {
-		/* Some error occured */
+		/* Some error occurred */
 		ERRNO_ERR0(LOG_ERR,"Error in select.");
 		exit(1);
 	    }
-- 
cgit v1.2.3


From 455132374162a06df39e1bff4780610ef8e86870 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 6 Mar 2017 16:58:54 +0100
Subject: erts: Only show debug consoles if ERL_CONSOLE_MODE is defined

---
 erts/etc/common/erlexec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 2b2e0e480a..ee59759940 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -1044,7 +1044,7 @@ int main(int argc, char **argv)
 	start_epmd(epmd_prog);
 
 #if (! defined(__WIN32__)) && defined(DEBUG)
-    if (start_detached) {
+    if (start_detached && get_env("ERL_CONSOLE_MODE")) {
 	/* Start the emulator within an xterm.
 	 * Move up all arguments and insert
 	 * "xterm -e " first.
-- 
cgit v1.2.3


From 6a4d4b43914a5898671e7f9dea7988771450af0f Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Thu, 2 Mar 2017 17:36:48 +0100
Subject: Remove typer application

The application now has an own repo, https://github.com/erlang/typer
---
 erts/etc/common/Makefile.in |  11 +-
 erts/etc/common/typer.c     | 455 --------------------------------------------
 erts/etc/unix/Install.src   |   1 -
 erts/etc/win32/Install.c    |   2 +-
 4 files changed, 3 insertions(+), 466 deletions(-)
 delete mode 100644 erts/etc/common/typer.c

(limited to 'erts/etc')

diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index cb053a1b7c..d3af634729 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -143,7 +143,7 @@ MC_OUTPUTS=$(OBJDIR)/erlsrv_logmess.h $(OBJDIR)/erlsrv_logmess.res
 MT_FLAG="-MD"
 endif
 INET_GETHOST = $(BINDIR)/inet_gethost.exe
-INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer.exe $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe $(BINDIR)/ct_run.exe
+INSTALL_EMBEDDED_PROGS += $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe $(BINDIR)/ct_run.exe
 INSTALL_SRC = $(WINETC)/start_erl.c $(WINETC)/Nmakefile.start_erl
 ERLEXECDIR=.
 INSTALL_LIBS =
@@ -176,7 +176,7 @@ ENTRY_OBJ=
 ERLSRV_OBJECTS= 
 MC_OUTPUTS=
 INET_GETHOST = $(BINDIR)/inet_gethost@EXEEXT@
-INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer@EXEEXT@ $(BINDIR)/dialyzer@EXEEXT@ \
+INSTALL_EMBEDDED_PROGS += $(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 = $(UXETC)/start.src $(UXETC)/start_erl.src
@@ -242,7 +242,6 @@ endif
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/safe_string.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/run_erl.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/to_erl.o
-	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/typer.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/ct_run.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/vxcall.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/erl.o
@@ -433,12 +432,6 @@ $(BINDIR)/dialyzer@EXEEXT@: $(OBJDIR)/dialyzer.o $(ERTS_LIB)
 $(OBJDIR)/dialyzer.o: dialyzer.c $(RC_GENERATED)
 	$(V_CC) $(CFLAGS) -o $@ -c dialyzer.c
 
-$(BINDIR)/typer@EXEEXT@: $(OBJDIR)/typer.o $(ERTS_LIB)
-	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/typer.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
-
-$(OBJDIR)/typer.o: typer.c $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -o $@ -c typer.c
-
 $(BINDIR)/escript@EXEEXT@: $(OBJDIR)/escript.o $(ERTS_LIB)
 	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/escript.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
diff --git a/erts/etc/common/typer.c b/erts/etc/common/typer.c
deleted file mode 100644
index 77a95ccded..0000000000
--- a/erts/etc/common/typer.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2006-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- */
-/*
- * Purpose: Typer front-end.
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "sys.h"
-#ifdef __WIN32__
-#include <winbase.h>
-#endif
-
-#include <ctype.h>
-
-#define NO 0
-#define YES 1
-
-#define ASIZE(a) (sizeof(a)/sizeof(a[0]))
-
-static int debug = 0;		/* Bit flags for debug printouts. */
-
-static char** eargv_base;	/* Base of vector. */
-static char** eargv;		/* First argument for erl. */
-
-static int eargc;		/* Number of arguments in eargv. */
-
-#ifdef __WIN32__
-#  define QUOTE(s) possibly_quote(s)
-#  define IS_DIRSEP(c) ((c) == '/' || (c) == '\\')
-#  define ERL_NAME "erl.exe"
-#else
-#  define QUOTE(s) s
-#  define IS_DIRSEP(c) ((c) == '/')
-#  define ERL_NAME "erl"
-#endif
-
-#define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)
-#define PUSH(s) eargv[eargc++] = QUOTE(s)
-#define PUSH2(s, t) PUSH(s); PUSH(t)
-#define PUSH3(s, t, u) PUSH2(s, t); PUSH(u)
-
-/*
- * Local functions.
- */
-
-static void error(char* format, ...);
-static void* emalloc(size_t size);
-static char* strsave(char* string);
-static void push_words(char* src);
-static int run_erlang(char* name, char** argv);
-static char* get_default_emulator(char* progname);
-#ifdef __WIN32__
-static char* possibly_quote(char* arg);
-static void* erealloc(void *p, size_t size);
-#endif
-
-/*
- * Supply a strerror() function if libc doesn't.
- */
-#ifndef HAVE_STRERROR
-
-extern int sys_nerr;
-
-#ifndef SYS_ERRLIST_DECLARED
-extern const char * const sys_errlist[];
-#endif /* !SYS_ERRLIST_DECLARED */
-
-char *strerror(int errnum)
-{
-  static char *emsg[1024];
-
-  if (errnum != 0) {
-    if (errnum > 0 && errnum < sys_nerr) 
-      sprintf((char *) &emsg[0], "(%s)", sys_errlist[errnum]);
-    else 
-      sprintf((char *) &emsg[0], "errnum = %d ", errnum);
-  }
-  else {
-    emsg[0] = '\0';
-  }
-  return (char *) &emsg[0];
-}
-#endif /* !HAVE_STRERROR */
-
-#ifdef __WIN32__
-int wmain(int argc, wchar_t **wcargv)
-{
-    char** argv;
-#else
-int
-main(int argc, char** argv)
-{
-#endif
-    int eargv_size;
-    int eargc_base;		/* How many arguments in the base of eargv. */
-    char* emulator;
-    int need_shell = 0;
-
-#ifdef __WIN32__
-    int i;
-    int len;
-    /* Convert argv to utf8 */
-    argv = emalloc((argc+1) * sizeof(char*));
-    for (i=0; i<argc; i++) {
-	len = WideCharToMultiByte(CP_UTF8, 0, wcargv[i], -1, NULL, 0, NULL, NULL);
-	argv[i] = emalloc(len*sizeof(char));
-	WideCharToMultiByte(CP_UTF8, 0, wcargv[i], -1, argv[i], len, NULL, NULL);
-    }
-    argv[argc] = NULL;
-#endif
-
-    emulator = get_default_emulator(argv[0]);
-
-    /*
-     * Allocate the argv vector to be used for arguments to Erlang.
-     * Arrange for starting to pushing information in the middle of
-     * the array, to allow easy addition of commands in the beginning.
-     */
-
-    eargv_size = argc*4+100;
-    eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
-    eargv = eargv_base;
-    eargc = 0;
-    push_words(emulator);
-    eargc_base = eargc;
-    eargv = eargv + eargv_size/2;
-    eargc = 0;
-
-    /*
-     * Push initial arguments.
-     */
-
-    if (argc > 1 && strcmp(argv[1], "-smp") == 0) {
-        PUSH("-smpauto");
-	argc--, argv++;
-    }
-
-    PUSH("+B");
-    PUSH2("-boot", "start_clean");
-    PUSH3("-run", "typer", "start");
-    PUSH("-extra");
-
-    /*
-     * Push everything except --shell.
-     */
-
-    while (argc > 1) {
-	if (strcmp(argv[1], "--shell") == 0) {
-	    need_shell = 1;
-	} else {
-	    PUSH(argv[1]);
-	}
-	argc--, argv++;
-    }
-
-    if (!need_shell) {
-	UNSHIFT("-noinput");
-    }
-
-    /*
-     * Move up the commands for invoking the emulator and adjust eargv
-     * accordingly.
-     */
-
-    while (--eargc_base >= 0) {
-	UNSHIFT(eargv_base[eargc_base]);
-    }
-    
-    /*
-     * Invoke Erlang with the collected options.
-     */
-
-    PUSH(NULL);
-    return run_erlang(eargv[0], eargv);
-}
-
-static void
-push_words(char* src)
-{
-    char sbuf[MAXPATHLEN];
-    char* dst;
-
-    dst = sbuf;
-    while ((*dst++ = *src++) != '\0') {
-	if (isspace((int)*src)) {
-	    *dst = '\0';
-	    PUSH(strsave(sbuf));
-	    dst = sbuf;
-	    do {
-		src++;
-	    } while (isspace((int)*src));
-	}
-    }
-    if (sbuf[0])
-	PUSH(strsave(sbuf));
-}
-#ifdef __WIN32__
-wchar_t *make_commandline(char **argv)
-{
-    static wchar_t *buff = NULL;
-    static int siz = 0;
-    int num = 0, len;
-    char **arg;
-    wchar_t *p;
-
-    if (*argv == NULL) { 
-	return L"";
-    }
-    for (arg = argv; *arg != NULL; ++arg) {
-	num += strlen(*arg)+1;
-    }
-    if (!siz) {
-	siz = num;
-	buff = (wchar_t *) emalloc(siz*sizeof(wchar_t));
-    } else if (siz < num) {
-	siz = num;
-	buff = (wchar_t *) erealloc(buff,siz*sizeof(wchar_t));
-    }
-    p = buff;
-    num=0;
-    for (arg = argv; *arg != NULL; ++arg) {
-	len = MultiByteToWideChar(CP_UTF8, 0, *arg, -1, p, siz);
-	p+=(len-1);
-	*p++=L' ';
-    }
-    *(--p) = L'\0';
-
-    if (debug) {
-	printf("Processed command line:%S\n",buff);
-    }
-    return buff;
-}
-
-int my_spawnvp(char **argv)
-{
-    STARTUPINFOW siStartInfo;
-    PROCESS_INFORMATION piProcInfo;
-    DWORD ec;
-
-    memset(&siStartInfo,0,sizeof(STARTUPINFOW));
-    siStartInfo.cb = sizeof(STARTUPINFOW); 
-    siStartInfo.dwFlags = STARTF_USESTDHANDLES;
-    siStartInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
-    siStartInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-    siStartInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-
-    if (!CreateProcessW(NULL, 
-			make_commandline(argv),
-			NULL, 
-			NULL, 
-			TRUE, 
-			0,
-			NULL, 
-			NULL, 
-			&siStartInfo, 
-			&piProcInfo)) {
-	return -1;
-    }
-    CloseHandle(piProcInfo.hThread);
-
-    WaitForSingleObject(piProcInfo.hProcess,INFINITE);
-    if (!GetExitCodeProcess(piProcInfo.hProcess,&ec)) {
-	return 0;
-    }
-    return (int) ec;
-}    
-#endif /* __WIN32__ */
-
-
-static int
-run_erlang(char* progname, char** argv)
-{
-#ifdef __WIN32__
-    int status;
-#endif
-
-    if (debug) {
-	int i = 0;
-	while (argv[i] != NULL)
-	    printf(" %s", argv[i++]);
-	printf("\n");
-    }
-
-#ifdef __WIN32__
-    /*
-     * Alas, we must wait here for the program to finish.
-     * Otherwise, the shell from which we were executed will think
-     * we are finished and print a prompt and read keyboard input.
-     */
-
-    status = my_spawnvp(argv)/*_spawnvp(_P_WAIT,progname,argv)*/;
-    if (status == -1) {
-	fprintf(stderr, "typer: Error executing '%s': %d", progname, 
-		GetLastError());
-    }
-    return status;
-#else
-    execvp(progname, argv);
-    error("Error %d executing \'%s\'.", errno, progname);
-    return 2;
-#endif
-}
-
-static void
-error(char* format, ...)
-{
-    char sbuf[1024];
-    va_list ap;
-    
-    va_start(ap, format);
-    erts_vsnprintf(sbuf, sizeof(sbuf), format, ap);
-    va_end(ap);
-    fprintf(stderr, "typer: %s\n", sbuf);
-    exit(1);
-}
-
-static void*
-emalloc(size_t size)
-{
-  void *p = malloc(size);
-  if (p == NULL)
-    error("Insufficient memory");
-  return p;
-}
-
-#ifdef __WIN32__
-static void *
-erealloc(void *p, size_t size)
-{
-    void *res = realloc(p, size);
-    if (res == NULL)
-    error("Insufficient memory");
-    return res;
-}
-#endif
-
-static char*
-strsave(char* string)
-{
-    char* p = emalloc(strlen(string)+1);
-    strcpy(p, string);
-    return p;
-}
-
-static int 
-file_exists(char *progname) 
-{
-#ifdef __WIN32__
-    wchar_t wcsbuf[MAXPATHLEN];
-    MultiByteToWideChar(CP_UTF8, 0, progname, -1, wcsbuf, MAXPATHLEN);
-    return (_waccess(wcsbuf, 0) != -1);
-#else
-    return (access(progname, 1) != -1);
-#endif
-}
-
-static char*
-get_default_emulator(char* progname)
-{
-    char sbuf[MAXPATHLEN];
-    char* s;
-
-    if (strlen(progname) >= sizeof(sbuf))
-        return ERL_NAME;
-
-    strcpy(sbuf, progname);
-    for (s = sbuf+strlen(sbuf); s >= sbuf; s--) {
-	if (IS_DIRSEP(*s)) {
-	    strcpy(s+1, ERL_NAME);
-	    if(file_exists(sbuf))
-		return strsave(sbuf);
-	    break;
-	}
-    }
-    return ERL_NAME;
-}
-
-#ifdef __WIN32__
-static char*
-possibly_quote(char* arg)
-{
-    int mustQuote = NO;
-    int n = 0;
-    char* s;
-    char* narg;
-
-    if (arg == NULL) {
-	return arg;
-    }
-
-    /*
-     * Scan the string to find out if it needs quoting and return
-     * the original argument if not.
-     */
-
-    for (s = arg; *s; s++, n++) {
-	switch(*s) {
-	case ' ':
-	    mustQuote = YES;
-	    continue;
-	case '"':
-	    mustQuote = YES;
-	    n++;
-	    continue;
-	case '\\':
-	    if(s[1] == '"')
-		n++;
-	    continue;
-	default:
-	    continue;
-	}
-    }
-    if (!mustQuote) {
-	return arg;
-    }
-
-    /*
-     * Insert the quotes and put a backslash in front of every quote
-     * inside the string.
-     */
-
-    s = narg = emalloc(n+2+1);
-    for (*s++ = '"'; *arg; arg++, s++) {
-	if (*arg == '"' || (*arg == '\\' && arg[1] == '"')) {
-	    *s++ = '\\';
-	}
-	*s = *arg;
-    }
-    if (s[-1] == '\\') {
-	*s++ ='\\';
-    }
-    *s++ = '"';
-    *s = '\0';
-    return narg;
-}
-#endif /* __WIN32__ */
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index e71308edbe..8be696b16f 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -89,7 +89,6 @@ cd "$ERL_ROOT/bin"
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/erl" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/erlc" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/dialyzer" .
-cp -p "$ERL_ROOT/erts-%I_VSN%/bin/typer" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/ct_run" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/escript" .
 
diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c
index 43930ff284..04522a0779 100644
--- a/erts/etc/win32/Install.c
+++ b/erts/etc/win32/Install.c
@@ -48,7 +48,7 @@ int wmain(int argc, wchar_t **argv)
     InitSection *ini_section;
     HANDLE module = GetModuleHandle(NULL);
     wchar_t *binaries[] = { L"erl.exe", L"werl.exe", L"erlc.exe",
-			    L"dialyzer.exe", L"typer.exe",
+			    L"dialyzer.exe",
 			    L"escript.exe", L"ct_run.exe", NULL };
     wchar_t *scripts[] = { L"start_clean.boot", L"start_sasl.boot", L"no_dot_erlang.boot", NULL };
     wchar_t fromname[MAX_PATH];
-- 
cgit v1.2.3


From 158de690ba539f4048ee0634e1d2ee1ffb76a68f Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Mon, 27 Mar 2017 07:20:19 -0700
Subject: erts: Fix two compiler warnings on OS X

---
 erts/etc/unix/to_erl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c
index 0bd469727c..0ccd7ead3e 100644
--- a/erts/etc/unix/to_erl.c
+++ b/erts/etc/unix/to_erl.c
@@ -416,7 +416,7 @@ int main(int argc, char **argv)
 
 	if (len) {
 #ifdef DEBUG
-	    if(write(1, buf, len));
+	    (void)write(1, buf, len);
 #endif
 	    if (write_all(wfd, buf, len) != len) {
 		fprintf(stderr, "Error in writing to FIFO.\n");
-- 
cgit v1.2.3


From f0c4d095e0d9be054181785f5c9ca34b52aa2995 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 11 Apr 2017 19:15:05 +0200
Subject: Suggested stack size options for dirty schedulers

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

(limited to 'erts/etc')

diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index ee59759940..362817e94c 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -141,6 +141,8 @@ static char *pluss_val_switches[] = {
     "wt",
     "ws",
     "ss",
+    "ssdcpu",
+    "ssdio",
     "pp",
     "ub",
     NULL
-- 
cgit v1.2.3


From cfd009221d53d2f19dfa2852962f48b85b34d485 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Sun, 12 Feb 2017 23:25:39 +0100
Subject: Minimum timeout position in each timer wheel

Minimum known timeout position is saved in bot far and near
wheel. This information is used to avoid scanning from current
position in the cases were we know the minimum timeout position.
---
 erts/etc/unix/etp-commands.in | 75 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index c689d495e6..643cfbf323 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -2871,6 +2871,81 @@ define etp-disasm
   end
 end
 
+############################################################################
+#
+# Timer Wheel
+#
+
+define etp-timer-wheel
+# Args: TimerWheel
+  if (!erts_initialized)
+    printf "System not initialized!\n"
+  else
+    set $tiw = $arg0
+    printf "Number of timers: %d\n", $tiw->nto
+    printf "Min timeout pos: %d\n", $tiw->next_timeout_pos
+    printf "\n--- Soon Wheel ---\n"
+    set $ix = $tiw->pos & etp_tw_soon_wheel_mask
+    printf "Position: %ld (%d)\n", $tiw->pos, $ix
+    printf "Min timeout position: %ld (%d)\n", $tiw->soon.min_tpos, $tiw->soon.min_tpos & etp_tw_soon_wheel_mask
+    printf "Number of timers: %d\n", $tiw->soon.nto
+    set $slots = etp_tw_soon_wheel_size
+    while $slots > 0
+      set $tmr = $tiw->w[$ix]
+      if ($tmr != (ErtsTWheelTimer *) 0x0)
+        printf "---\n"
+        printf "Slot: %d\n", $ix
+        printf "\n"
+        while 1
+           printf "- Timeout pos: %ld\n", $tmr->timeout_pos
+	   printf "  Pointer: (ErtsTWheelTimer *) %p\n", $tmr
+           set $tmr = $tmr->next
+           if ($tmr == $tiw->w[$ix])
+             loop_break
+           end
+        end
+      end
+      set $ix++
+      if ($ix == (etp_tw_soon_wheel_first_slot + etp_tw_soon_wheel_size))
+        set $ix = etp_tw_soon_wheel_first_slot
+      end
+      set $slots--
+    end
+    printf "\n--- Later Wheel ---\n"
+    set $ix = (($tiw->later.pos >> etp_tw_later_wheel_shift) & etp_tw_later_wheel_mask) + etp_tw_later_wheel_first_slot
+    printf "Position: %ld (%d)\n", $tiw->later.pos, $ix
+    printf "Min timeout position: %ld (%d)\n", $tiw->later.min_tpos, (($tiw->later.min_tpos >> etp_tw_later_wheel_shift) & etp_tw_later_wheel_mask) + etp_tw_later_wheel_first_slot
+    printf "Number of timers: %d\n", $tiw->later.nto
+    set $slots = etp_tw_later_wheel_size
+    set $slot_pos = $tiw->later.pos
+    while $slots > 0
+      set $tmr = $tiw->w[$ix]
+      if ($tmr != (ErtsTWheelTimer *) 0x0)
+        printf "---\n"
+        printf "Slot: %d\n", $ix
+        printf "Slot Range: [%ld, %ld]\n", $slot_pos, $slot_pos + etp_tw_later_wheel_slot_size
+        printf "Pre timeout pos: %ld\n", $slot_pos - etp_tw_later_wheel_slot_size
+        printf "\n"
+        while 1
+           printf "- Timeout pos: %ld\n", $tmr->timeout_pos
+	   printf "  Pointer: (ErtsTWheelTimer *) %p\n", $tmr
+           set $tmr = $tmr->next
+           if ($tmr == $tiw->w[$ix])
+             loop_break
+           end
+        end
+      end
+      set $ix++
+      if ($ix == (etp_tw_later_wheel_first_slot + etp_tw_later_wheel_size))
+        set $ix = etp_tw_later_wheel_first_slot
+      end
+      set $slot_pos = $slot_pos + etp_tw_later_wheel_slot_size
+      set $slots--
+    end
+  end
+  printf "---\n"
+end
+
 document etp-disasm
 %---------------------------------------------------------------------------
 % etp-disasm StartI EndI
-- 
cgit v1.2.3


From 8c665562272bac669ea400638d379f21495636af Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 3 Apr 2017 16:19:47 +0200
Subject: erts: Rebuild etc executables if config.h changes

---
 erts/etc/common/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index d3af634729..f656eebc46 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -360,7 +360,7 @@ Install.ini:	../$(TARGET)/Install.src ../../vsn.mk $(TARGET)/Makefile
 
 
 else
-RC_GENERATED =
+RC_GENERATED =  $(ERL_TOP)/erts/$(TARGET)/config.h
 endif
 #---------------------------------------------------------
 # End of windows specific targets.
-- 
cgit v1.2.3


From 030e6ef2efaad12d485cec1727c4b68c09c6c584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 12 Apr 2017 15:19:23 +0200
Subject: Add back TypEr to the main OTP repository

It turned out that the dependencies between Dialyzer
and TypEr makes it impractical to have TypEr in a
separate repository.

Add it back to the OTP repository, but put the Erlang
module 'typer' in the dialyzer application.
---
 erts/etc/common/Makefile.in |  11 +-
 erts/etc/common/typer.c     | 455 ++++++++++++++++++++++++++++++++++++++++++++
 erts/etc/unix/Install.src   |   1 +
 erts/etc/win32/Install.c    |   1 +
 4 files changed, 466 insertions(+), 2 deletions(-)
 create mode 100644 erts/etc/common/typer.c

(limited to 'erts/etc')

diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index d3af634729..7634583462 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -143,7 +143,7 @@ MC_OUTPUTS=$(OBJDIR)/erlsrv_logmess.h $(OBJDIR)/erlsrv_logmess.res
 MT_FLAG="-MD"
 endif
 INET_GETHOST = $(BINDIR)/inet_gethost.exe
-INSTALL_EMBEDDED_PROGS += $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe $(BINDIR)/ct_run.exe
+INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer.exe $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe $(BINDIR)/ct_run.exe
 INSTALL_SRC = $(WINETC)/start_erl.c $(WINETC)/Nmakefile.start_erl
 ERLEXECDIR=.
 INSTALL_LIBS =
@@ -176,7 +176,7 @@ ENTRY_OBJ=
 ERLSRV_OBJECTS= 
 MC_OUTPUTS=
 INET_GETHOST = $(BINDIR)/inet_gethost@EXEEXT@
-INSTALL_EMBEDDED_PROGS += $(BINDIR)/dialyzer@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 = $(UXETC)/start.src $(UXETC)/start_erl.src
@@ -238,6 +238,7 @@ endif
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/reclaim.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/run_erl.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/to_erl.o
+	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/typer.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/dyn_erl.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/safe_string.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/run_erl.o
@@ -432,6 +433,12 @@ $(BINDIR)/dialyzer@EXEEXT@: $(OBJDIR)/dialyzer.o $(ERTS_LIB)
 $(OBJDIR)/dialyzer.o: dialyzer.c $(RC_GENERATED)
 	$(V_CC) $(CFLAGS) -o $@ -c dialyzer.c
 
+$(BINDIR)/typer@EXEEXT@: $(OBJDIR)/typer.o $(ERTS_LIB)
+	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/typer.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
+
+$(OBJDIR)/typer.o: typer.c $(RC_GENERATED)
+	$(V_CC) $(CFLAGS) -o $@ -c typer.c
+
 $(BINDIR)/escript@EXEEXT@: $(OBJDIR)/escript.o $(ERTS_LIB)
 	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/escript.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
diff --git a/erts/etc/common/typer.c b/erts/etc/common/typer.c
new file mode 100644
index 0000000000..77a95ccded
--- /dev/null
+++ b/erts/etc/common/typer.c
@@ -0,0 +1,455 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2006-2016. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * %CopyrightEnd%
+ */
+/*
+ * Purpose: Typer front-end.
+ */
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "sys.h"
+#ifdef __WIN32__
+#include <winbase.h>
+#endif
+
+#include <ctype.h>
+
+#define NO 0
+#define YES 1
+
+#define ASIZE(a) (sizeof(a)/sizeof(a[0]))
+
+static int debug = 0;		/* Bit flags for debug printouts. */
+
+static char** eargv_base;	/* Base of vector. */
+static char** eargv;		/* First argument for erl. */
+
+static int eargc;		/* Number of arguments in eargv. */
+
+#ifdef __WIN32__
+#  define QUOTE(s) possibly_quote(s)
+#  define IS_DIRSEP(c) ((c) == '/' || (c) == '\\')
+#  define ERL_NAME "erl.exe"
+#else
+#  define QUOTE(s) s
+#  define IS_DIRSEP(c) ((c) == '/')
+#  define ERL_NAME "erl"
+#endif
+
+#define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)
+#define PUSH(s) eargv[eargc++] = QUOTE(s)
+#define PUSH2(s, t) PUSH(s); PUSH(t)
+#define PUSH3(s, t, u) PUSH2(s, t); PUSH(u)
+
+/*
+ * Local functions.
+ */
+
+static void error(char* format, ...);
+static void* emalloc(size_t size);
+static char* strsave(char* string);
+static void push_words(char* src);
+static int run_erlang(char* name, char** argv);
+static char* get_default_emulator(char* progname);
+#ifdef __WIN32__
+static char* possibly_quote(char* arg);
+static void* erealloc(void *p, size_t size);
+#endif
+
+/*
+ * Supply a strerror() function if libc doesn't.
+ */
+#ifndef HAVE_STRERROR
+
+extern int sys_nerr;
+
+#ifndef SYS_ERRLIST_DECLARED
+extern const char * const sys_errlist[];
+#endif /* !SYS_ERRLIST_DECLARED */
+
+char *strerror(int errnum)
+{
+  static char *emsg[1024];
+
+  if (errnum != 0) {
+    if (errnum > 0 && errnum < sys_nerr) 
+      sprintf((char *) &emsg[0], "(%s)", sys_errlist[errnum]);
+    else 
+      sprintf((char *) &emsg[0], "errnum = %d ", errnum);
+  }
+  else {
+    emsg[0] = '\0';
+  }
+  return (char *) &emsg[0];
+}
+#endif /* !HAVE_STRERROR */
+
+#ifdef __WIN32__
+int wmain(int argc, wchar_t **wcargv)
+{
+    char** argv;
+#else
+int
+main(int argc, char** argv)
+{
+#endif
+    int eargv_size;
+    int eargc_base;		/* How many arguments in the base of eargv. */
+    char* emulator;
+    int need_shell = 0;
+
+#ifdef __WIN32__
+    int i;
+    int len;
+    /* Convert argv to utf8 */
+    argv = emalloc((argc+1) * sizeof(char*));
+    for (i=0; i<argc; i++) {
+	len = WideCharToMultiByte(CP_UTF8, 0, wcargv[i], -1, NULL, 0, NULL, NULL);
+	argv[i] = emalloc(len*sizeof(char));
+	WideCharToMultiByte(CP_UTF8, 0, wcargv[i], -1, argv[i], len, NULL, NULL);
+    }
+    argv[argc] = NULL;
+#endif
+
+    emulator = get_default_emulator(argv[0]);
+
+    /*
+     * Allocate the argv vector to be used for arguments to Erlang.
+     * Arrange for starting to pushing information in the middle of
+     * the array, to allow easy addition of commands in the beginning.
+     */
+
+    eargv_size = argc*4+100;
+    eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
+    eargv = eargv_base;
+    eargc = 0;
+    push_words(emulator);
+    eargc_base = eargc;
+    eargv = eargv + eargv_size/2;
+    eargc = 0;
+
+    /*
+     * Push initial arguments.
+     */
+
+    if (argc > 1 && strcmp(argv[1], "-smp") == 0) {
+        PUSH("-smpauto");
+	argc--, argv++;
+    }
+
+    PUSH("+B");
+    PUSH2("-boot", "start_clean");
+    PUSH3("-run", "typer", "start");
+    PUSH("-extra");
+
+    /*
+     * Push everything except --shell.
+     */
+
+    while (argc > 1) {
+	if (strcmp(argv[1], "--shell") == 0) {
+	    need_shell = 1;
+	} else {
+	    PUSH(argv[1]);
+	}
+	argc--, argv++;
+    }
+
+    if (!need_shell) {
+	UNSHIFT("-noinput");
+    }
+
+    /*
+     * Move up the commands for invoking the emulator and adjust eargv
+     * accordingly.
+     */
+
+    while (--eargc_base >= 0) {
+	UNSHIFT(eargv_base[eargc_base]);
+    }
+    
+    /*
+     * Invoke Erlang with the collected options.
+     */
+
+    PUSH(NULL);
+    return run_erlang(eargv[0], eargv);
+}
+
+static void
+push_words(char* src)
+{
+    char sbuf[MAXPATHLEN];
+    char* dst;
+
+    dst = sbuf;
+    while ((*dst++ = *src++) != '\0') {
+	if (isspace((int)*src)) {
+	    *dst = '\0';
+	    PUSH(strsave(sbuf));
+	    dst = sbuf;
+	    do {
+		src++;
+	    } while (isspace((int)*src));
+	}
+    }
+    if (sbuf[0])
+	PUSH(strsave(sbuf));
+}
+#ifdef __WIN32__
+wchar_t *make_commandline(char **argv)
+{
+    static wchar_t *buff = NULL;
+    static int siz = 0;
+    int num = 0, len;
+    char **arg;
+    wchar_t *p;
+
+    if (*argv == NULL) { 
+	return L"";
+    }
+    for (arg = argv; *arg != NULL; ++arg) {
+	num += strlen(*arg)+1;
+    }
+    if (!siz) {
+	siz = num;
+	buff = (wchar_t *) emalloc(siz*sizeof(wchar_t));
+    } else if (siz < num) {
+	siz = num;
+	buff = (wchar_t *) erealloc(buff,siz*sizeof(wchar_t));
+    }
+    p = buff;
+    num=0;
+    for (arg = argv; *arg != NULL; ++arg) {
+	len = MultiByteToWideChar(CP_UTF8, 0, *arg, -1, p, siz);
+	p+=(len-1);
+	*p++=L' ';
+    }
+    *(--p) = L'\0';
+
+    if (debug) {
+	printf("Processed command line:%S\n",buff);
+    }
+    return buff;
+}
+
+int my_spawnvp(char **argv)
+{
+    STARTUPINFOW siStartInfo;
+    PROCESS_INFORMATION piProcInfo;
+    DWORD ec;
+
+    memset(&siStartInfo,0,sizeof(STARTUPINFOW));
+    siStartInfo.cb = sizeof(STARTUPINFOW); 
+    siStartInfo.dwFlags = STARTF_USESTDHANDLES;
+    siStartInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
+    siStartInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+    siStartInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+
+    if (!CreateProcessW(NULL, 
+			make_commandline(argv),
+			NULL, 
+			NULL, 
+			TRUE, 
+			0,
+			NULL, 
+			NULL, 
+			&siStartInfo, 
+			&piProcInfo)) {
+	return -1;
+    }
+    CloseHandle(piProcInfo.hThread);
+
+    WaitForSingleObject(piProcInfo.hProcess,INFINITE);
+    if (!GetExitCodeProcess(piProcInfo.hProcess,&ec)) {
+	return 0;
+    }
+    return (int) ec;
+}    
+#endif /* __WIN32__ */
+
+
+static int
+run_erlang(char* progname, char** argv)
+{
+#ifdef __WIN32__
+    int status;
+#endif
+
+    if (debug) {
+	int i = 0;
+	while (argv[i] != NULL)
+	    printf(" %s", argv[i++]);
+	printf("\n");
+    }
+
+#ifdef __WIN32__
+    /*
+     * Alas, we must wait here for the program to finish.
+     * Otherwise, the shell from which we were executed will think
+     * we are finished and print a prompt and read keyboard input.
+     */
+
+    status = my_spawnvp(argv)/*_spawnvp(_P_WAIT,progname,argv)*/;
+    if (status == -1) {
+	fprintf(stderr, "typer: Error executing '%s': %d", progname, 
+		GetLastError());
+    }
+    return status;
+#else
+    execvp(progname, argv);
+    error("Error %d executing \'%s\'.", errno, progname);
+    return 2;
+#endif
+}
+
+static void
+error(char* format, ...)
+{
+    char sbuf[1024];
+    va_list ap;
+    
+    va_start(ap, format);
+    erts_vsnprintf(sbuf, sizeof(sbuf), format, ap);
+    va_end(ap);
+    fprintf(stderr, "typer: %s\n", sbuf);
+    exit(1);
+}
+
+static void*
+emalloc(size_t size)
+{
+  void *p = malloc(size);
+  if (p == NULL)
+    error("Insufficient memory");
+  return p;
+}
+
+#ifdef __WIN32__
+static void *
+erealloc(void *p, size_t size)
+{
+    void *res = realloc(p, size);
+    if (res == NULL)
+    error("Insufficient memory");
+    return res;
+}
+#endif
+
+static char*
+strsave(char* string)
+{
+    char* p = emalloc(strlen(string)+1);
+    strcpy(p, string);
+    return p;
+}
+
+static int 
+file_exists(char *progname) 
+{
+#ifdef __WIN32__
+    wchar_t wcsbuf[MAXPATHLEN];
+    MultiByteToWideChar(CP_UTF8, 0, progname, -1, wcsbuf, MAXPATHLEN);
+    return (_waccess(wcsbuf, 0) != -1);
+#else
+    return (access(progname, 1) != -1);
+#endif
+}
+
+static char*
+get_default_emulator(char* progname)
+{
+    char sbuf[MAXPATHLEN];
+    char* s;
+
+    if (strlen(progname) >= sizeof(sbuf))
+        return ERL_NAME;
+
+    strcpy(sbuf, progname);
+    for (s = sbuf+strlen(sbuf); s >= sbuf; s--) {
+	if (IS_DIRSEP(*s)) {
+	    strcpy(s+1, ERL_NAME);
+	    if(file_exists(sbuf))
+		return strsave(sbuf);
+	    break;
+	}
+    }
+    return ERL_NAME;
+}
+
+#ifdef __WIN32__
+static char*
+possibly_quote(char* arg)
+{
+    int mustQuote = NO;
+    int n = 0;
+    char* s;
+    char* narg;
+
+    if (arg == NULL) {
+	return arg;
+    }
+
+    /*
+     * Scan the string to find out if it needs quoting and return
+     * the original argument if not.
+     */
+
+    for (s = arg; *s; s++, n++) {
+	switch(*s) {
+	case ' ':
+	    mustQuote = YES;
+	    continue;
+	case '"':
+	    mustQuote = YES;
+	    n++;
+	    continue;
+	case '\\':
+	    if(s[1] == '"')
+		n++;
+	    continue;
+	default:
+	    continue;
+	}
+    }
+    if (!mustQuote) {
+	return arg;
+    }
+
+    /*
+     * Insert the quotes and put a backslash in front of every quote
+     * inside the string.
+     */
+
+    s = narg = emalloc(n+2+1);
+    for (*s++ = '"'; *arg; arg++, s++) {
+	if (*arg == '"' || (*arg == '\\' && arg[1] == '"')) {
+	    *s++ = '\\';
+	}
+	*s = *arg;
+    }
+    if (s[-1] == '\\') {
+	*s++ ='\\';
+    }
+    *s++ = '"';
+    *s = '\0';
+    return narg;
+}
+#endif /* __WIN32__ */
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index 8be696b16f..e71308edbe 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -89,6 +89,7 @@ cd "$ERL_ROOT/bin"
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/erl" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/erlc" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/dialyzer" .
+cp -p "$ERL_ROOT/erts-%I_VSN%/bin/typer" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/ct_run" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/escript" .
 
diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c
index 04522a0779..5701df35a3 100644
--- a/erts/etc/win32/Install.c
+++ b/erts/etc/win32/Install.c
@@ -49,6 +49,7 @@ int wmain(int argc, wchar_t **argv)
     HANDLE module = GetModuleHandle(NULL);
     wchar_t *binaries[] = { L"erl.exe", L"werl.exe", L"erlc.exe",
 			    L"dialyzer.exe",
+			    L"typer.exe",
 			    L"escript.exe", L"ct_run.exe", NULL };
     wchar_t *scripts[] = { L"start_clean.boot", L"start_sasl.boot", L"no_dot_erlang.boot", NULL };
     wchar_t fromname[MAX_PATH];
-- 
cgit v1.2.3


From f30d131bd979e29b68fb7d9ff515c61a246201f4 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Tue, 21 Mar 2017 13:40:08 +0100
Subject: erts: Deprecate the non-smp emulators

---
 erts/etc/common/erlexec.c | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index ee59759940..b29190e4d9 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -203,8 +203,8 @@ void error(char* format, ...);
  * Local functions.
  */
 
-#if !defined(ERTS_HAVE_SMP_EMU)
-static void usage_notsup(const char *switchname);
+#if !defined(ERTS_HAVE_SMP_EMU) || !defined(ERTS_HAVE_PLAIN_EMU)
+static void usage_notsup(const char *switchname, const char *alt);
 #endif
 static char **build_args_from_env(char *env_var);
 static char **build_args_from_string(char *env_var);
@@ -487,8 +487,7 @@ int main(int argc, char **argv)
     cpuinfo = erts_cpu_info_create();
     /* '-smp auto' is default */ 
 #ifdef ERTS_HAVE_SMP_EMU
-    if (erts_get_cpu_configured(cpuinfo) > 1)
-	emu_type |= EMU_TYPE_SMP;
+    emu_type |= EMU_TYPE_SMP;
 #endif
 
 #if defined(__WIN32__) && defined(WIN32_ALWAYS_DEBUG)
@@ -520,12 +519,11 @@ int main(int argc, char **argv)
 		    i++;
 		smp_auto:
 		    emu_type_passed |= EMU_TYPE_SMP;
-#ifdef ERTS_HAVE_SMP_EMU
-		    if (erts_get_cpu_configured(cpuinfo) > 1)
-			emu_type |= EMU_TYPE_SMP;
-		    else
+#if defined(ERTS_HAVE_PLAIN_EMU) && !defined(ERTS_HAVE_SMP_EMU)
+                    emu_type &= ~EMU_TYPE_SMP;
+#else
+                    emu_type |= EMU_TYPE_SMP;
 #endif
-			emu_type &= ~EMU_TYPE_SMP;
 		}
 		else if (strcmp(argv[i+1], "enable") == 0) {
 		    i++;
@@ -534,14 +532,18 @@ int main(int argc, char **argv)
 #ifdef ERTS_HAVE_SMP_EMU
 		    emu_type |= EMU_TYPE_SMP;
 #else
-		    usage_notsup("-smp enable");
+		    usage_notsup("-smp enable", "");
 #endif
 		}
 		else if (strcmp(argv[i+1], "disable") == 0) {
 		    i++;
 		smp_disable:
-		    emu_type_passed |= EMU_TYPE_SMP;
+		    emu_type_passed &= ~EMU_TYPE_SMP;
+#ifdef ERTS_HAVE_PLAIN_EMU
 		    emu_type &= ~EMU_TYPE_SMP;
+#else
+                    usage_notsup("-smp disable", " Use \"+S 1\" instead.");
+#endif
 		}
 		else {
 		smp:
@@ -550,7 +552,7 @@ int main(int argc, char **argv)
 #ifdef ERTS_HAVE_SMP_EMU
 		    emu_type |= EMU_TYPE_SMP;
 #else
-		    usage_notsup("-smp");
+		    usage_notsup("-smp", "");
 #endif
 		}
 	    } else if (strcmp(argv[i], "-smpenable") == 0) {
@@ -1183,14 +1185,14 @@ usage_aux(void)
 #ifdef __WIN32__
 	  "[-start_erl [datafile]] "
 #endif
-	  "[-smp "
+	  "[-smp [auto"
 #ifdef ERTS_HAVE_SMP_EMU
-	  "[enable|"
+	  "|enable"
 #endif
-	  "auto|disable"
-#ifdef ERTS_HAVE_SMP_EMU
-	  "]"
+#ifdef ERTS_HAVE_PLAIN_EMU
+	  "|disable"
 #endif
+	  "]"
 	  "] "
 	  "[-make] [-man [manopts] MANPAGE] [-x] [-emu_args] [-start_epmd BOOLEAN] "
 	  "[-args_file FILENAME] [+A THREADS] [+a SIZE] [+B[c|d|i]] [+c [BOOLEAN]] "
@@ -1212,11 +1214,11 @@ usage(const char *switchname)
     usage_aux();
 }
 
-#if !defined(ERTS_HAVE_SMP_EMU)
+#if !defined(ERTS_HAVE_SMP_EMU) || !defined(ERTS_HAVE_PLAIN_EMU)
 static void
-usage_notsup(const char *switchname)
+usage_notsup(const char *switchname, const char *alt)
 {
-    fprintf(stderr, "Argument \'%s\' not supported.\n", switchname);
+    fprintf(stderr, "Argument \'%s\' not supported.%s\n", switchname, alt);
     usage_aux();
 }
 #endif
-- 
cgit v1.2.3


From fab97e165a79db10b7b560be5aefc7489982bced Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Fri, 21 Apr 2017 14:49:18 +0200
Subject: Rename argv[0] from beam to invoking program name

Allows ps and htop to display the invoking program/script name
instead of beam[.smp].
---
 erts/etc/common/ct_run.c   | 40 ++++++++++++++++++++++++++++++++++++++++
 erts/etc/common/dialyzer.c | 39 +++++++++++++++++++++++++++++++++++++++
 erts/etc/common/erlc.c     | 37 +++++++++++++++++++++++++++++++++++++
 erts/etc/common/erlexec.c  |  8 ++++++--
 erts/etc/common/escript.c  | 30 +++++++++++++++++++++++++++++-
 erts/etc/common/typer.c    | 38 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 189 insertions(+), 3 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/ct_run.c b/erts/etc/common/ct_run.c
index acdfa8c8b8..898c8ccde0 100644
--- a/erts/etc/common/ct_run.c
+++ b/erts/etc/common/ct_run.c
@@ -82,6 +82,9 @@ static int eargc;		/* Number of arguments in eargv. */
 
 static void error(char* format, ...);
 static void* emalloc(size_t size);
+#ifdef HAVE_COPYING_PUTENV
+static void efree(void *p);
+#endif
 static char* strsave(char* string);
 static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
@@ -119,6 +122,30 @@ char *strerror(int errnum)
 }
 #endif /* !HAVE_STRERROR */
 
+
+static void
+set_env(char *key, char *value)
+{
+#ifdef __WIN32__
+    WCHAR wkey[MAXPATHLEN];
+    WCHAR wvalue[MAXPATHLEN];
+    MultiByteToWideChar(CP_UTF8, 0, key, -1, wkey, MAXPATHLEN);
+    MultiByteToWideChar(CP_UTF8, 0, value, -1, wvalue, MAXPATHLEN);
+    if (!SetEnvironmentVariableW(wkey, wvalue))
+        error("SetEnvironmentVariable(\"%s\", \"%s\") failed!", key, value);
+#else
+    size_t size = strlen(key) + 1 + strlen(value) + 1;
+    char *str = emalloc(size);
+    sprintf(str, "%s=%s", key, value);
+    if (putenv(str) != 0)
+        error("putenv(\"%s\") failed!", str);
+#ifdef HAVE_COPYING_PUTENV
+    efree(str);
+#endif
+#endif
+}
+
+
 #ifdef __WIN32__
 int wmain(int argc, wchar_t **wcargv)
 {
@@ -154,6 +181,11 @@ int main(int argc, char** argv)
 
     emulator = get_default_emulator(argv[0]);
 
+    /*
+     * Add scriptname to env
+     */
+    set_env("ESCRIPT_NAME", argv[0]);
+
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
      * Arrange for starting to pushing information in the middle of
@@ -458,6 +490,14 @@ erealloc(void *p, size_t size)
 }
 #endif
 
+#ifdef HAVE_COPYING_PUTENV
+static void
+efree(void *p)
+{
+    free(p);
+}
+#endif
+
 static char*
 strsave(char* string)
 {
diff --git a/erts/etc/common/dialyzer.c b/erts/etc/common/dialyzer.c
index 6ba3605422..829984ef3f 100644
--- a/erts/etc/common/dialyzer.c
+++ b/erts/etc/common/dialyzer.c
@@ -64,6 +64,9 @@ static int eargc;		/* Number of arguments in eargv. */
 
 static void error(char* format, ...);
 static void* emalloc(size_t size);
+#ifdef HAVE_COPYING_PUTENV
+static void efree(void *p);
+#endif
 static char* strsave(char* string);
 static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
@@ -147,6 +150,29 @@ free_env_val(char *value)
 #endif
 }
 
+static void
+set_env(char *key, char *value)
+{
+#ifdef __WIN32__
+    WCHAR wkey[MAXPATHLEN];
+    WCHAR wvalue[MAXPATHLEN];
+    MultiByteToWideChar(CP_UTF8, 0, key, -1, wkey, MAXPATHLEN);
+    MultiByteToWideChar(CP_UTF8, 0, value, -1, wvalue, MAXPATHLEN);
+    if (!SetEnvironmentVariableW(wkey, wvalue))
+        error("SetEnvironmentVariable(\"%s\", \"%s\") failed!", key, value);
+#else
+    size_t size = strlen(key) + 1 + strlen(value) + 1;
+    char *str = emalloc(size);
+    sprintf(str, "%s=%s", key, value);
+    if (putenv(str) != 0)
+        error("putenv(\"%s\") failed!", str);
+#ifdef HAVE_COPYING_PUTENV
+    efree(str);
+#endif
+#endif
+}
+
+
 #ifdef __WIN32__
 int wmain(int argc, wchar_t **wcargv)
 {
@@ -180,6 +206,11 @@ int main(int argc, char** argv)
     if (strlen(emulator) >= MAXPATHLEN)
         error("Value of environment variable DIALYZER_EMULATOR is too large");
 
+    /*
+     * Add scriptname to env
+     */
+    set_env("ESCRIPT_NAME", argv[0]);
+
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
      * Arrange for starting to pushing information in the middle of
@@ -434,6 +465,14 @@ erealloc(void *p, size_t size)
 }
 #endif
 
+#ifdef HAVE_COPYING_PUTENV
+static void
+efree(void *p)
+{
+    free(p);
+}
+#endif
+
 static char*
 strsave(char* string)
 {
diff --git a/erts/etc/common/erlc.c b/erts/etc/common/erlc.c
index b54cb31bef..2abeff33a3 100644
--- a/erts/etc/common/erlc.c
+++ b/erts/etc/common/erlc.c
@@ -72,6 +72,9 @@ static int pause_after_execution = 0;
 static char* process_opt(int* pArgc, char*** pArgv, int offset);
 static void error(char* format, ...);
 static void* emalloc(size_t size);
+#ifdef HAVE_COPYING_PUTENV
+static void efree(void *p);
+#endif
 static char* strsave(char* string);
 static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
@@ -146,6 +149,28 @@ get_env(char *key)
 #endif
 }
 
+static void
+set_env(char *key, char *value)
+{
+#ifdef __WIN32__
+    WCHAR wkey[MAXPATHLEN];
+    WCHAR wvalue[MAXPATHLEN];
+    MultiByteToWideChar(CP_UTF8, 0, key, -1, wkey, MAXPATHLEN);
+    MultiByteToWideChar(CP_UTF8, 0, value, -1, wvalue, MAXPATHLEN);
+    if (!SetEnvironmentVariableW(wkey, wvalue))
+        error("SetEnvironmentVariable(\"%s\", \"%s\") failed!", key, value);
+#else
+    size_t size = strlen(key) + 1 + strlen(value) + 1;
+    char *str = emalloc(size);
+    sprintf(str, "%s=%s", key, value);
+    if (putenv(str) != 0)
+        error("putenv(\"%s\") failed!", str);
+#ifdef HAVE_COPYING_PUTENV
+    efree(str);
+#endif
+#endif
+}
+
 static void
 free_env_val(char *value)
 {
@@ -187,6 +212,11 @@ int main(int argc, char** argv)
     if (strlen(emulator) >= MAXPATHLEN)
         error("Value of environment variable ERLC_EMULATOR is too large");
 
+    /*
+     * Add scriptname to env
+     */
+    set_env("ESCRIPT_NAME", argv[0]);
+
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
      * Arrange for starting to pushing information in the middle of
@@ -499,6 +529,13 @@ erealloc(void *p, size_t size)
 }
 #endif
 
+#ifdef HAVE_COPYING_PUTENV
+static void
+efree(void *p)
+{
+    free(p);
+}
+#endif
 static char*
 strsave(char* string)
 {
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index ee59759940..a1c6bb223b 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -583,8 +583,12 @@ int main(int argc, char **argv)
     erts_snprintf(tmpStr, sizeof(tmpStr), "%s" DIRSEP "%s" BINARY_EXT, bindir, emu);
     emu = strsave(tmpStr);
 
-    add_Eargs(emu);		/* Will be argv[0] -- necessary! */
-
+    s = get_env("ESCRIPT_NAME");
+    if(s) {
+        add_Eargs(s);         /* argv[0] = scriptname*/
+    } else {
+        add_Eargs(progname);  /* argv[0] = erl or cerl */
+    }
     /*
      * Add the bindir to the path (unless it is there already).
      */
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 4134a3ff36..c28e45a044 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -155,6 +155,29 @@ free_env_val(char *value)
 	efree(value);
 #endif
 }
+
+static void
+set_env(char *key, char *value)
+{
+#ifdef __WIN32__
+    WCHAR wkey[MAXPATHLEN];
+    WCHAR wvalue[MAXPATHLEN];
+    MultiByteToWideChar(CP_UTF8, 0, key, -1, wkey, MAXPATHLEN);
+    MultiByteToWideChar(CP_UTF8, 0, value, -1, wvalue, MAXPATHLEN);
+    if (!SetEnvironmentVariableW(wkey, wvalue))
+        error("SetEnvironmentVariable(\"%s\", \"%s\") failed!", key, value);
+#else
+    size_t size = strlen(key) + 1 + strlen(value) + 1;
+    char *str = emalloc(size);
+    sprintf(str, "%s=%s", key, value);
+    if (putenv(str) != 0)
+        error("putenv(\"%s\") failed!", str);
+#ifdef HAVE_COPYING_PUTENV
+    efree(str);
+#endif
+#endif
+}
+
 /*
  * Find absolute path to this program
  */
@@ -548,7 +571,12 @@ main(int argc, char** argv)
     while (--eargc_base >= 0) {
 	UNSHIFT(eargv_base[eargc_base]);
     }
-    
+
+    /*
+     * Add scriptname to env
+     */
+    set_env("ESCRIPT_NAME", scriptname);
+
     /*
      * Invoke Erlang with the collected options.
      */
diff --git a/erts/etc/common/typer.c b/erts/etc/common/typer.c
index 77a95ccded..644c90a795 100644
--- a/erts/etc/common/typer.c
+++ b/erts/etc/common/typer.c
@@ -64,6 +64,9 @@ static int eargc;		/* Number of arguments in eargv. */
 
 static void error(char* format, ...);
 static void* emalloc(size_t size);
+#ifdef HAVE_COPYING_PUTENV
+static void efree(void *p);
+#endif
 static char* strsave(char* string);
 static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
@@ -101,6 +104,29 @@ char *strerror(int errnum)
 }
 #endif /* !HAVE_STRERROR */
 
+static void
+set_env(char *key, char *value)
+{
+#ifdef __WIN32__
+    WCHAR wkey[MAXPATHLEN];
+    WCHAR wvalue[MAXPATHLEN];
+    MultiByteToWideChar(CP_UTF8, 0, key, -1, wkey, MAXPATHLEN);
+    MultiByteToWideChar(CP_UTF8, 0, value, -1, wvalue, MAXPATHLEN);
+    if (!SetEnvironmentVariableW(wkey, wvalue))
+        error("SetEnvironmentVariable(\"%s\", \"%s\") failed!", key, value);
+#else
+    size_t size = strlen(key) + 1 + strlen(value) + 1;
+    char *str = emalloc(size);
+    sprintf(str, "%s=%s", key, value);
+    if (putenv(str) != 0)
+        error("putenv(\"%s\") failed!", str);
+#ifdef HAVE_COPYING_PUTENV
+    efree(str);
+#endif
+#endif
+}
+
+
 #ifdef __WIN32__
 int wmain(int argc, wchar_t **wcargv)
 {
@@ -129,6 +155,10 @@ main(int argc, char** argv)
 #endif
 
     emulator = get_default_emulator(argv[0]);
+    /*
+     * Add scriptname to env
+     */
+    set_env("ESCRIPT_NAME", argv[0]);
 
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
@@ -353,6 +383,14 @@ erealloc(void *p, size_t size)
 }
 #endif
 
+#ifdef HAVE_COPYING_PUTENV
+static void
+efree(void *p)
+{
+    free(p);
+}
+#endif
+
 static char*
 strsave(char* string)
 {
-- 
cgit v1.2.3


From 83e20c62057ebc1d8064bf57b01be560cd244e1d Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Thu, 4 May 2017 15:42:21 +0200
Subject: Update copyright year

---
 erts/etc/common/Makefile.in    | 2 +-
 erts/etc/common/ct_run.c       | 2 +-
 erts/etc/common/dialyzer.c     | 2 +-
 erts/etc/common/erlc.c         | 2 +-
 erts/etc/common/erlexec.c      | 2 +-
 erts/etc/common/escript.c      | 2 +-
 erts/etc/common/inet_gethost.c | 2 +-
 erts/etc/common/typer.c        | 2 +-
 erts/etc/unix/Install.src      | 2 +-
 erts/etc/unix/README           | 2 +-
 erts/etc/unix/etp-commands.in  | 2 +-
 erts/etc/unix/run_erl.c        | 2 +-
 erts/etc/unix/to_erl.c         | 2 +-
 erts/etc/win32/Install.c       | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index b4fa0d4c79..583426460e 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2016. All Rights Reserved.
+# Copyright Ericsson AB 1996-2017. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/erts/etc/common/ct_run.c b/erts/etc/common/ct_run.c
index 898c8ccde0..6639c83778 100644
--- a/erts/etc/common/ct_run.c
+++ b/erts/etc/common/ct_run.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2010-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2010-2017. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/etc/common/dialyzer.c b/erts/etc/common/dialyzer.c
index 829984ef3f..c8d977f6de 100644
--- a/erts/etc/common/dialyzer.c
+++ b/erts/etc/common/dialyzer.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2006-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2006-2017. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/etc/common/erlc.c b/erts/etc/common/erlc.c
index 2abeff33a3..cbbd2a37cd 100644
--- a/erts/etc/common/erlc.c
+++ b/erts/etc/common/erlc.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1997-2016. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2017. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index f11ec2320a..f73c4ef1ca 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2016. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2017. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index c28e45a044..630e241882 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2007-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2007-2017. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c
index ccafd95e51..b746487668 100644
--- a/erts/etc/common/inet_gethost.c
+++ b/erts/etc/common/inet_gethost.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2017. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/etc/common/typer.c b/erts/etc/common/typer.c
index 644c90a795..6bae9f96b7 100644
--- a/erts/etc/common/typer.c
+++ b/erts/etc/common/typer.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2006-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2006-2017. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index e71308edbe..e4b842877c 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -2,7 +2,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2016. All Rights Reserved.
+# Copyright Ericsson AB 1996-2017. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/erts/etc/unix/README b/erts/etc/unix/README
index 9985f2675d..b94f28824e 100644
--- a/erts/etc/unix/README
+++ b/erts/etc/unix/README
@@ -1,7 +1,7 @@
  
  %CopyrightBegin%
  
- Copyright Ericsson AB 1996-2016. All Rights Reserved.
+ Copyright Ericsson AB 1996-2017. All Rights Reserved.
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 643cfbf323..b7b3a2ae99 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2005-2016. All Rights Reserved.
+# Copyright Ericsson AB 2005-2017. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index 8f87c59131..f05c729eeb 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2016. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2017. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c
index 0ccd7ead3e..afff8f7e54 100644
--- a/erts/etc/unix/to_erl.c
+++ b/erts/etc/unix/to_erl.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2015. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2017. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c
index 5701df35a3..06594a107f 100644
--- a/erts/etc/win32/Install.c
+++ b/erts/etc/win32/Install.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2003-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2017. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
-- 
cgit v1.2.3


From 4b216f70be3403bb7c102e7ac1a91b1ee4805c33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 12 May 2017 13:54:32 +0200
Subject: Let --enable-lock-counter build an additional emulator

"./configure --enable-lock-counter" would modify the behavior
of the default emulator (usually SMP).

To make lock counting more accessible, change --enable-lock-counter
to build an additional emulator in the same way as:

  (cd erts/emulator && make lcnt)

(The next commit will make it easier to start the built lock-counter
emulator.)
---
 erts/etc/unix/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/Makefile b/erts/etc/unix/Makefile
index 2fa9cd047b..17de4d8878 100644
--- a/erts/etc/unix/Makefile
+++ b/erts/etc/unix/Makefile
@@ -24,7 +24,7 @@ include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 
-opt debug: etc
+opt debug lcnt: etc
 
 .PHONY: etc
 etc: etp-commands
@@ -44,4 +44,4 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 .PHONY: release_spec
-release_spec: etc
\ No newline at end of file
+release_spec: etc
-- 
cgit v1.2.3


From 6166106ff9ff9d62b5d5966dbdb03e189e2a2bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 12 May 2017 14:52:19 +0200
Subject: Teach erlexec the -emu_type option

Add the option -emu_type to start an emulator of a certain
type. For exampe, "-emu_type lcnt" will start beam.lcnt.smp.
Any string will be accepted after -emu_type. If there is no
corresponding emulator, there will be an error similar to:

erlexec: The emulator '.../bin/x86_64-unknown-linux-gnu/beam.foo.smp' does not exist.

On Windows, there is an undocumented option "-debug". Remove
that option, because -emu_type can be used instead.
---
 erts/etc/common/erlexec.c | 105 ++++++++++++++++------------------------------
 1 file changed, 37 insertions(+), 68 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index f73c4ef1ca..70520eea15 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -184,17 +184,6 @@ static char *plusz_val_switches[] = {
 #endif
 
 #define SMP_SUFFIX	  ".smp"
-#define DEBUG_SUFFIX      ".debug"
-#define EMU_TYPE_SUFFIX_LENGTH  strlen(DEBUG_SUFFIX)
-
-/*
- * Define flags for different memory architectures.
- */
-#define EMU_TYPE_SMP		0x0001
-
-#ifdef __WIN32__
-#define EMU_TYPE_DEBUG		0x0004
-#endif
 
 void usage(const char *switchname);
 static void usage_format(char *format, ...);
@@ -221,7 +210,7 @@ static void *erealloc(void *p, size_t size);
 static void efree(void *p);
 static char* strsave(char* string);
 static int is_one_of_strings(char *str, char *strs[]);
-static char *write_str(char *to, char *from);
+static char *write_str(char *to, const char *from);
 static void get_home(void);
 static void add_epmd_port(void);
 #ifdef __WIN32__
@@ -255,9 +244,8 @@ static int verbose = 0;		/* If non-zero, print some extra information. */
 static int start_detached = 0;	/* If non-zero, the emulator should be
 				 * started detached (in the background).
 				 */
-static int emu_type = 0;	/* If non-zero, start beam.ARCH or beam.ARCH.exe
-				 * instead of beam or beam.exe, where ARCH is defined by flags. */
-static int emu_type_passed = 0;	/* Types explicitly set */
+static int start_smp_emu = 0;   /* Start the smp emulator. */
+static const char* emu_type = 0; /* Type of emulator (lcnt, valgrind, etc) */
 
 #ifdef __WIN32__
 static char *start_emulator_program = NULL; /* For detachec mode - 
@@ -352,11 +340,11 @@ free_env_val(char *value)
 }
 
 /*
- * Add the architecture suffix to the program name if needed,
- * except on Windows, where we insert it just before ".DLL".
+ * Add the type and architecture suffix to the program name if needed.
+ * On Windows, we insert it just before ".DLL".
  */
 static char*
-add_extra_suffixes(char *prog, int type)
+add_extra_suffixes(char *prog)
 {
    char *res;
    char *p;
@@ -366,16 +354,10 @@ add_extra_suffixes(char *prog, int type)
    int dll = 0;
 #endif
 
-   if (!type) {
-       return prog;
-   }
-
    len = strlen(prog);
 
-   /* Worst-case allocation */
-   p = emalloc(len +
-	       EMU_TYPE_SUFFIX_LENGTH +
-	       + 1);
+   /* Allocate enough extra space for suffixes */
+   p = emalloc(len + 100);
    res = p;
    p = write_str(p, prog);
 
@@ -392,13 +374,11 @@ add_extra_suffixes(char *prog, int type)
    }
 #endif
 
-#ifdef __WIN32__
-   if (type & EMU_TYPE_DEBUG) {
-       p = write_str(p, DEBUG_SUFFIX);
-       type &= ~(EMU_TYPE_DEBUG);
+   if (emu_type) {
+       p = write_str(p, ".");
+       p = write_str(p, emu_type);
    }
-#endif
-   if (type == EMU_TYPE_SMP) {
+   if (start_smp_emu) {
        p = write_str(p, SMP_SUFFIX);
    }
 #ifdef __WIN32__
@@ -489,12 +469,11 @@ int main(int argc, char **argv)
     cpuinfo = erts_cpu_info_create();
     /* '-smp auto' is default */ 
 #ifdef ERTS_HAVE_SMP_EMU
-    emu_type |= EMU_TYPE_SMP;
+    start_smp_emu = 1;
 #endif
 
 #if defined(__WIN32__) && defined(WIN32_ALWAYS_DEBUG)
-    emu_type_passed |= EMU_TYPE_DEBUG;
-    emu_type |= EMU_TYPE_DEBUG;
+    emu_type = "debug";
 #endif
 
     /* We need to do this before the ordinary processing. */
@@ -519,57 +498,42 @@ int main(int argc, char **argv)
 
 		if (strcmp(argv[i+1], "auto") == 0) {
 		    i++;
-		smp_auto:
-		    emu_type_passed |= EMU_TYPE_SMP;
-#if defined(ERTS_HAVE_PLAIN_EMU) && !defined(ERTS_HAVE_SMP_EMU)
-                    emu_type &= ~EMU_TYPE_SMP;
-#else
-                    emu_type |= EMU_TYPE_SMP;
-#endif
-		}
-		else if (strcmp(argv[i+1], "enable") == 0) {
+		} else if (strcmp(argv[i+1], "enable") == 0) {
 		    i++;
 		smp_enable:
-		    emu_type_passed |= EMU_TYPE_SMP;
-#ifdef ERTS_HAVE_SMP_EMU
-		    emu_type |= EMU_TYPE_SMP;
-#else
+                    ;
+#if !defined(ERTS_HAVE_SMP_EMU)
 		    usage_notsup("-smp enable", "");
 #endif
-		}
-		else if (strcmp(argv[i+1], "disable") == 0) {
+		} else if (strcmp(argv[i+1], "disable") == 0) {
 		    i++;
 		smp_disable:
-		    emu_type_passed &= ~EMU_TYPE_SMP;
 #ifdef ERTS_HAVE_PLAIN_EMU
-		    emu_type &= ~EMU_TYPE_SMP;
+                    start_smp_emu = 0;
 #else
                     usage_notsup("-smp disable", " Use \"+S 1\" instead.");
 #endif
-		}
-		else {
+		} else {
 		smp:
-
-		    emu_type_passed |= EMU_TYPE_SMP;
-#ifdef ERTS_HAVE_SMP_EMU
-		    emu_type |= EMU_TYPE_SMP;
-#else
+                    ;
+#if !defined(ERTS_HAVE_SMP_EMU)
 		    usage_notsup("-smp", "");
 #endif
 		}
 	    } else if (strcmp(argv[i], "-smpenable") == 0) {
 		goto smp_enable;
 	    } else if (strcmp(argv[i], "-smpauto") == 0) {
-		goto smp_auto;
+                ;
 	    } else if (strcmp(argv[i], "-smpdisable") == 0) {
 		goto smp_disable;
-#ifdef __WIN32__
-	    } else if (strcmp(argv[i], "-debug") == 0) {
-		emu_type_passed |= EMU_TYPE_DEBUG;
-		emu_type |= EMU_TYPE_DEBUG;
-#endif
 	    } else if (strcmp(argv[i], "-extra") == 0) {
 		break;
+	    } else if (strcmp(argv[i], "-emu_type") == 0) {
+		if (i + 1 >= argc) {
+                    usage(argv[i]);
+                }
+                emu_type = argv[i+1];
+                i++;
 	    }
 	}
 	i++;
@@ -582,7 +546,7 @@ int main(int argc, char **argv)
 	if (strcmp(malloc_lib, "libc") != 0)
 	    usage("+MYm");
     }
-    emu = add_extra_suffixes(emu, emu_type);
+    emu = add_extra_suffixes(emu);
     emu_name = strsave(emu);
     erts_snprintf(tmpStr, sizeof(tmpStr), "%s" DIRSEP "%s" BINARY_EXT, bindir, emu);
     emu = strsave(tmpStr);
@@ -1176,7 +1140,11 @@ int main(int argc, char **argv)
     {
 	execv(emu, Eargsp);
     }
-    error("Error %d executing \'%s\'.", errno, emu);
+    if (errno == ENOENT) {
+        error("The emulator \'%s\' does not exist.", emu);
+    } else {
+        error("Error %d executing \'%s\'.", errno, emu);
+    }
     return 1;
 #endif
 }
@@ -1376,7 +1344,7 @@ is_one_of_strings(char *str, char *strs[])
     return 0;
 }
 
-static char *write_str(char *to, char *from)
+static char *write_str(char *to, const char *from)
 {
     while (*from)
 	*(to++) = *(from++);
@@ -1903,6 +1871,7 @@ read_args_file(char *filename)
 #undef SAVE_CHAR
 }
 
+
 typedef struct {
     char **argv;
     int argc;
-- 
cgit v1.2.3


From 32ea8ba368c455afba07afd85bed6fb57879f56d Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Thu, 18 May 2017 20:42:04 +0200
Subject: Make statistics/1 aware of dirty run-queues and tasks

---
 erts/etc/unix/etp-commands.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index b7b3a2ae99..fc7b614c21 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -2810,10 +2810,10 @@ define etp-run-queue-info-internal
   else
     if ($sched_type == 1)
       printf "\n--- Dirty CPU Run Queue ---\n"
-      set $runq = &erts_aligned_run_queues[-1].runq
+      set $runq = &erts_aligned_run_queues[erts_no_run_queues].runq
     else
       printf "\n--- Dirty I/O Run Queue ---\n"
-      set $runq = &erts_aligned_run_queues[-2].runq
+      set $runq = &erts_aligned_run_queues[erts_no_run_queues+1].runq
     end
   end
   printf "  Length: total=%d", *((Uint32 *) &($runq->len))
-- 
cgit v1.2.3


From 068a8127d812e4c481fd2010242905fb0777263e Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 22 May 2017 09:55:22 +0200
Subject: erts: Optimize etp-processes and etp-ports

Not calculating the max, table and invalid addresses
each loop speeds up iterating through the processes list
by about 5x.
---
 erts/etc/unix/etp-commands.in | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index b7b3a2ae99..1c0c4c07d6 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -1,3 +1,4 @@
+# -*- gdb-script -*-
 #
 # %CopyrightBegin%
 # 
@@ -2153,13 +2154,22 @@ define etp-processes
     printf "No processes, since system isn't initialized!\n"
   else
     set $proc_ix = 0
-    while $proc_ix < erts_proc.r.o.max
-      set $proc = (Process *) *((UWord *) &erts_proc.r.o.tab[$proc_ix])
-      if ($proc != ((Process *) 0) && $proc != &erts_invalid_process)
+    set $proc_max_ix = erts_proc.r.o.max
+    set $proc_tab = erts_proc.r.o.tab
+    set $invalid_proc = &erts_invalid_process
+    set $proc_decentile = $proc_max_ix / 10
+    set $proc_printile = $proc_decentile
+    while $proc_ix < $proc_max_ix
+      set $proc = (Process *) *((UWord *) ($proc_tab + $proc_ix))
+      if ($proc != ((Process *) 0) && $proc != $invalid_proc)
         printf "---\n"
         printf "  Pix: %d\n", $proc_ix
         etp-process-info $proc
       end
+      if $proc_ix == $proc_printile
+        printf "--- %d%% (%d / %d) searched\n", $proc_printile / $proc_decentile * 10, $proc_ix, $proc_max_ix
+        set $proc_printile += $proc_decentile
+      end
       set $proc_ix++
     end
     printf "---\n",
@@ -2479,15 +2489,19 @@ document etp-port-info
 %---------------------------------------------------------------------------
 end
 
-
 define etp-ports
   if (!erts_initialized)
     printf "No ports, since system isn't initialized!\n"
   else
     set $port_ix = 0
-    while $port_ix < erts_port.r.o.max
-      set $port = (Port *) *((UWord *) &erts_port.r.o.tab[$port_ix])
-      if ($port != ((Port *) 0) && $port != &erts_invalid_port)
+    set $port_max_ix = erts_port.r.o.max
+    set $port_tab = erts_port.r.o.tab
+    set $invalid_port = &erts_invalid_port
+    set $port_decentile = $port_max_ix / 10
+    set $port_printile = $port_decentile
+    while $port_ix < $port_max_ix
+      set $port = (Port *) *((UWord *) ($port_tab + $port_ix))
+      if ($port != ((Port *) 0) && $port != $invalid_port)
         if (*(((Uint32 *) &(((Port *) $port)->state))) & 0x100) == 0
           # I.e, not free
           printf "---\n"
@@ -2495,6 +2509,10 @@ define etp-ports
           etp-port-info $port
         end
       end
+      if $port_ix == $port_printile
+        printf "--- %d%% (%d / %d) searched\n", $port_printile / $port_decentile * 10, $port_ix, $port_max_ix
+        set $port_printile += $port_decentile
+      end
       set $port_ix++
     end
     printf "---\n",
-- 
cgit v1.2.3


From 13f07042fd333c9bc137e142c4dc24b7d5cbe909 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Tue, 23 May 2017 12:43:33 +0200
Subject: Revert setting default argv0 name

Changing argv[0] from emu name to progname if ESCRIPT_NAME was not set
caused to many failing scripts, revert that part of the change.

See 86f6a9856
---
 erts/etc/common/erlexec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 70520eea15..51ed2d0dff 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -555,7 +555,7 @@ int main(int argc, char **argv)
     if(s) {
         add_Eargs(s);         /* argv[0] = scriptname*/
     } else {
-        add_Eargs(progname);  /* argv[0] = erl or cerl */
+        add_Eargs(emu);       /* argv[0] = erl or cerl */
     }
     /*
      * Add the bindir to the path (unless it is there already).
-- 
cgit v1.2.3


From 68de330d763fb450a763a2d56e63dbe009e12703 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 22 May 2017 15:49:15 +0200
Subject: Fix erlang system lookup from escript bug introduced in PR #1293

Erlang system found in PATH was used even when explicitly pointing out
the escript binary in another Erlang system.
---
 erts/etc/common/escript.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 630e241882..80cc25b040 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -433,7 +433,7 @@ main(int argc, char** argv)
     char* emulator;
     char* env;
     char* basename;
-    char* absname;
+    char* def_emu_lookup_path;
     char scriptname[PMAX];
     char** last_opt;
     char** first_opt;
@@ -480,6 +480,7 @@ main(int argc, char** argv)
 #else
     if (strcmp(basename, "escript") == 0) {
 #endif
+        def_emu_lookup_path = argv[0];
 	/*
 	 * Locate all options before the script name.
 	 */
@@ -498,27 +499,24 @@ main(int argc, char** argv)
 	argc--;
 	argv++;
     } else {
+        char *absname = find_prog(argv[0]);
 #ifdef __WIN32__
-	int len;
-#endif
-	absname = find_prog(argv[0]);
-#ifdef __WIN32__
-	len = strlen(absname);
+	int len = strlen(absname);
 	if (len >= 4 && _stricmp(absname+len-4, ".exe") == 0) {
 	    absname[len-4] = '\0';
 	}
 #endif
-
 	erts_snprintf(scriptname, sizeof(scriptname), "%s.escript",
 		      absname);
-	efree(absname);
+        efree(absname);
+        def_emu_lookup_path = scriptname;
     }
 
     /* Determine path to emulator */
     emulator = env = get_env("ESCRIPT_EMULATOR");
 
     if (emulator == NULL) {
-	emulator = get_default_emulator(scriptname);
+	emulator = get_default_emulator(def_emu_lookup_path);
     }
 
     if (strlen(emulator) >= PMAX)
-- 
cgit v1.2.3


From 385b18de6fd72672ed7d6736b30f56d6691d4433 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 23 May 2017 16:38:43 +0200
Subject: escript: Do not split path to Erlang system into multiple words

escript failed to start Erlang systems with spaces in the
absolute path (when absolute path was used).
---
 erts/etc/common/escript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 80cc25b040..7f0af77a4c 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -526,7 +526,7 @@ main(int argc, char** argv)
      * Push initial arguments.
      */
 
-    push_words(emulator);
+    PUSH(emulator);
     free_env_val(env);
 
     PUSH("+B");
-- 
cgit v1.2.3


From 43718d3b81d7f3d08e25047e22d579801bbe5044 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 14 Jun 2017 15:36:21 +0200
Subject: Update copyright year

---
 erts/etc/unix/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/etc')

diff --git a/erts/etc/unix/Makefile b/erts/etc/unix/Makefile
index 17de4d8878..83c64d35fd 100644
--- a/erts/etc/unix/Makefile
+++ b/erts/etc/unix/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2013-2016. All Rights Reserved.
+# Copyright Ericsson AB 2013-2017. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
-- 
cgit v1.2.3