auser-poolparty 0.2.16 → 0.2.20
Sign up to get free protection for your applications and to get access to all the features.
- data/Manifest.txt +72 -7
- data/PostInstall.txt +1 -1
- data/Rakefile +11 -0
- data/bin/cloud-provision +6 -10
- data/bin/server-build-messenger +20 -0
- data/bin/server-fire-cmd +0 -2
- data/bin/server-list-responding +24 -0
- data/bin/server-start-master +4 -9
- data/bin/server-start-node +7 -6
- data/lib/erlang/messenger/Emakefile +1 -0
- data/lib/erlang/messenger/Rakefile +29 -20
- data/lib/erlang/messenger/ebin/master_app.beam +0 -0
- data/lib/erlang/messenger/ebin/node_app.beam +0 -0
- data/lib/erlang/messenger/ebin/packager.app +19 -0
- data/lib/erlang/messenger/ebin/pm_client.beam +0 -0
- data/lib/erlang/messenger/ebin/pm_cluster.beam +0 -0
- data/lib/erlang/messenger/ebin/pm_event_handler.beam +0 -0
- data/lib/erlang/messenger/ebin/pm_master.beam +0 -0
- data/lib/erlang/messenger/ebin/pm_master_rel-0.1.rel +1 -7
- data/lib/erlang/messenger/ebin/pm_master_supervisor.beam +0 -0
- data/lib/erlang/messenger/ebin/pm_node.beam +0 -0
- data/lib/erlang/messenger/ebin/pm_node_rel-0.1.rel +1 -7
- data/lib/erlang/messenger/ebin/pm_node_supervisor.beam +0 -0
- data/lib/erlang/messenger/ebin/pm_packager.beam +0 -0
- data/lib/erlang/messenger/ebin/utils.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/AUTHORS +2 -0
- data/lib/erlang/messenger/lib/eunit/CHANGELOG +14 -0
- data/lib/erlang/messenger/lib/eunit/COPYING +504 -0
- data/lib/erlang/messenger/lib/eunit/Makefile +28 -0
- data/lib/erlang/messenger/lib/eunit/NOTES +276 -0
- data/lib/erlang/messenger/lib/eunit/README +3 -0
- data/lib/erlang/messenger/lib/eunit/doc/edoc-info +3 -0
- data/lib/erlang/messenger/lib/eunit/doc/erlang.png +0 -0
- data/lib/erlang/messenger/lib/eunit/doc/eunit.html +172 -0
- data/lib/erlang/messenger/lib/eunit/doc/index.html +17 -0
- data/lib/erlang/messenger/lib/eunit/doc/modules-frame.html +12 -0
- data/lib/erlang/messenger/lib/eunit/doc/overview-summary.html +984 -0
- data/lib/erlang/messenger/lib/eunit/doc/overview.edoc +980 -0
- data/lib/erlang/messenger/lib/eunit/doc/packages-frame.html +11 -0
- data/lib/erlang/messenger/lib/eunit/doc/stylesheet.css +55 -0
- data/lib/erlang/messenger/lib/eunit/ebin/autoload.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/code_monitor.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit.app +21 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit.appup +1 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_autoexport.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_data.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_lib.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_proc.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_serial.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_server.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_striptests.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_test.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_tests.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_tty.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/file_monitor.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/examples/eunit_examples.erl +339 -0
- data/lib/erlang/messenger/lib/eunit/examples/fib.erl +19 -0
- data/lib/erlang/messenger/lib/eunit/examples/tests.txt +1 -0
- data/lib/erlang/messenger/lib/eunit/include/eunit.hrl +313 -0
- data/lib/erlang/messenger/lib/eunit/src/Makefile +46 -0
- data/lib/erlang/messenger/lib/eunit/src/autoload.erl +388 -0
- data/lib/erlang/messenger/lib/eunit/src/code_monitor.erl +243 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit.app.src +21 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit.appup.src +1 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit.erl +196 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_autoexport.erl +102 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_data.erl +798 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_internal.hrl +48 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_lib.erl +682 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_proc.erl +552 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_serial.erl +157 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_server.erl +340 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_striptests.erl +64 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_test.erl +334 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_tests.erl +45 -0
- data/lib/erlang/messenger/lib/eunit/src/eunit_tty.erl +272 -0
- data/lib/erlang/messenger/lib/eunit/src/file_monitor.erl +409 -0
- data/lib/erlang/messenger/lib/eunit/sys.config +9 -0
- data/lib/erlang/messenger/lib/eunit/vsn.mk +1 -0
- data/lib/erlang/messenger/pm_master_rel-0.1.boot +0 -0
- data/lib/erlang/messenger/pm_master_rel-0.1.script +75 -2
- data/lib/erlang/messenger/pm_node_rel-0.1.boot +0 -0
- data/lib/erlang/messenger/pm_node_rel-0.1.script +75 -2
- data/lib/erlang/messenger/src/pm_client.erl +8 -3
- data/lib/erlang/messenger/src/pm_cluster.erl +32 -9
- data/lib/erlang/messenger/src/pm_master.erl +10 -11
- data/lib/erlang/messenger/src/pm_node.erl +2 -3
- data/lib/erlang/messenger/src/pm_packager.erl +73 -0
- data/lib/erlang/messenger/src/utils.erl +3 -10
- data/lib/poolparty/base_packages/heartbeat.rb +9 -9
- data/lib/poolparty/base_packages/poolparty.rb +16 -10
- data/lib/poolparty/config/allowed_commands.yml +1 -0
- data/lib/poolparty/core/object.rb +8 -0
- data/lib/poolparty/exceptions/UnacceptableCommand.rb +5 -0
- data/lib/poolparty/helpers/messenger.rb +29 -0
- data/lib/poolparty/helpers/provisioner_base.rb +7 -7
- data/lib/poolparty/helpers/provisioners/master.rb +3 -7
- data/lib/poolparty/helpers/provisioners/slave.rb +1 -0
- data/lib/poolparty/modules/cloud_resourcer.rb +7 -5
- data/lib/poolparty/modules/configurable.rb +1 -1
- data/lib/poolparty/modules/method_missing_sugar.rb +6 -1
- data/lib/poolparty/modules/pretty_printer.rb +1 -0
- data/lib/poolparty/modules/resourcing_dsl.rb +2 -1
- data/lib/poolparty/monitors/monitors/cpu_monitor.rb +1 -1
- data/lib/poolparty/net/remoter.rb +3 -1
- data/lib/poolparty/plugins/git.rb +3 -3
- data/lib/poolparty/pool/base.rb +7 -2
- data/lib/poolparty/pool/cloud.rb +3 -3
- data/lib/poolparty/pool/resource.rb +38 -24
- data/lib/poolparty/pool/resources/class_package.rb +2 -2
- data/lib/poolparty/pool/resources/conditional.rb +8 -4
- data/lib/poolparty/pool/resources/{gem.rb → gem_package.rb} +0 -0
- data/lib/poolparty/pool/resources/package.rb +8 -1
- data/lib/poolparty/version.rb +1 -1
- data/lib/poolparty.rb +1 -1
- data/poolparty.gemspec +476 -61
- data/spec/poolparty/core/object_spec.rb +20 -0
- data/spec/poolparty/helpers/messenger_spec.rb +14 -0
- data/spec/poolparty/helpers/provisioners/master_spec.rb +2 -2
- data/spec/poolparty/net/remoter_spec.rb +1 -1
- data/spec/poolparty/plugins/git_spec.rb +26 -19
- data/spec/poolparty/pool/base_spec.rb +20 -2
- data/spec/poolparty/pool/cloud_spec.rb +256 -249
- data/spec/poolparty/pool/custom_resource_spec.rb +6 -1
- data/spec/poolparty/pool/plugin_spec.rb +71 -65
- data/spec/poolparty/pool/resource_spec.rb +314 -237
- data/spec/poolparty/pool/resources/class_package_spec.rb +71 -66
- data/spec/poolparty/pool/resources/conditional_spec.rb +30 -26
- data/spec/poolparty/pool/resources/gem_spec.rb +18 -14
- data/spec/poolparty/pool/resources/variable_spec.rb +1 -1
- data/spec/poolparty/pool/script_spec.rb +46 -37
- data/spec/poolparty/spec_helper.rb +4 -0
- data/tasks/cloud.rake +0 -54
- data/tasks/development.rake +11 -14
- data/tasks/ec2.rake +10 -17
- data/tasks/instance.rake +0 -61
- data/website/index.html +1 -1
- metadata +83 -10
@@ -0,0 +1,388 @@
|
|
1
|
+
%% This library is free software; you can redistribute it and/or modify
|
2
|
+
%% it under the terms of the GNU Lesser General Public License as
|
3
|
+
%% published by the Free Software Foundation; either version 2 of the
|
4
|
+
%% License, or (at your option) any later version.
|
5
|
+
%%
|
6
|
+
%% This library is distributed in the hope that it will be useful, but
|
7
|
+
%% WITHOUT ANY WARRANTY; without even the implied warranty of
|
8
|
+
%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
9
|
+
%% Lesser General Public License for more details.
|
10
|
+
%%
|
11
|
+
%% You should have received a copy of the GNU Lesser General Public
|
12
|
+
%% License along with this library; if not, write to the Free Software
|
13
|
+
%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
14
|
+
%% USA
|
15
|
+
%%
|
16
|
+
%% $Id: autoload.erl 238 2007-11-15 10:23:54Z mremond $
|
17
|
+
%%
|
18
|
+
%% @private (for now)
|
19
|
+
%% @author Richard Carlsson <richardc@it.uu.se>
|
20
|
+
%% @copyright 2006 Richard Carlsson
|
21
|
+
%% @doc Erlang automatic code loading service
|
22
|
+
|
23
|
+
-module(autoload).
|
24
|
+
|
25
|
+
-export([start/0, start/1, stop/0, stop/1,
|
26
|
+
watch_module/1, watch_module/2, watch_module/3,
|
27
|
+
watch_file/1, watch_file/2, watch_file/3,
|
28
|
+
watch_dir/1, watch_dir/2, watch_dir/3
|
29
|
+
]).
|
30
|
+
|
31
|
+
-include_lib("kernel/include/file.hrl").
|
32
|
+
|
33
|
+
-define(SERVER, autoload).
|
34
|
+
-define(ZERO_TIMESTAMP, {0,0,0}).
|
35
|
+
|
36
|
+
%% TODO: un-watching functionality
|
37
|
+
|
38
|
+
%% We're not trying to provide strong guarantees here. The autoloader is
|
39
|
+
%% supposed to behave like a human assistant might - race conditions may
|
40
|
+
%% cause modules to be reloaded twice, or cause a reload from the wrong
|
41
|
+
%% file (if paths are suddenly changed).
|
42
|
+
|
43
|
+
|
44
|
+
watch_dir(Path) ->
|
45
|
+
watch_dir(Path, []).
|
46
|
+
|
47
|
+
watch_dir(Path, Opts) ->
|
48
|
+
watch_dir(?SERVER, Path, Opts).
|
49
|
+
|
50
|
+
watch_dir(Server, Path, Opts) ->
|
51
|
+
command(Server, {watch, {dir, filename:flatten(Path)}, Opts}).
|
52
|
+
|
53
|
+
watch_file(Path) ->
|
54
|
+
watch_file(Path, []).
|
55
|
+
|
56
|
+
watch_file(Path, Opts) ->
|
57
|
+
watch_file(?SERVER, Path, Opts).
|
58
|
+
|
59
|
+
watch_file(Server, Path, Opts) ->
|
60
|
+
command(Server, {watch, {file, filename:flatten(Path)}, Opts}).
|
61
|
+
|
62
|
+
watch_module(Module) ->
|
63
|
+
watch_module(Module, []).
|
64
|
+
|
65
|
+
watch_module(Module, Opts) ->
|
66
|
+
watch_module(?SERVER, Module, Opts).
|
67
|
+
|
68
|
+
watch_module(Server, Module, Opts) when is_atom(Module) ->
|
69
|
+
command(Server, {watch, {module, Module}, Opts}).
|
70
|
+
|
71
|
+
|
72
|
+
command(Server, Msg) ->
|
73
|
+
ServerPid = ensure_started(Server),
|
74
|
+
ServerPid ! {command, self(), Msg},
|
75
|
+
receive
|
76
|
+
{ServerPid, Result} -> Result
|
77
|
+
end.
|
78
|
+
|
79
|
+
stop() ->
|
80
|
+
stop(?SERVER).
|
81
|
+
|
82
|
+
stop(Server) ->
|
83
|
+
Server ! stop,
|
84
|
+
ok.
|
85
|
+
|
86
|
+
ensure_started(Name) when is_atom(Name) ->
|
87
|
+
start(Name);
|
88
|
+
ensure_started(Pid) when is_pid(Pid) ->
|
89
|
+
Pid.
|
90
|
+
|
91
|
+
|
92
|
+
start() ->
|
93
|
+
start(?SERVER).
|
94
|
+
|
95
|
+
start(Name) ->
|
96
|
+
case whereis(Name) of
|
97
|
+
undefined ->
|
98
|
+
Parent = self(),
|
99
|
+
Pid = spawn(fun () -> server_init(Name, Parent) end),
|
100
|
+
receive
|
101
|
+
{Pid, ok} -> Pid;
|
102
|
+
{Pid, error} -> throw(no_server)
|
103
|
+
end;
|
104
|
+
Pid -> Pid
|
105
|
+
end.
|
106
|
+
|
107
|
+
-record(state, {name, modules, files, dirs}).
|
108
|
+
|
109
|
+
-record(module, {time = ?ZERO_TIMESTAMP, file, opts = []}).
|
110
|
+
|
111
|
+
server_init(Name, Parent) ->
|
112
|
+
Self = self(),
|
113
|
+
case catch register(Name, Self) of
|
114
|
+
true ->
|
115
|
+
Parent ! {Self, ok},
|
116
|
+
code_monitor:monitor(self()),
|
117
|
+
server(#state{name = Name,
|
118
|
+
modules = dict:new(),
|
119
|
+
files = dict:new(),
|
120
|
+
dirs = dict:new()});
|
121
|
+
_ ->
|
122
|
+
init_failure(Parent)
|
123
|
+
end.
|
124
|
+
|
125
|
+
init_failure(Parent) ->
|
126
|
+
Parent ! {self(), error},
|
127
|
+
exit(failed).
|
128
|
+
|
129
|
+
server(St) ->
|
130
|
+
receive
|
131
|
+
{file_monitor, _Ref, Msg} ->
|
132
|
+
file_event(Msg, St);
|
133
|
+
{code_monitor, Msg} ->
|
134
|
+
code_event(Msg, St);
|
135
|
+
{command, From, Cmd} ->
|
136
|
+
server_command(From, Cmd, St);
|
137
|
+
stop ->
|
138
|
+
exit(normal);
|
139
|
+
Msg ->
|
140
|
+
erlang:display({autoload_unexpected, Msg}),
|
141
|
+
server(St)
|
142
|
+
end.
|
143
|
+
|
144
|
+
server_command_reply(From, Msg) ->
|
145
|
+
From ! {self(), Msg}.
|
146
|
+
|
147
|
+
server_command(From, {watch, {dir, Path}, Opts}, St) ->
|
148
|
+
server_command_reply(From, ok),
|
149
|
+
server(monitor_dir(Path, Opts, St));
|
150
|
+
server_command(From, {watch, {file, Path}, Opts}, St) ->
|
151
|
+
server_command_reply(From, ok),
|
152
|
+
server(monitor_file(Path, Opts, St));
|
153
|
+
server_command(From, {watch, {module, M}, Opts}, St) ->
|
154
|
+
server_command_reply(From, ok),
|
155
|
+
server(monitor_module(M, Opts, St)).
|
156
|
+
|
157
|
+
file_event({exists, Path, dir, _Info, Files}, St) ->
|
158
|
+
%%erlang:display({autoload_saw_exists, dir, Path}),
|
159
|
+
server(monitor_objs(Path, Files, St));
|
160
|
+
file_event({exists, Path, file, Info, _}, St) ->
|
161
|
+
%%erlang:display({autoload_saw_exists, file, Path}),
|
162
|
+
%% treat file-exists messages just like file-changed messages
|
163
|
+
server(changed_file(Path, Info#file_info.mtime, St));
|
164
|
+
file_event({changed, Path, dir, _Info, Files}, St) ->
|
165
|
+
%%erlang:display({autoload_saw_changed, dir, Path}),
|
166
|
+
server(monitor_objs(Path, Files, St));
|
167
|
+
file_event({changed, Path, file, #file_info{}=Info, _}, St) ->
|
168
|
+
%%erlang:display({autoload_saw_changed, file, Path}),
|
169
|
+
server(changed_file(Path, Info#file_info.mtime, St));
|
170
|
+
file_event({error, _Path, file, _ErrorAtom}=_Msg, St) ->
|
171
|
+
%%erlang:display({autoload_ignoring, _Msg}),
|
172
|
+
%% just consider the files as being temporarily unavailable
|
173
|
+
server(St);
|
174
|
+
file_event(_Msg, St) ->
|
175
|
+
erlang:display({autoload_unexpected_file_event, _Msg}),
|
176
|
+
server(St).
|
177
|
+
|
178
|
+
code_event({loaded, M, Time}, St) ->
|
179
|
+
%%erlang:display({autoload_saw_loaded, M, Time}),
|
180
|
+
server(loaded_module(M, Time, St));
|
181
|
+
code_event(_Msg, St) ->
|
182
|
+
erlang:display({autoload_unexpected_code_event, _Msg}),
|
183
|
+
server(St).
|
184
|
+
|
185
|
+
|
186
|
+
%% called when asked to watch a module M
|
187
|
+
|
188
|
+
monitor_module(M, Opts, St) ->
|
189
|
+
ensure_loaded(M, "", Opts),
|
190
|
+
case code:which(M) of
|
191
|
+
non_existing ->
|
192
|
+
%% no module loaded or found in path (e.g., the user has not
|
193
|
+
%% run 'make' yet, or has not updated the path): store
|
194
|
+
%% mapping from M to undefined file, for late binding
|
195
|
+
store_record(M, #module{opts = Opts}, St);
|
196
|
+
File when is_list(File) ->
|
197
|
+
%% existing file found (already loaded or in path): monitor
|
198
|
+
%% the file and map M to that file (even if the first load
|
199
|
+
%% might turn out to be from another file)
|
200
|
+
store_record(M, #module{file = File},
|
201
|
+
monitor_file(File, Opts, St));
|
202
|
+
_ ->
|
203
|
+
%% preloaded or cover-compiled module - ignore
|
204
|
+
St
|
205
|
+
end.
|
206
|
+
|
207
|
+
%% called when a monitored directory is detected as new or changed
|
208
|
+
|
209
|
+
monitor_objs(Path, Files, St) ->
|
210
|
+
Opts = get_dir_opts(Path, St),
|
211
|
+
ObjExt = file:objfile_extension(),
|
212
|
+
Objs = [F || {added, F} <- Files, filename:extension(F) == ObjExt],
|
213
|
+
lists:foldl(
|
214
|
+
fun (F, St) ->
|
215
|
+
F1 = filename:absname(filename:join(Path, F)),
|
216
|
+
%%erlang:display({autoload_monitoring, file, F1}),
|
217
|
+
monitor_file(F1, Opts, St)
|
218
|
+
end,
|
219
|
+
St,
|
220
|
+
Objs).
|
221
|
+
|
222
|
+
get_dir_opts(Path, St) ->
|
223
|
+
case dict:find(Path, St#state.dirs) of
|
224
|
+
{ok, {_Ref, Opts}} -> Opts;
|
225
|
+
error -> []
|
226
|
+
end.
|
227
|
+
|
228
|
+
%% called when a module was detected as loaded or reloaded (either
|
229
|
+
%% caused by an auto-load or by someone else)
|
230
|
+
|
231
|
+
loaded_module(M, Time, St) ->
|
232
|
+
case find_record(M, St) of
|
233
|
+
{ok, R} ->
|
234
|
+
File = code:which(M),
|
235
|
+
case R#module.file of
|
236
|
+
undefined when is_list(File) ->
|
237
|
+
%% a watched module gets a late binding to a file
|
238
|
+
%%erlang:display({autoload_late_binding, M, File}),
|
239
|
+
Opts = R#module.opts,
|
240
|
+
update_record(M, R, Time, File,
|
241
|
+
monitor_file(File, Opts, St));
|
242
|
+
File when is_list(File) ->
|
243
|
+
%% loaded from watched file - update the load time
|
244
|
+
update_record(M, R, Time, File, St);
|
245
|
+
_ ->
|
246
|
+
St %% not loaded from the watched file
|
247
|
+
end;
|
248
|
+
error ->
|
249
|
+
St %% uninteresting module
|
250
|
+
end.
|
251
|
+
|
252
|
+
|
253
|
+
%% called whenever a file has changed and exists
|
254
|
+
|
255
|
+
changed_file(File, Time, St) ->
|
256
|
+
%% always reread the module name from the file
|
257
|
+
case obj_module(File) of
|
258
|
+
{module, M} ->
|
259
|
+
case find_record(M, St) of
|
260
|
+
{ok, R} ->
|
261
|
+
check_reload(M, File, Time, R),
|
262
|
+
St;
|
263
|
+
error ->
|
264
|
+
%% first time we see this module: map to file
|
265
|
+
%% and don't try to reload
|
266
|
+
R = #module{file = File},
|
267
|
+
store_record(M, R, St)
|
268
|
+
end;
|
269
|
+
error ->
|
270
|
+
St %% bad file - ignore until changed again
|
271
|
+
end.
|
272
|
+
|
273
|
+
|
274
|
+
%% check if a module needs to be reloaded, when its file has changed
|
275
|
+
|
276
|
+
check_reload(M, File, Time, R) ->
|
277
|
+
%%erlang:display({autoload_checking, M, File, Time, R}),
|
278
|
+
case ((R#module.file == File)
|
279
|
+
andalso is_loaded(M)
|
280
|
+
andalso (code:which(M) == File)
|
281
|
+
andalso is_newer(Time, R#module.time))
|
282
|
+
of
|
283
|
+
true ->
|
284
|
+
reload(M);
|
285
|
+
false ->
|
286
|
+
ok
|
287
|
+
end.
|
288
|
+
|
289
|
+
|
290
|
+
reload(M) ->
|
291
|
+
erlang:display({autoload_loading, M}),
|
292
|
+
code:purge(M),
|
293
|
+
code:load_file(M).
|
294
|
+
|
295
|
+
update_record(M, R, Time, File, St) ->
|
296
|
+
store_record(M, R#module{time = Time, file = File}, St).
|
297
|
+
|
298
|
+
find_record(M, St) ->
|
299
|
+
dict:find(M, St#state.modules).
|
300
|
+
|
301
|
+
store_record(M, R, St) ->
|
302
|
+
St#state{modules = dict:store(M, R, St#state.modules)}.
|
303
|
+
|
304
|
+
%% we must remember watched files/dirs, so we don't set up more than one
|
305
|
+
%% file monitor for the same path, and so we can cancel monitors; for
|
306
|
+
%% dirs, we also remember options
|
307
|
+
|
308
|
+
monitor_file(Path, Opts, St) ->
|
309
|
+
ensure_loaded([], Path, Opts),
|
310
|
+
case dict:is_key(Path, St#state.files) of
|
311
|
+
true ->
|
312
|
+
%%erlang:display({autoload_already_watching, Path}),
|
313
|
+
St;
|
314
|
+
false ->
|
315
|
+
{ok, _, Ref} = file_monitor:monitor_file(Path, self()),
|
316
|
+
St#state{files = dict:store(Path, Ref, St#state.files)}
|
317
|
+
end.
|
318
|
+
|
319
|
+
monitor_dir(Path, Opts, St) ->
|
320
|
+
case dict:is_key(Path, St#state.dirs) of
|
321
|
+
true ->
|
322
|
+
%%erlang:display({autoload_already_watching, Path}),
|
323
|
+
St;
|
324
|
+
false ->
|
325
|
+
{ok, _, Ref} = file_monitor:monitor_dir(Path, self()),
|
326
|
+
St#state{dirs = dict:store(Path, {Ref, Opts},
|
327
|
+
St#state.dirs)}
|
328
|
+
end.
|
329
|
+
|
330
|
+
%% try to ensure that a module/file is loaded (M is [] if unknown;
|
331
|
+
%% File is "" if unknown)
|
332
|
+
|
333
|
+
ensure_loaded(M, File, Opts) ->
|
334
|
+
case proplists:get_bool(load, Opts) of
|
335
|
+
true when is_atom(M) ->
|
336
|
+
ensure_loaded_1(M, File); %% known module name
|
337
|
+
true when M == [] ->
|
338
|
+
case obj_module(File) of
|
339
|
+
{module, Module} ->
|
340
|
+
ensure_loaded_1(Module, File);
|
341
|
+
error ->
|
342
|
+
ok %% couldn't load
|
343
|
+
end;
|
344
|
+
false -> ok
|
345
|
+
end.
|
346
|
+
|
347
|
+
ensure_loaded_1(M, File) ->
|
348
|
+
%% always try to load using the path first
|
349
|
+
case code:ensure_loaded(M) of
|
350
|
+
{module, _} ->
|
351
|
+
ok;
|
352
|
+
{error, _} when File == [] ->
|
353
|
+
ok; %% ignore error
|
354
|
+
{error, _} ->
|
355
|
+
%% try loading directly from the file
|
356
|
+
code:load_abs(File) %% ignore result
|
357
|
+
end.
|
358
|
+
|
359
|
+
%% find name of module stored in an object file
|
360
|
+
|
361
|
+
obj_module(File) ->
|
362
|
+
case beam_lib:info(File) of
|
363
|
+
List when is_list(List) ->
|
364
|
+
case lists:keysearch(module, 1, List) of
|
365
|
+
{value, {module, M}} ->
|
366
|
+
{module, M};
|
367
|
+
_ ->
|
368
|
+
error
|
369
|
+
end;
|
370
|
+
_ ->
|
371
|
+
error
|
372
|
+
end.
|
373
|
+
|
374
|
+
%% check if the file timestamp (on DateTime format) is newer than
|
375
|
+
%% the module load-time (on Now-format)
|
376
|
+
|
377
|
+
is_newer(DateTime, LoadTime) ->
|
378
|
+
calendar:datetime_to_gregorian_seconds(DateTime) >
|
379
|
+
calendar:datetime_to_gregorian_seconds(
|
380
|
+
calendar:now_to_local_time(LoadTime)).
|
381
|
+
|
382
|
+
%% wrapper for code:is_loaded/1
|
383
|
+
|
384
|
+
is_loaded(Module) ->
|
385
|
+
case code:is_loaded(Module) of
|
386
|
+
{file, _} -> true;
|
387
|
+
false -> false
|
388
|
+
end.
|
@@ -0,0 +1,243 @@
|
|
1
|
+
%% This library is free software; you can redistribute it and/or modify
|
2
|
+
%% it under the terms of the GNU Lesser General Public License as
|
3
|
+
%% published by the Free Software Foundation; either version 2 of the
|
4
|
+
%% License, or (at your option) any later version.
|
5
|
+
%%
|
6
|
+
%% This library is distributed in the hope that it will be useful, but
|
7
|
+
%% WITHOUT ANY WARRANTY; without even the implied warranty of
|
8
|
+
%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
9
|
+
%% Lesser General Public License for more details.
|
10
|
+
%%
|
11
|
+
%% You should have received a copy of the GNU Lesser General Public
|
12
|
+
%% License along with this library; if not, write to the Free Software
|
13
|
+
%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
14
|
+
%% USA
|
15
|
+
%%
|
16
|
+
%% $Id: code_monitor.erl 238 2007-11-15 10:23:54Z mremond $
|
17
|
+
%%
|
18
|
+
%% @private (for now)
|
19
|
+
%% @author Richard Carlsson <richardc@it.uu.se>
|
20
|
+
%% @copyright 2006 Richard Carlsson
|
21
|
+
%% @doc Erlang code monitoring service
|
22
|
+
|
23
|
+
-module(code_monitor).
|
24
|
+
|
25
|
+
-export([start/0, start/1, stop/0, stop/1, monitor/1, monitor/2,
|
26
|
+
demonitor/1, demonitor/2, install_codespy/1, wiretap/3]).
|
27
|
+
|
28
|
+
-export([main/1]). %% private
|
29
|
+
|
30
|
+
|
31
|
+
-define(SERVER, code_monitor).
|
32
|
+
|
33
|
+
monitor(Pid) ->
|
34
|
+
monitor(?SERVER, Pid).
|
35
|
+
|
36
|
+
monitor(Server, Pid) when is_pid(Pid) ->
|
37
|
+
ensure_started(Server),
|
38
|
+
Server ! {monitor, Pid},
|
39
|
+
ok.
|
40
|
+
|
41
|
+
demonitor(Pid) ->
|
42
|
+
demonitor(?SERVER, Pid).
|
43
|
+
|
44
|
+
demonitor(Server, Pid) when is_pid(Pid) ->
|
45
|
+
ensure_started(Server),
|
46
|
+
Server ! {demonitor, Pid},
|
47
|
+
ok.
|
48
|
+
|
49
|
+
stop() ->
|
50
|
+
stop(?SERVER).
|
51
|
+
|
52
|
+
stop(Server) ->
|
53
|
+
Server ! stop,
|
54
|
+
ok.
|
55
|
+
|
56
|
+
ensure_started(Name) when is_atom(Name) ->
|
57
|
+
start(Name);
|
58
|
+
ensure_started(Pid) when is_pid(Pid) ->
|
59
|
+
Pid.
|
60
|
+
|
61
|
+
start() ->
|
62
|
+
start(?SERVER).
|
63
|
+
|
64
|
+
start(Name) ->
|
65
|
+
case whereis(Name) of
|
66
|
+
undefined ->
|
67
|
+
Parent = self(),
|
68
|
+
Pid = spawn(fun () -> server_init(Name, Parent) end),
|
69
|
+
receive
|
70
|
+
{Pid, ok} -> Pid;
|
71
|
+
{Pid, error} -> throw(no_server)
|
72
|
+
end;
|
73
|
+
Pid -> Pid
|
74
|
+
end.
|
75
|
+
|
76
|
+
server_init(undefined = Name, Parent) ->
|
77
|
+
%% anonymous server
|
78
|
+
server_init_1(Name, Parent);
|
79
|
+
server_init(Name, Parent) ->
|
80
|
+
case catch register(Name, self()) of
|
81
|
+
true ->
|
82
|
+
server_init_1(Name, Parent);
|
83
|
+
_ ->
|
84
|
+
init_failure(Parent)
|
85
|
+
end.
|
86
|
+
|
87
|
+
server_init_1(Name, Parent) ->
|
88
|
+
case install_codespy(self()) of
|
89
|
+
{ok, _Spy} ->
|
90
|
+
Parent ! {self(), ok},
|
91
|
+
server(Name, sets:new());
|
92
|
+
{error, _} ->
|
93
|
+
init_failure(Parent)
|
94
|
+
end.
|
95
|
+
|
96
|
+
init_failure(Parent) ->
|
97
|
+
Parent ! {self(), error},
|
98
|
+
exit(failed).
|
99
|
+
|
100
|
+
server(Name, Listeners) ->
|
101
|
+
?MODULE:main({Name, Listeners}).
|
102
|
+
|
103
|
+
%% @private
|
104
|
+
main({Name, Listeners}) ->
|
105
|
+
receive
|
106
|
+
{code_server, {module, M}} ->
|
107
|
+
cast({loaded, M, erlang:now()}, Listeners),
|
108
|
+
server(Name, Listeners);
|
109
|
+
{monitor, Pid} when is_pid(Pid) ->
|
110
|
+
server(Name, sets:add_element(Pid, Listeners));
|
111
|
+
{demonitor, Pid} ->
|
112
|
+
server(Name, sets:del_element(Pid, Listeners));
|
113
|
+
stop ->
|
114
|
+
exit(normal);
|
115
|
+
_ ->
|
116
|
+
server(Name, Listeners)
|
117
|
+
end.
|
118
|
+
|
119
|
+
cast(M, Listeners) ->
|
120
|
+
sets:fold(fun (L, M) -> L ! M end, {code_monitor, M}, Listeners).
|
121
|
+
|
122
|
+
|
123
|
+
%% code server spy process using generic wiretap functionality
|
124
|
+
|
125
|
+
install_codespy(To) ->
|
126
|
+
wiretap(code_server, To, fun code_spy/3).
|
127
|
+
|
128
|
+
code_spy({code_call,From,{load_file,_}=Req}, Server, To) ->
|
129
|
+
handle_load(Req, From, Req, Server, To);
|
130
|
+
code_spy({code_call,From,{ensure_loaded,M}=Req}=Msg, Server, To) ->
|
131
|
+
case erlang:module_loaded(M) of
|
132
|
+
true -> Server ! Msg;
|
133
|
+
false -> handle_load(Req, From, Req, Server, To)
|
134
|
+
end;
|
135
|
+
code_spy({code_call,From,{load_abs,_,_}=Req}, Server, To) ->
|
136
|
+
handle_load(Req, From, Req, Server, To);
|
137
|
+
code_spy({code_call,From,{load_binary,_,_,_}=Req}, Server, To) ->
|
138
|
+
handle_load(Req, From, Req, Server, To);
|
139
|
+
code_spy({code_call,From,{load_native_partial,_,_}=Req}, Server, To) ->
|
140
|
+
handle_load(Req, From, Req, Server, To);
|
141
|
+
code_spy({code_call,From,{load_native_sticky,_,_,_}=Req}, Server, To) ->
|
142
|
+
handle_load(Req, From, Req, Server, To);
|
143
|
+
code_spy(Msg, Server, _To) ->
|
144
|
+
Server ! Msg.
|
145
|
+
|
146
|
+
handle_load(Req, From, Req, Server, To) ->
|
147
|
+
ReplyTo = spawn(fun () -> reply_handler(Server, From, To) end),
|
148
|
+
Server ! {code_call, ReplyTo, Req}.
|
149
|
+
|
150
|
+
%% one-shot processes - receive, pass on and die
|
151
|
+
reply_handler(Server, Client, To) ->
|
152
|
+
link(Server),
|
153
|
+
receive
|
154
|
+
{code_server, _Reply} = M ->
|
155
|
+
To ! Client ! M
|
156
|
+
end.
|
157
|
+
|
158
|
+
%% basic wiretapping of registered processes (it should be possible to
|
159
|
+
%% have several wiretaps attached to the same registered name; they will
|
160
|
+
%% transparently form a chain, without knowing about each other)
|
161
|
+
|
162
|
+
wiretap(Name, To, F) when is_atom(Name), is_pid(To), is_function(F) ->
|
163
|
+
Parent = self(),
|
164
|
+
Pid = spawn(fun () -> wiretap_init(Name, To, F, Parent) end),
|
165
|
+
receive
|
166
|
+
{Pid, Result} -> Result
|
167
|
+
end.
|
168
|
+
|
169
|
+
wiretap_init(Name, To, F, Parent) ->
|
170
|
+
case whereis(Name) of
|
171
|
+
undefined ->
|
172
|
+
Parent ! {self(), {error, undefined}},
|
173
|
+
exit(error);
|
174
|
+
Pid ->
|
175
|
+
catch unregister(Name),
|
176
|
+
catch register(Name, self()),
|
177
|
+
Self = self(),
|
178
|
+
case whereis(Name) of
|
179
|
+
Self ->
|
180
|
+
process_flag(trap_exit, true),
|
181
|
+
link(Pid),
|
182
|
+
link(To),
|
183
|
+
Parent ! {self(), {ok, self()}},
|
184
|
+
wiretap_loop(Name, To, Pid, F);
|
185
|
+
_ ->
|
186
|
+
Parent ! {self(), {error, register_failed}},
|
187
|
+
exit(error)
|
188
|
+
end
|
189
|
+
end.
|
190
|
+
|
191
|
+
wiretap_loop(Name, To, Pid, F) ->
|
192
|
+
receive
|
193
|
+
{'EXIT', Pid, _} ->
|
194
|
+
wiretap_dropped(Name, To, F);
|
195
|
+
{'EXIT', To, _} ->
|
196
|
+
wiretap_exit(Name, Pid);
|
197
|
+
Msg ->
|
198
|
+
F(Msg, Pid, To),
|
199
|
+
wiretap_loop(Name, To, Pid, F)
|
200
|
+
end.
|
201
|
+
|
202
|
+
%% note that the registered name might get stolen from the spy process,
|
203
|
+
%% e.g., by another active wiretap
|
204
|
+
|
205
|
+
wiretap_exit(Name, Pid) ->
|
206
|
+
%% the receiver died - restore things and go away invisibly
|
207
|
+
unlink(Pid),
|
208
|
+
Self = self(),
|
209
|
+
%% sadly, this is not atomic...
|
210
|
+
case whereis(Name) of
|
211
|
+
Self ->
|
212
|
+
catch unregister(Name),
|
213
|
+
catch register(Name, Pid);
|
214
|
+
_ -> ok
|
215
|
+
end,
|
216
|
+
exit(normal).
|
217
|
+
|
218
|
+
%% if the real server goes away, make sure to unregister, and keep watch
|
219
|
+
%% in order to restart the wiretap when the server comes up again
|
220
|
+
|
221
|
+
wiretap_dropped(Name, To, F) ->
|
222
|
+
Self = self(),
|
223
|
+
case whereis(Name) of
|
224
|
+
Self -> (catch unregister(Name));
|
225
|
+
_ -> ok
|
226
|
+
end,
|
227
|
+
wiretap_watch(Name, To, F).
|
228
|
+
|
229
|
+
wiretap_watch(Name, To, F) ->
|
230
|
+
receive
|
231
|
+
{'EXIT', To, _} ->
|
232
|
+
exit(normal)
|
233
|
+
after 1000 ->
|
234
|
+
case whereis(Name) of
|
235
|
+
Pid when is_pid(Pid) ->
|
236
|
+
%% this process will terminate after starting the
|
237
|
+
%% new wiretap (even it that call fails)
|
238
|
+
wiretap(Name, To, F),
|
239
|
+
exit(normal);
|
240
|
+
_ ->
|
241
|
+
wiretap_watch(Name, To, F)
|
242
|
+
end
|
243
|
+
end.
|
@@ -0,0 +1,21 @@
|
|
1
|
+
% This is an -*- erlang -*- file.
|
2
|
+
|
3
|
+
{application, eunit,
|
4
|
+
[{description, "EUnit"},
|
5
|
+
{vsn, "%VSN%"},
|
6
|
+
{modules, [eunit,
|
7
|
+
eunit_autoexport,
|
8
|
+
eunit_striptests,
|
9
|
+
eunit_server,
|
10
|
+
eunit_proc,
|
11
|
+
eunit_serial,
|
12
|
+
eunit_test,
|
13
|
+
eunit_lib,
|
14
|
+
eunit_data,
|
15
|
+
eunit_tty,
|
16
|
+
code_monitor,
|
17
|
+
file_monitor,
|
18
|
+
autoload]},
|
19
|
+
{registered,[]},
|
20
|
+
{applications, [stdlib]},
|
21
|
+
{env, []}]}.
|
@@ -0,0 +1 @@
|
|
1
|
+
{"%VSN%",[],[]}.
|