Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.appup.src

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl
index 822e1f939c..cc4941ee7d 100644
--- a/lib/os_mon/src/memsup.erl
+++ b/lib/os_mon/src/memsup.erl
@@ -176,9 +176,11 @@ init([]) ->
     PortMode = case OS of
 		   {unix, darwin} -> false;
 		   {unix, freebsd} -> false;
+		   {unix, dragonfly} -> false;
 		   % Linux supports this.
 		   {unix, linux} -> true;
 		   {unix, openbsd} -> true;
+		   {unix, netbsd} -> true;
 		   {unix, irix64} -> true;
 		   {unix, irix} -> true;
 		   {unix, sunos} -> true;
@@ -610,8 +612,10 @@ code_change(Vsn, PrevState, "1.8") ->
 	    PortMode = case OS of
 			   {unix, darwin} -> false;
 			   {unix, freebsd} -> false;
+			   {unix, dragonfly} -> false;
 			   {unix, linux} -> false;
 			   {unix, openbsd} -> true;
+			   {unix, netbsd} -> true;
 			   {unix, sunos} -> true;
 			   {win32, _OSname} -> false;
 			   vxworks -> true
@@ -687,6 +691,7 @@ get_os_wordsize({unix, linux})   -> get_os_wordsize_with_uname();
 get_os_wordsize({unix, darwin})  -> get_os_wordsize_with_uname();
 get_os_wordsize({unix, netbsd})  -> get_os_wordsize_with_uname();
 get_os_wordsize({unix, freebsd}) -> get_os_wordsize_with_uname();
+get_os_wordsize({unix, dragonfly}) -> get_os_wordsize_with_uname();
 get_os_wordsize({unix, openbsd}) -> get_os_wordsize_with_uname();
 get_os_wordsize(_)               -> unsupported_os.
 
@@ -736,7 +741,7 @@ get_memory_usage({unix,darwin}) ->
 
 %% FreeBSD: Look in /usr/include/sys/vmmeter.h for the format of struct
 %% vmmeter
-get_memory_usage({unix,freebsd}) ->
+get_memory_usage({unix,OSname}) when OSname == freebsd; OSname == dragonfly ->
     PageSize  = freebsd_sysctl("vm.stats.vm.v_page_size"),
     PageCount = freebsd_sysctl("vm.stats.vm.v_page_count"),
     FreeCount = freebsd_sysctl("vm.stats.vm.v_free_count"),
@@ -779,6 +784,9 @@ get_ext_memory_usage(OS, {Alloc, Total}) ->
 	{unix, freebsd} ->
 	    [{total_memory, Total}, {free_memory, Total-Alloc},
 	     {system_total_memory, Total}];
+	{unix, dragonfly} ->
+	    [{total_memory, Total}, {free_memory, Total-Alloc},
+	     {system_total_memory, Total}];
 	{unix, darwin} ->
 	    [{total_memory, Total}, {free_memory, Total-Alloc},
 	     {system_total_memory, Total}];