Merge pull request #14 from basho/merge-upstream

Merge upstream

ChangeLog

@@ -1,9 +1,26 @@
-commit 83068510866bd95451b20b526ee9d15e29d19981
+commit 27619949b26c78b97c74d6cbdac3ca245f23a993
+Author: mats cronqvist <masse@cronqvi.st>
+Date:   Tue Oct 18 13:11:46 2016 +0200
+
+    v0.97.6
+
+src/eper.app.src
+
+commit e3e8c505c394a8931b70a3c3174492975ce6388e
+Author: mats cronqvist <masse@cronqvi.st>
+Date:   Tue Oct 18 13:11:06 2016 +0200
+
+    generalize option 'print_file' to handle 'user'
+
+src/redbug.erl
+
+commit f3cd90a084db51cd6d022ad619a213fb6341e3ea
 Author: mats cronqvist <masse@cronqvi.st>
 Date:   Tue Aug 23 11:21:22 2016 +0200
 
     v0.97.5
 
+ChangeLog
 src/eper.app.src
 
 commit dc3832da4302a95ecf21f82b6e8b7a2e59e67a16
@@ -1156,6 +1173,7 @@ Date:   Thu Apr 10 15:25:00 2014 +0200
 
 Makefile
 bin/release.sh
+release.sh
 
 commit 8dc9c9e7ba21ce1b59bc370eab46cba64ca3c7cf
 Author: mats cronqvist <masse@klarna.com>
@@ -1322,6 +1340,7 @@ Date:   Fri Dec 6 17:46:15 2013 +0100
     renamed getopt to solve name clash
 
 src/eper.erl
+src/getopt.erl
 src/getoptw.erl
 
 commit 1bd0d0212a563c1249fb66e9acd5760be30ff438
@@ -2439,6 +2458,11 @@ Date:   Sat Oct 16 13:30:01 2010 -0600
     Moving bin scripts to priv/bin
 
 bin/Makefile.am
+bin/dtop
+bin/gperf
+bin/ntop
+bin/redbug
+bin/sherk
 priv/bin/dtop
 priv/bin/gperf
 priv/bin/ntop
@@ -3569,6 +3593,7 @@ Date:   Wed Nov 12 13:40:28 2008 +0000
 
 src/Makefile.am
 src/gen_serv.hrl
+src/gen_server.hrl
 src/prfDog.erl
 
 commit a0727b608efb4adcd5441389b7968fed224e69ad
@@ -3729,12 +3754,14 @@ Date:   Wed Oct 22 10:32:04 2008 +0000
       watchdog integegration
 
 src/Makefile.am
+src/prfClient.erl
 src/prfConsumer.erl
 src/prfDog.erl
 src/prfTarg.erl
 src/prfTrc.erl
 src/sherk.erl
 src/sherk_list.erl
+src/watchdog_proxy.erl
 
 commit c30664281574f17c3c3128279bb6ba33786fb819
 Author: mats cronqvist <mats.cronqvist@gmail.com>
@@ -4082,8 +4109,43 @@ bin/sherk
 configure.ac
 doc/redbug.txt
 dtop/Makefile.am
+dtop/dtop
+dtop/dtop.erl
+dtop/dtopConsumer.erl
 gperf/Makefile.am
+gperf/gperf
+gperf/gperf.erl
+gperf/gperf.glade
+gperf/gperf.gladep
+gperf/gperfConsumer.erl
+gperf/gperfGtk.erl
+ntop/ntop
+ntop/ntop.erl
+ntop/ntopConsumer.erl
+prf/prf.erl
+prf/prfClient.erl
+prf/prfHost.erl
+prf/prfNet.erl
+prf/prfPrc.erl
+prf/prfSys.erl
+prf/prfTarg.erl
+prf/prfTrc.erl
+redbug/redbug
+redbug/redbug.erl
+redbug/redbug.txt
+redbug/redbugConsumer.erl
+sherk/sherk
+sherk/sherk.erl
+sherk/sherk.glade
+sherk/sherk.gladep
+sherk/sherk_aquire.erl
+sherk/sherk_ets.erl
+sherk/sherk_list.erl
+sherk/sherk_prof.erl
+sherk/sherk_scan.erl
 sherk/sherk_tab.erl
+sherk/sherk_target.erl
+sherk/sherk_tree.erl
 src/Makefile.am
 src/dtop.erl
 src/dtopConsumer.erl
@@ -4375,6 +4437,7 @@ Date:   Tue Dec 12 09:45:26 2006 +0000
 dtop/Makefile.am
 dtop/dtop.erl
 dtop/dtopConsumer.erl
+dtop/prfDtop.erl
 gperf/gperfConsumer.erl
 prf/Makefile.am
 prf/prf.erl

src/redbug.erl

@@ -35,7 +35,7 @@
           buffered     = false,        % output buffering
           discard      = false,        % discard messages (when counting)
           print_calls  = true,         % print calls
-          print_file   = "",           % file to print to (standard_io)
+          print_file   = standard_io,  % file to print to (standard_io)
           print_msec   = false,        % print milliseconds in timestamps?
           print_depth  = 999999,       % Limit for "~P" formatting depth
           print_re     = "",           % regexp that must match to print
@@ -431,7 +431,7 @@ mk_out(#cnf{print_re=RE,print_file=File}) ->
       end
   end.
 
-get_fd("") -> standard_io;
+get_fd(Atom) when is_atom(Atom)-> Atom;
 get_fd(FN) ->
   case file:open(FN,[write]) of
     {ok,FD} -> FD;