Skip to content

Commit

Permalink
integrate with travis. remove all the gtk stuff.
Browse files Browse the repository at this point in the history
make travis use latest vsns of erlang 15, 16, 17, and 18.
move sherk et al to its own repo.
  • Loading branch information
massemanet committed Jul 14, 2015
1 parent fec69b7 commit 436919d
Show file tree
Hide file tree
Showing 28 changed files with 58 additions and 3,974 deletions.
15 changes: 15 additions & 0 deletions .travis.yml
@@ -0,0 +1,15 @@
language: erlang

notifications:
email: false

otp_release:
- 18.0
- 17.5
- R16B03-1
- R15B03

script:
make test

sudo: false
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -16,7 +16,7 @@ clean:
test: compile eunit xref dialyze

eunit:
@$(REBAR) eunit
ERL_FLAGS="-sname eunit" $(REBAR) eunit

xref: all
@$(REBAR) xref
Expand Down
8 changes: 0 additions & 8 deletions README

This file was deleted.

8 changes: 8 additions & 0 deletions README.md
@@ -0,0 +1,8 @@
[![Build Status](https://travis-ci.org/massemanet/eper.svg?branch=master)](https://travis-ci.org/massemanet/eper)

eper is a loose collection of Erlang Performance related tools.

* dtop - similar to unix top
* ntop - visualizes network traffic
* atop - shows various aspects of the VM allocators
* redbug - similar to the OTP dbg application, but safer, better etc.
2 changes: 1 addition & 1 deletion priv/bin/Makefile.am
@@ -1,4 +1,4 @@
bindir = $(ERLANG_INSTALL_LIB_DIR_eper)/priv/bin
dist_bin_SCRIPTS = dtop gperf ntop redbug sherk
dist_bin_SCRIPTS = dtop ntop redbug

EXTRA_DIST = $(dist_bin_SCRIPTS)
94 changes: 0 additions & 94 deletions priv/bin/gperf

This file was deleted.

74 changes: 0 additions & 74 deletions priv/bin/sherk

This file was deleted.

1 change: 0 additions & 1 deletion rebar.config
@@ -1,7 +1,6 @@
%-*- mode: erlang; erlang-indent-level: 2 -*-
{erl_opts, [debug_info, warnings_as_errors]}.
{xref_checks, [undefined_function_calls]}.
{xref_extra_paths, ["../gtknode/src"]}.
{cover_enabled, true}.
{cover_print_enabled, true}.
{escript_name, "priv/bin/eper"}.
43 changes: 30 additions & 13 deletions rebar.config.script
@@ -1,17 +1,34 @@
%% -*- mode: erlang;erlang-indent-level: 2;indent-tabs-mode: nil -*-
%% vim: set ft=erlang ts=2 sw=2:

KeyAppend = fun(Tag,[],E,_) ->[{Tag,[E]}];
(Tag,[{Tag,O}|T],E,_)->[{Tag,[E|O]}|T];
(Tag,[H|T],E,G) ->[H|G(Tag,T,E,G)]
end,
code:ensure_loaded(crypto),
CONFIG2 = case erlang:function_exported(crypto,block_encrypt,3) of
true -> KeyAppend(erl_opts,CONFIG,{d,'CRYPTO_R16'},KeyAppend);
false -> CONFIG
end.
%% this code is not particularly nice.
%% the idea is to test for the presence of functions, in order to set
%% preprocessor flags, so that we can use the preprocessor to hide new
%% functions from old compilers.
%% "erl_opts" gets passed to the compiler.
%% "CONFIG" is a magic rebar thing.

case erlang:is_builtin(erlang,timestamp,0) of
true -> KeyAppend(erl_opts,CONFIG2,{d,'HAS_TIMESTAMP'},KeyAppend);
false -> CONFIG2
end.
KeyAppend =
fun(Tag,[],E,_) -> [{Tag,[E]}];
(Tag,[{Tag,O}|T],E,_) -> [{Tag,[E|O]}|T];
(Tag,[H|T],E,G) -> [H|G(Tag,T,E,G)]
end,

Crypto =
fun(CFG) ->
code:ensure_loaded(crypto),
case erlang:function_exported(crypto,block_encrypt,3) of
true -> KeyAppend(erl_opts,CFG,{d,'CRYPTO_R16'},KeyAppend);
false -> CFG
end
end,

Timestamp =
fun(CFG) ->
case erlang:is_builtin(erlang,timestamp,0) of
true -> KeyAppend(erl_opts,CFG,{d,'HAS_TIMESTAMP'},KeyAppend);
false -> CFG
end
end,

lists:foldl(fun(F,Cfg) -> F(Cfg) end,CONFIG,[Crypto,Timestamp]).
11 changes: 1 addition & 10 deletions src/Makefile.am
@@ -1,34 +1,25 @@
erlsrcdir = $(ERLANG_INSTALL_LIB_DIR_eper)/src
erlincdir = $(ERLANG_INSTALL_LIB_DIR_eper)/src
gladedir = $(ERLANG_INSTALL_LIB_DIR_eper)/priv/glade
erlbeamdir = $(ERLANG_INSTALL_LIB_DIR_eper)/ebin

erlsrc_DATA = \
bread.erl bread_server.erl \
dtop.erl dtopConsumer.erl dtop_replay.erl \
gperf.erl gperfConsumer.erl gperfGtk.erl \
gen_serv.erl \
ntop.erl ntopConsumer.erl \
prfNet.erl prfSys.erl prfPrc.erl prfTrc.erl prfDog.erl \
prf.erl prfHost.erl prfTarg.erl prfConsumer.erl prf_crypto.erl \
redbug.erl redbug_msc.erl redbugConsumer.erl \
sherk.erl sherk_tab.erl sherk_prof.erl \
sherk_tree.erl sherk_list.erl sherk_scan.erl sherk_aquire.erl \
sherk_target.erl sherk_ets.erl \
watchdog.erl watchdogConsumer.erl watchdogLogger.erl \
replay_trc.erl \
loggerConsumer.erl logReader.erl

erlinc_DATA = \
log.hrl gen_serv.hrl

glade_DATA = \
gperf.gladep gperf.glade \
sherk.gladep sherk.glade

erlbeam_DATA = $(patsubst %.erl, %.beam, $(erlsrc_DATA))

EXTRA_DIST = $(erlsrc_DATA) $(erlinc_DATA) $(glade_DATA)
EXTRA_DIST = $(erlsrc_DATA) $(erlinc_DATA)
CLEANFILES = $(erlbeam_DATA)

all: $(erlbeam_DATA)
Expand Down
13 changes: 0 additions & 13 deletions src/gperf.erl

This file was deleted.

0 comments on commit 436919d

Please sign in to comment.