Merge branch 'lukas/erts/distr-frag-fixes'

* lukas/erts/distr-frag-fixes:
  Update run-dialyzer script to be more generic and aggressive
  erts: Fix memory leak for down/exit message

2 files changed, 71 insertions, 23 deletions

diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index d15db760a2..ec55a6913c 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1844,7 +1844,7 @@ int erts_net_message(Port *prt,
 
 	    if (locks)
 		erts_proc_unlock(rp, locks);
-	} else if (ede_hfrag) {
+	} else if (ede_hfrag != NULL) {
             erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
             free_message_buffer(ede_hfrag);
         }
@@ -1886,16 +1886,18 @@ int erts_net_message(Port *prt,
 	    goto invalid_message;
 	}
 	rp = erts_proc_lookup(to);
+
 	if (rp) {
 	    ErtsProcLocks locks = 0;
 
 	    erts_queue_dist_message(rp, locks, edep, ede_hfrag, token, am_Empty);
 	    if (locks)
 		erts_proc_unlock(rp, locks);
-	} else if (ede_hfrag) {
+        } else if (ede_hfrag != NULL) {
             erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
             free_message_buffer(ede_hfrag);
         }
+	
 	break;
     }
 
@@ -1936,15 +1938,19 @@ int erts_net_message(Port *prt,
             goto invalid_message;
         }
 
-        if (!erts_proc_lookup(watcher)) break; /* Process not alive */
-
-        if (reason == THE_NON_VALUE) {
+        if (!erts_proc_lookup(watcher)) {
+            if (ede_hfrag != NULL) {
+                erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
+                free_message_buffer(ede_hfrag);
+            }
+            break; /* Process not alive */
+        }
 
 #ifdef ERTS_DIST_MSG_DBG
+        if (reason == THE_NON_VALUE) {
             dist_msg_dbg(edep, "MSG", buf, orig_len);
-#endif
-
         }
+#endif
 
         erts_proc_sig_send_dist_monitor_down(
             dep, ref, watched, watcher, edep, ede_hfrag, reason);
@@ -1993,13 +1999,19 @@ int erts_net_message(Port *prt,
 	    goto invalid_message;
 	}
 
-        if (!erts_proc_lookup(to)) break; /* Process not alive */
+        if (!erts_proc_lookup(to)) {
+            if (ede_hfrag != NULL) {
+                erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
+                free_message_buffer(ede_hfrag);
+            }
+            break; /* Process not alive */
+        }
 
-        if (reason == THE_NON_VALUE) {
 #ifdef ERTS_DIST_MSG_DBG
+        if (reason == THE_NON_VALUE) {
             dist_msg_dbg(edep, "MSG", buf, orig_len);
-#endif
         }
+#endif
 
         erts_proc_sig_send_dist_link_exit(dep,
                                           from, to, edep, ede_hfrag,
@@ -2048,13 +2060,19 @@ int erts_net_message(Port *prt,
 	    goto invalid_message;
 	}
 
-        if (!erts_proc_lookup(to)) break; /* Process not alive */
+        if (!erts_proc_lookup(to)) {
+            if (ede_hfrag != NULL) {
+                erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
+                free_message_buffer(ede_hfrag);
+            }
+            break; /* Process not alive */
+        }
 
-        if (reason == THE_NON_VALUE) {
 #ifdef ERTS_DIST_MSG_DBG
+        if (reason == THE_NON_VALUE) {
             dist_msg_dbg(edep, "MSG", buf, orig_len);
-#endif
         }
+#endif
 
         erts_proc_sig_send_dist_exit(dep, from, to, edep, ede_hfrag, reason, token);
 	break;
diff --git a/scripts/run-dialyzer b/scripts/run-dialyzer
index 621de3fa65..44436594d3 100755
--- a/scripts/run-dialyzer
+++ b/scripts/run-dialyzer
@@ -1,17 +1,47 @@
 #!/bin/bash
 
 set -e
-set -x
 
-$ERL_TOP/bin/dialyzer --build_plt --apps asn1 compiler crypto dialyzer edoc erts et ftp hipe inets kernel mnesia observer public_key runtime_tools snmp ssh ssl stdlib syntax_tools tftp wx xmerl --statistics
-$ERL_TOP/bin/dialyzer -n -Wunknown -Wunmatched_returns --apps compiler erts ftp tftp kernel stdlib asn1 crypto dialyzer hipe parsetools public_key runtime_tools sasl tools --statistics
-$ERL_TOP/bin/dialyzer -n --apps common_test debugger edoc ftp inets mnesia observer ssh ssl syntax_tools tftp wx xmerl --statistics
+filter () {
+    FILTER_RESULT=""
+    for app in $1; do
+        if echo " $2 " | grep -v " $app " > /dev/null; then
+            FILTER_RESULT="$FILTER_RESULT $app"
+        fi
+    done
+}
+
+ALL_APPLICATIONS=$(ls -d -1 lib/*/ | sed 's:^lib\|/::g')
+echo "All applications: $ALL_APPLICATIONS" |tr '\n' ' ' && echo ""
+
+BASE_PLT="compiler crypto erts hipe kernel stdlib syntax_tools"
+APP_PLT="asn1 edoc et ftp inets mnesia observer public_key sasl runtime_tools snmp ssl tftp wx xmerl tools"
+NO_UNMATCHED="common_test debugger edoc eunit ftp inets mnesia observer reltool ssh ssl syntax_tools tftp wx xmerl"
+WARNINGS="diameter megaco snmp"
+
+TRAVIS_SKIP=""
+if [ "X$TRAVIS" = "Xtrue" ]; then
+   TRAVIS_SKIP="common_test eldap erl_docgen odbc eunit reltool os_mon diameter megaco snmp"
+fi
+
+filter "$ALL_APPLICATIONS" "$NO_UNMATCHED $WARNINGS $TRAVIS_SKIP"
+UNMATCHED=$FILTER_RESULT
+filter "$APP_PLT" "$TRAVIS_SKIP"
+APP_PLT=$FILTER_RESULT
+filter "$NO_UNMATCHED" "$TRAVIS_SKIP"
+NO_UNMATCHED=$FILTER_RESULT
+filter "$WARNINGS" "$TRAVIS_SKIP"
+WARNINGS=$FILTER_RESULT
 
-# In travis we don't dialyze everything as it takes too much time
-if [ "X$TRAVIS" != "Xtrue" ]; then
-    $ERL_TOP/bin/dialyzer -n -Wunknown -Wunmatched_returns --apps eldap erl_docgen et odbc --statistics
-    $ERL_TOP/bin/dialyzer -n --apps eunit reltool os_mon --statistics
+echo "UNMATCHED = $UNMATCHED"
+echo "NO_UNMATCHED = $NO_UNMATCHED"
+echo "WARNINGS = $WARNINGS"
+
+set -x
 
-    # These application are not run always as the currently have dialyzer warnings
-    # $ERL_TOP/bin/dialyzer -n --apps diameter megaco snmp --statistics
+$ERL_TOP/bin/dialyzer --build_plt -Wunknown --apps $BASE_PLT $APP_PLT --statistics
+$ERL_TOP/bin/dialyzer -n -Wunknown -Wunmatched_returns --apps $UNMATCHED --statistics
+$ERL_TOP/bin/dialyzer -n -Wunknown --apps $NO_UNMATCHED --statistics
+if [ "X$WARNINGS" != "X" ]; then
+    $ERL_TOP/bin/dialyzer -n --apps $WARNINGS --statistics
 fi