runtime_tools: Remove VxWorks

4 files changed, 39 insertions, 71 deletions

diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
index 754e6ccd78..586f649924 100644
--- a/lib/runtime_tools/c_src/Makefile.in
+++ b/lib/runtime_tools/c_src/Makefile.in
@@ -46,9 +46,6 @@ LDFLAGS += $(DED_LDFLAGS)
 DTRACE_LIBNAME = dyntrace
 
 SYSINCLUDE = $(DED_SYS_INCLUDE)
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-	SYSINCLUDE += -I$(ERL_TOP)/erts/etc/vxworks
-endif
 
 TRACE_DRV_INCLUDES = $(SYSINCLUDE)
 
@@ -101,12 +98,8 @@ ifeq ($(findstring win32,$(TARGET)), win32)
 SOLIBS = $(LIBDIR)/trace_ip_drv.dll $(LIBDIR)/trace_file_drv.dll
 LN=cp
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-SOLIBS = $(LIBDIR)/trace_ip_drv.eld $(LIBDIR)/trace_file_drv.eld
-else
 SOLIBS = $(LIBDIR)/trace_ip_drv.so $(LIBDIR)/trace_file_drv.so
 endif
-endif
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -165,15 +158,6 @@ $(LIBDIR)/trace_ip_drv.dll: $(TRACE_IP_DRV_OBJS)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 $(LIBDIR)/trace_file_drv.dll: $(TRACE_FILE_DRV_OBJS)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-#
-# VxWorks is simply to different from Unix in this sense.
-# Here are the inference rules for VxWorks
-#
-$(LIBDIR)/trace_ip_drv.eld: $(TRACE_IP_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ 
-
-$(LIBDIR)/trace_file_drv.eld: $(TRACE_FILE_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ 
 
 clean:
 	rm -f $(SOLIBS) $(TRACE_IP_DRV_OBJS) $(TRACE_FILE_DRV_OBJS)
diff --git a/lib/runtime_tools/c_src/trace_ip_drv.c b/lib/runtime_tools/c_src/trace_ip_drv.c
index 6b77128761..a7d132ca6e 100644
--- a/lib/runtime_tools/c_src/trace_ip_drv.c
+++ b/lib/runtime_tools/c_src/trace_ip_drv.c
@@ -34,21 +34,12 @@
 #include <stdlib.h>
 #include <string.h>
 #ifndef __WIN32__
-#    ifdef VXWORKS
-#        include <sockLib.h>
-#        include <sys/times.h>
-#        include <iosLib.h>
-#        include <taskLib.h>
-#        include <selectLib.h>
-#        include <ioLib.h>
-#        include "reclaim.h"
-#    endif 
-#        include <unistd.h>
-#        include <errno.h>
-#        include <sys/types.h>
-#        include <sys/socket.h>
-#        include <netinet/in.h>
-#        include <fcntl.h>
+# include <unistd.h>
+# include <errno.h>
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <fcntl.h>
 #endif
 
 #ifdef DEBUG
@@ -910,7 +901,7 @@ static void stop_select(ErlDrvEvent event, void* _)
     WSACloseEvent((HANDLE)event);
 }
 
-#else /* UNIX/VXWORKS */
+#else /* UNIX */
 
 static int my_driver_select(TraceIpData *desc, SOCKET fd, int flags, enum MySelectOp op)
 {
diff --git a/lib/runtime_tools/src/dbg.erl b/lib/runtime_tools/src/dbg.erl
index 385047ee73..d35c8e781e 100644
--- a/lib/runtime_tools/src/dbg.erl
+++ b/lib/runtime_tools/src/dbg.erl
@@ -431,10 +431,8 @@ trace_port1(file, Filename, Options) ->
     fun() ->
 	    Name = filename:absname(Filename), 
 	    %% Absname is needed since the driver uses 
-	    %% the supplied name without further investigations, 
-	    %% and if the name is relative the resulting path 
-	    %% might be too long which can cause a bus error
-	    %% on vxworks instead of a nice error code return.
+	    %% the supplied name without further investigations.
+
 	    %% Also, the absname must be found inside the fun,
 	    %% in case the actual node where the port shall be
 	    %% started is on another node (or even another host)
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index bd908c1f3a..4071b159a1 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -394,41 +394,36 @@ file_port2(suite) ->
 file_port2(doc) ->
     ["Test tracing to file port with 'follow_file'"];
 file_port2(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped, "VxWorks NFS cache ruins it all."};
-	_ ->
-	    ?line stop(),
-	    ?line {A,B,C} = erlang:now(),
-	    ?line FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
-		"-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
-	    ?line FName = filename:join([?config(data_dir, Config), FTMP]),
-	    %% Ok, lets try with flush and follow_file, not a chance on VxWorks
-	    %% with NFS caching...
-	    ?line Port2 = dbg:trace_port(file, FName),
-	    ?line {ok, _} = dbg:tracer(port, Port2),
-	    try
-		?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
-		?line {ok, _} = dbg:tp(dbg, ltp,[{'_',[],[{message, {self}}]}]),
-		?line {ok, _} = dbg:tp(dbg, ln, [{'_',[],[{message, hej}]}]),
-		?line ok = dbg:ltp(),
-		?line ok = dbg:flush_trace_port(),
-		?line dbg:trace_client(follow_file, FName,
-				       {fun myhandler/2, self()}),
-		?line S = self(),
-		?line [{trace,S,call,{dbg,ltp,[]},S}] = flush(),
-		?line ok = dbg:ln(),
-		?line ok = dbg:flush_trace_port(),
-		?line receive after 1000 -> ok end, %% Polls every second...
-		?line [{trace,S,call,{dbg,ln,[]},hej}] = flush(),
-		?line stop(),
-		?line [] = flush()
-	    after
-		?line stop(),
-		?line file:delete(FName)
-	    end,
-	    ok
-    end.
+    stop(),
+    {A,B,C} = erlang:now(),
+    FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
+	"-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
+    FName = filename:join([?config(data_dir, Config), FTMP]),
+    %% Ok, lets try with flush and follow_file, not a chance on VxWorks
+    %% with NFS caching...
+    Port2 = dbg:trace_port(file, FName),
+    {ok, _} = dbg:tracer(port, Port2),
+    try
+	{ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+	{ok, _} = dbg:tp(dbg, ltp,[{'_',[],[{message, {self}}]}]),
+	{ok, _} = dbg:tp(dbg, ln, [{'_',[],[{message, hej}]}]),
+	ok = dbg:ltp(),
+	ok = dbg:flush_trace_port(),
+	dbg:trace_client(follow_file, FName,
+	  	       {fun myhandler/2, self()}),
+	S = self(),
+	[{trace,S,call,{dbg,ltp,[]},S}] = flush(),
+	ok = dbg:ln(),
+	ok = dbg:flush_trace_port(),
+	receive after 1000 -> ok end, %% Polls every second...
+	[{trace,S,call,{dbg,ln,[]},hej}] = flush(),
+	stop(),
+	[] = flush()
+    after
+	stop(),
+	file:delete(FName)
+    end,
+    ok.
 
 file_port_schedfix(suite) ->
     [];