ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.56 by root, Wed Aug 30 08:28:33 2006 UTC vs.
Revision 1.93 by root, Thu Dec 21 22:41:35 2006 UTC

5use Storable; 5use Storable;
6use Opcode; 6use Opcode;
7use Safe; 7use Safe;
8use Safe::Hole; 8use Safe::Hole;
9 9
10use IO::AIO ();
11use YAML::Syck ();
10use Time::HiRes; 12use Time::HiRes;
11use Event; 13use Event;
12$Event::Eval = 1; # no idea why this is required, but it is 14$Event::Eval = 1; # no idea why this is required, but it is
13 15
16# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
17$YAML::Syck::ImplicitUnicode = 1;
18
14use strict; 19use strict;
15 20
16_reload_1; 21sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
17 22
18our %COMMAND = (); 23our %COMMAND = ();
24our %COMMAND_TIME = ();
25our %EXTCMD = ();
26
27_init_vars;
28
19our @EVENT; 29our @EVENT;
20our %PROP_TYPE; 30our $LIBDIR = datadir . "/ext";
21our %PROP_IDX;
22our $LIBDIR = maps_directory "perl";
23 31
24our $TICK = MAX_TIME * 1e-6; 32our $TICK = MAX_TIME * 1e-6;
25our $TICK_WATCHER; 33our $TICK_WATCHER;
26our $NEXT_TICK; 34our $NEXT_TICK;
35
36our %CFG;
37
38our $UPTIME; $UPTIME ||= time;
39
40#############################################################################
41
42=head2 GLOBAL VARIABLES
43
44=over 4
45
46=item $cf::UPTIME
47
48The timestamp of the server start (so not actually an uptime).
49
50=item $cf::LIBDIR
51
52The perl library directory, where extensions and cf-specific modules can
53be found. It will be added to C<@INC> automatically.
54
55=item $cf::TICK
56
57The interval between server ticks, in seconds.
58
59=item %cf::CFG
60
61Configuration for the server, loaded from C</etc/crossfire/config>, or
62from wherever your confdir points to.
63
64=back
65
66=cut
27 67
28BEGIN { 68BEGIN {
29 *CORE::GLOBAL::warn = sub { 69 *CORE::GLOBAL::warn = sub {
30 my $msg = join "", @_; 70 my $msg = join "", @_;
31 $msg .= "\n" 71 $msg .= "\n"
34 print STDERR "cfperl: $msg"; 74 print STDERR "cfperl: $msg";
35 LOG llevError, "cfperl: $msg"; 75 LOG llevError, "cfperl: $msg";
36 }; 76 };
37} 77}
38 78
39my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply! 79@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
40 80@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
41# generate property mutators 81@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
42sub prop_gen { 82@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
43 my ($prefix, $class) = @_; 83@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
44
45 no strict 'refs';
46
47 for my $prop (keys %PROP_TYPE) {
48 $prop =~ /^\Q$prefix\E_(.*$)/ or next;
49 my $sub = lc $1;
50
51 my $type = $PROP_TYPE{$prop};
52 my $idx = $PROP_IDX {$prop};
53
54 *{"$class\::get_$sub"} = *{"$class\::$sub"} = sub {
55 $_[0]->get_property ($type, $idx)
56 };
57
58 *{"$class\::set_$sub"} = sub {
59 $_[0]->set_property ($type, $idx, $_[1]);
60 } unless $ignore_set{$prop};
61 }
62}
63
64# auto-generate most of the API
65
66prop_gen OBJECT_PROP => "cf::object";
67# CFAPI_OBJECT_ANIMATION?
68prop_gen PLAYER_PROP => "cf::object::player";
69
70prop_gen MAP_PROP => "cf::map";
71prop_gen ARCH_PROP => "cf::arch";
72
73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 84@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
74 85
75# we bless all objects into (empty) derived classes to force a method lookup 86# we bless all objects into (empty) derived classes to force a method lookup
76# within the Safe compartment. 87# within the Safe compartment.
77for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) { 88for my $pkg (qw(
89 cf::global
90 cf::object cf::object::player
91 cf::client cf::player
92 cf::arch cf::living
93 cf::map cf::party cf::region
94)) {
78 no strict 'refs'; 95 no strict 'refs';
79 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 96 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
80} 97}
81 98
82$Event::DIED = sub { 99$Event::DIED = sub {
84}; 101};
85 102
86my %ext_pkg; 103my %ext_pkg;
87my @exts; 104my @exts;
88my @hook; 105my @hook;
89my %command;
90my %extcmd;
91 106
92############################################################################# 107=head2 UTILITY FUNCTIONS
93# utility functions 108
109=over 4
110
111=cut
94 112
95use JSON::Syck (); # TODO# replace by JSON::PC once working 113use JSON::Syck (); # TODO# replace by JSON::PC once working
114
115=item $ref = cf::from_json $json
116
117Converts a JSON string into the corresponding perl data structure.
118
119=cut
96 120
97sub from_json($) { 121sub from_json($) {
98 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs 122 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
99 JSON::Syck::Load $_[0] 123 JSON::Syck::Load $_[0]
100} 124}
101 125
126=item $json = cf::to_json $ref
127
128Converts a perl data structure into its JSON representation.
129
130=cut
131
102sub to_json($) { 132sub to_json($) {
103 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 133 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
104 JSON::Syck::Dump $_[0] 134 JSON::Syck::Dump $_[0]
105} 135}
106 136
137=back
138
139=cut
140
107############################################################################# 141#############################################################################
108# "new" plug-in system
109 142
110=head3 EVENTS AND OBJECT ATTACHMENTS 143=head2 ATTACHABLE OBJECTS
144
145You can define and attach attachments to each "attachable" object in
146crossfire+ (objects, players, clients, maps and the special "global"
147class). In the following description, CLASS can be any of C<global>,
148C<object> C<player>, C<client> or C<map>.
111 149
112=over 4 150=over 4
113 151
114=item $object->attach ($attachment, key => $value...) 152=item cf::CLASS::attachment $name, ...
115 153
116=item $object->detach ($attachment) 154Register an attachment by name through which attachable objects can refer
155to this attachment.
117 156
118Attach/detach a pre-registered attachment to an object.
119
120=item $player->attach ($attachment, key => $value...)
121
122=item $player->detach ($attachment)
123
124Attach/detach a pre-registered attachment to a player.
125
126=item $map->attach ($attachment, key => $value...)
127
128=item $map->detach ($attachment)
129
130Attach/detach a pre-registered attachment to a map.
131
132=item $bool = $object->attached ($name)
133
134=item $bool = $player->attached ($name)
135
136=item $bool = $map->attached ($name) 157=item $bool = $attachable->attached ($name)
137 158
138Checks wether the named attachment is currently attached to the object. 159Checks wether the named attachment is currently attached to the object.
139 160
140=item cf::attach_global ... 161=item $attachable->attach ($attachment, key => $value...)
141 162
142Attach handlers for global events. 163=item $attachable->detach ($attachment)
143 164
144This and all following C<attach_*>-functions expect any number of the 165Attach/detach a pre-registered attachment either to a specific object
145following handler/hook descriptions: 166(C<$attachable>) or all objects of the given class (if C<$attachable> is a
167class in a static method call).
168
169You can attach to global events by using the C<cf::global> class.
170
171These method calls expect any number of the following handler/hook
172descriptions:
146 173
147=over 4 174=over 4
148 175
149=item prio => $number 176=item prio => $number
150 177
152by another C<prio> setting). Lower priority handlers get executed 179by another C<prio> setting). Lower priority handlers get executed
153earlier. The default priority is C<0>, and many built-in handlers are 180earlier. The default priority is C<0>, and many built-in handlers are
154registered at priority C<-1000>, so lower priorities should not be used 181registered at priority C<-1000>, so lower priorities should not be used
155unless you know what you are doing. 182unless you know what you are doing.
156 183
184=item type => $type
185
186(Only for C<< cf::object->attach >> calls), limits the attachment to the
187given type of objects only (the additional parameter C<subtype> can be
188used to further limit to the given subtype).
189
157=item on_I<event> => \&cb 190=item on_I<event> => \&cb
158 191
159Call the given code reference whenever the named event happens (event is 192Call the given code reference whenever the named event happens (event is
160something like C<instantiate>, C<apply>, C<use_skill> and so on, and which 193something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
161handlers are recognised generally depends on the type of object these 194handlers are recognised generally depends on the type of object these
170package and register them. Only handlers for eevents supported by the 203package and register them. Only handlers for eevents supported by the
171object/class are recognised. 204object/class are recognised.
172 205
173=back 206=back
174 207
175=item cf::attach_to_type $object_type, $subtype, ...
176
177Attach handlers for a specific object type (e.g. TRANSPORT) and
178subtype. If C<$subtype> is zero or undef, matches all objects of the given
179type.
180
181=item cf::attach_to_objects ...
182
183Attach handlers to all objects. Do not use this except for debugging or
184very rare events, as handlers are (obviously) called for I<all> objects in
185the game.
186
187=item cf::attach_to_players ...
188
189Attach handlers to all players.
190
191=item cf::attach_to_maps ...
192
193Attach handlers to all maps.
194
195=item cf:register_attachment $name, ...
196
197Register an attachment by name through which objects can refer to this
198attachment.
199
200=item cf:register_player_attachment $name, ...
201
202Register an attachment by name through which players can refer to this
203attachment.
204
205=item cf:register_map_attachment $name, ...
206
207Register an attachment by name through which maps can refer to this
208attachment.
209
210=cut 208=cut
211 209
212# the following variables are defined in .xs and must not be re-created 210# the following variables are defined in .xs and must not be re-created
213our @CB_GLOBAL = (); # registry for all global events 211our @CB_GLOBAL = (); # registry for all global events
214our @CB_OBJECT = (); # all objects (should not be used except in emergency) 212our @CB_OBJECT = (); # all objects (should not be used except in emergency)
215our @CB_PLAYER = (); 213our @CB_PLAYER = ();
214our @CB_CLIENT = ();
216our @CB_TYPE = (); # registry for type (cf-object class) based events 215our @CB_TYPE = (); # registry for type (cf-object class) based events
217our @CB_MAP = (); 216our @CB_MAP = ();
218 217
219my %attachment; 218my %attachment;
220 219
221sub _attach_cb($\%$$$) { 220sub _attach_cb($$$$) {
222 my ($registry, $undo, $event, $prio, $cb) = @_; 221 my ($registry, $event, $prio, $cb) = @_;
223 222
224 use sort 'stable'; 223 use sort 'stable';
225 224
226 $cb = [$prio, $cb]; 225 $cb = [$prio, $cb];
227 226
228 @{$registry->[$event]} = sort 227 @{$registry->[$event]} = sort
229 { $a->[0] cmp $b->[0] } 228 { $a->[0] cmp $b->[0] }
230 @{$registry->[$event] || []}, $cb; 229 @{$registry->[$event] || []}, $cb;
231
232 push @{$undo->{cb}}, [$event, $cb];
233} 230}
234 231
235# attach handles attaching event callbacks 232# attach handles attaching event callbacks
236# the only thing the caller has to do is pass the correct 233# the only thing the caller has to do is pass the correct
237# registry (== where the callback attaches to). 234# registry (== where the callback attaches to).
238sub _attach(\@$@) { 235sub _attach {
239 my ($registry, $klass, @arg) = @_; 236 my ($registry, $klass, @arg) = @_;
240 237
238 my $object_type;
241 my $prio = 0; 239 my $prio = 0;
242
243 my %undo = (
244 registry => $registry,
245 cb => [],
246 );
247
248 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT; 240 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
249 241
250 while (@arg) { 242 while (@arg) {
251 my $type = shift @arg; 243 my $type = shift @arg;
252 244
253 if ($type eq "prio") { 245 if ($type eq "prio") {
254 $prio = shift @arg; 246 $prio = shift @arg;
255 247
248 } elsif ($type eq "type") {
249 $object_type = shift @arg;
250 $registry = $CB_TYPE[$object_type] ||= [];
251
252 } elsif ($type eq "subtype") {
253 defined $object_type or Carp::croak "subtype specified without type";
254 my $object_subtype = shift @arg;
255 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];
256
256 } elsif ($type eq "package") { 257 } elsif ($type eq "package") {
257 my $pkg = shift @arg; 258 my $pkg = shift @arg;
258 259
259 while (my ($name, $id) = each %cb_id) { 260 while (my ($name, $id) = each %cb_id) {
260 if (my $cb = $pkg->can ($name)) { 261 if (my $cb = $pkg->can ($name)) {
261 _attach_cb $registry, %undo, $id, $prio, $cb; 262 _attach_cb $registry, $id, $prio, $cb;
262 } 263 }
263 } 264 }
264 265
265 } elsif (exists $cb_id{$type}) { 266 } elsif (exists $cb_id{$type}) {
266 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg; 267 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
267 268
268 } elsif (ref $type) { 269 } elsif (ref $type) {
269 warn "attaching objects not supported, ignoring.\n"; 270 warn "attaching objects not supported, ignoring.\n";
270 271
271 } else { 272 } else {
272 shift @arg; 273 shift @arg;
273 warn "attach argument '$type' not supported, ignoring.\n"; 274 warn "attach argument '$type' not supported, ignoring.\n";
274 } 275 }
275 } 276 }
276
277 \%undo
278} 277}
279 278
280sub _attach_attachment { 279sub _object_attach {
281 my ($obj, $name, %arg) = @_; 280 my ($obj, $name, %arg) = @_;
282 281
283 return if exists $obj->{_attachment}{$name}; 282 return if exists $obj->{_attachment}{$name};
284
285 my $res;
286 283
287 if (my $attach = $attachment{$name}) { 284 if (my $attach = $attachment{$name}) {
288 my $registry = $obj->registry; 285 my $registry = $obj->registry;
289 286
290 for (@$attach) { 287 for (@$attach) {
291 my ($klass, @attach) = @$_; 288 my ($klass, @attach) = @$_;
292 $res = _attach @$registry, $klass, @attach; 289 _attach $registry, $klass, @attach;
293 } 290 }
294 291
295 $obj->{$name} = \%arg; 292 $obj->{$name} = \%arg;
296 } else { 293 } else {
297 warn "object uses attachment '$name' that is not available, postponing.\n"; 294 warn "object uses attachment '$name' that is not available, postponing.\n";
298 } 295 }
299 296
300 $obj->{_attachment}{$name} = undef; 297 $obj->{_attachment}{$name} = undef;
301
302 $res->{attachment} = $name;
303 $res
304} 298}
305 299
306*cf::object::attach = 300sub cf::attachable::attach {
307*cf::player::attach = 301 if (ref $_[0]) {
308*cf::map::attach = sub { 302 _object_attach @_;
309 my ($obj, $name, %arg) = @_; 303 } else {
310 304 _attach shift->_attach_registry, @_;
311 _attach_attachment $obj, $name, %arg; 305 }
312}; 306};
313 307
314# all those should be optimised 308# all those should be optimised
315*cf::object::detach = 309sub cf::attachable::detach {
316*cf::player::detach =
317*cf::map::detach = sub {
318 my ($obj, $name) = @_; 310 my ($obj, $name) = @_;
319 311
312 if (ref $obj) {
320 delete $obj->{_attachment}{$name}; 313 delete $obj->{_attachment}{$name};
321 reattach ($obj); 314 reattach ($obj);
315 } else {
316 Carp::croak "cannot, currently, detach class attachments";
317 }
322}; 318};
323 319
324*cf::object::attached = 320sub cf::attachable::attached {
325*cf::player::attached =
326*cf::map::attached = sub {
327 my ($obj, $name) = @_; 321 my ($obj, $name) = @_;
328 322
329 exists $obj->{_attachment}{$name} 323 exists $obj->{_attachment}{$name}
330};
331
332sub attach_global {
333 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
334} 324}
335 325
336sub attach_to_type { 326for my $klass (qw(GLOBAL OBJECT PLAYER CLIENT MAP)) {
337 my $type = shift; 327 eval "#line " . __LINE__ . " 'cf.pm'
338 my $subtype = shift; 328 sub cf::\L$klass\E::_attach_registry {
329 (\\\@CB_$klass, KLASS_$klass)
330 }
339 331
340 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_ 332 sub cf::\L$klass\E::attachment {
341}
342
343sub attach_to_objects {
344 _attach @CB_OBJECT, KLASS_OBJECT, @_
345}
346
347sub attach_to_players {
348 _attach @CB_PLAYER, KLASS_PLAYER, @_
349}
350
351sub attach_to_maps {
352 _attach @CB_MAP, KLASS_MAP, @_
353}
354
355sub register_attachment {
356 my $name = shift; 333 my \$name = shift;
357 334
358 $attachment{$name} = [[KLASS_OBJECT, @_]];
359}
360
361sub register_player_attachment {
362 my $name = shift;
363
364 $attachment{$name} = [[KLASS_PLAYER, @_]];
365}
366
367sub register_map_attachment {
368 my $name = shift;
369
370 $attachment{$name} = [[KLASS_MAP, @_]]; 335 \$attachment{\$name} = [[KLASS_$klass, \@_]];
336 }
337 ";
338 die if $@;
371} 339}
372 340
373our $override; 341our $override;
374our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 342our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
375 343
389 for (@$callbacks) { 357 for (@$callbacks) {
390 eval { &{$_->[1]} }; 358 eval { &{$_->[1]} };
391 359
392 if ($@) { 360 if ($@) {
393 warn "$@"; 361 warn "$@";
394 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n"; 362 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
395 override; 363 override;
396 } 364 }
397 365
398 return 1 if $override; 366 return 1 if $override;
399 } 367 }
404=item $bool = cf::invoke EVENT_GLOBAL_XXX, ... 372=item $bool = cf::invoke EVENT_GLOBAL_XXX, ...
405 373
406=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...) 374=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
407 375
408=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...) 376=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
377
378=item $bool = $client->invoke (EVENT_CLIENT_XXX, ...)
409 379
410=item $bool = $map->invoke (EVENT_MAP_XXX, ...) 380=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
411 381
412Generate a global/object/player/map-specific event with the given arguments. 382Generate a global/object/player/map-specific event with the given arguments.
413 383
415removed in future versions), and there is no public API to access override 385removed in future versions), and there is no public API to access override
416results (if you must, access C<@cf::invoke_results> directly). 386results (if you must, access C<@cf::invoke_results> directly).
417 387
418=back 388=back
419 389
420=head2 methods valid for all pointers 390=cut
391
392#############################################################################
393
394=head2 METHODS VALID FOR ALL ATTACHABLE OBJECTS
395
396Attachable objects includes objects, players, clients and maps.
421 397
422=over 4 398=over 4
423 399
424=item $object->valid 400=item $object->valid
425
426=item $player->valid
427
428=item $map->valid
429 401
430Just because you have a perl object does not mean that the corresponding 402Just because you have a perl object does not mean that the corresponding
431C-level object still exists. If you try to access an object that has no 403C-level object still exists. If you try to access an object that has no
432valid C counterpart anymore you get an exception at runtime. This method 404valid C counterpart anymore you get an exception at runtime. This method
433can be used to test for existence of the C object part without causing an 405can be used to test for existence of the C object part without causing an
435 407
436=back 408=back
437 409
438=cut 410=cut
439 411
440*cf::object::valid =
441*cf::player::valid =
442*cf::map::valid = \&cf::_valid;
443
444############################################################################# 412#############################################################################
445# object support 413# object support
446 414
447sub instantiate { 415sub instantiate {
448 my ($obj, $data) = @_; 416 my ($obj, $data) = @_;
467 435
468 for my $name (keys %{ $obj->{_attachment} || {} }) { 436 for my $name (keys %{ $obj->{_attachment} || {} }) {
469 if (my $attach = $attachment{$name}) { 437 if (my $attach = $attachment{$name}) {
470 for (@$attach) { 438 for (@$attach) {
471 my ($klass, @attach) = @$_; 439 my ($klass, @attach) = @$_;
472 _attach @$registry, $klass, @attach; 440 _attach $registry, $klass, @attach;
473 } 441 }
474 } else { 442 } else {
475 warn "object uses attachment '$name' that is not available, postponing.\n"; 443 warn "object uses attachment '$name' that is not available, postponing.\n";
476 } 444 }
477 } 445 }
478} 446}
479 447
480sub object_freezer_save { 448sub object_freezer_save {
481 my ($filename, $objs) = @_; 449 my ($filename, $rdata, $objs) = @_;
482 450
483 if (@$objs) { 451 if (length $$rdata) {
452 warn sprintf "saving %s (%d,%d)\n",
453 $filename, length $$rdata, scalar @$objs;
454
484 open my $fh, ">:raw", "$filename.pst~"; 455 if (open my $fh, ">:raw", "$filename~") {
456 chmod SAVE_MODE, $fh;
457 syswrite $fh, $$rdata;
458 close $fh;
459
460 if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
461 chmod SAVE_MODE, $fh;
485 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs }; 462 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
486 close $fh; 463 close $fh;
487 chmod SAVE_MODE, "$filename.pst~";
488 rename "$filename.pst~", "$filename.pst"; 464 rename "$filename.pst~", "$filename.pst";
465 } else {
466 unlink "$filename.pst";
467 }
468
469 rename "$filename~", $filename;
470 } else {
471 warn "FATAL: $filename~: $!\n";
472 }
489 } else { 473 } else {
474 unlink $filename;
490 unlink "$filename.pst"; 475 unlink "$filename.pst";
491 } 476 }
477}
492 478
493 chmod SAVE_MODE, "$filename~"; 479sub object_freezer_as_string {
494 rename "$filename~", $filename; 480 my ($rdata, $objs) = @_;
481
482 use Data::Dumper;
483
484 $$rdata . Dumper $objs
495} 485}
496 486
497sub object_thawer_load { 487sub object_thawer_load {
498 my ($filename) = @_; 488 my ($filename) = @_;
499 489
490 local $/;
491
492 my $av;
493
494 #TODO: use sysread etc.
495 if (open my $data, "<:raw:perlio", $filename) {
496 $data = <$data>;
500 open my $fh, "<:raw:perlio", "$filename.pst" 497 if (open my $pst, "<:raw:perlio", "$filename.pst") {
501 or return; 498 $av = eval { (Storable::thaw <$pst>)->{objs} };
499 }
500 return ($data, $av);
501 }
502 502
503 eval { local $/; (Storable::thaw <$fh>)->{objs} } 503 ()
504} 504}
505 505
506attach_to_objects 506cf::object->attach (
507 prio => -1000000, 507 prio => -1000000,
508 on_clone => sub { 508 on_clone => sub {
509 my ($src, $dst) = @_; 509 my ($src, $dst) = @_;
510 510
511 @{$dst->registry} = @{$src->registry}; 511 @{$dst->registry} = @{$src->registry};
513 %$dst = %$src; 513 %$dst = %$src;
514 514
515 %{$dst->{_attachment}} = %{$src->{_attachment}} 515 %{$dst->{_attachment}} = %{$src->{_attachment}}
516 if exists $src->{_attachment}; 516 if exists $src->{_attachment};
517 }, 517 },
518; 518);
519 519
520############################################################################# 520#############################################################################
521# old plug-in events 521# command handling &c
522 522
523sub inject_event { 523=item cf::register_command $name => \&callback($ob,$args);
524 my $extension = shift;
525 my $event_code = shift;
526 524
527 my $cb = $hook[$event_code]{$extension} 525Register a callback for execution when the client sends the user command
528 or return; 526$name.
529 527
530 &$cb 528=cut
531}
532
533sub inject_global_event {
534 my $event = shift;
535
536 my $cb = $hook[$event]
537 or return;
538
539 List::Util::max map &$_, values %$cb
540}
541
542sub inject_command {
543 my ($name, $obj, $params) = @_;
544
545 for my $cmd (@{ $command{$name} }) {
546 $cmd->[1]->($obj, $params);
547 }
548
549 -1
550}
551 529
552sub register_command { 530sub register_command {
553 my ($name, $time, $cb) = @_; 531 my ($name, $cb) = @_;
554 532
555 my $caller = caller; 533 my $caller = caller;
556 #warn "registering command '$name/$time' to '$caller'"; 534 #warn "registering command '$name/$time' to '$caller'";
557 535
558 push @{ $command{$name} }, [$time, $cb, $caller]; 536 push @{ $COMMAND{$name} }, [$caller, $cb];
559 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
560} 537}
538
539=item cf::register_extcmd $name => \&callback($pl,$packet);
540
541Register a callbackf ro execution when the client sends an extcmd packet.
542
543If the callback returns something, it is sent back as if reply was being
544called.
545
546=cut
561 547
562sub register_extcmd { 548sub register_extcmd {
563 my ($name, $cb) = @_; 549 my ($name, $cb) = @_;
564 550
565 my $caller = caller; 551 my $caller = caller;
566 #warn "registering extcmd '$name' to '$caller'"; 552 #warn "registering extcmd '$name' to '$caller'";
567 553
568 $extcmd{$name} = [$cb, $caller]; 554 $EXTCMD{$name} = [$cb, $caller];
569} 555}
556
557cf::player->attach (
558 on_command => sub {
559 my ($pl, $name, $params) = @_;
560
561 my $cb = $COMMAND{$name}
562 or return;
563
564 for my $cmd (@$cb) {
565 $cmd->[1]->($pl->ob, $params);
566 }
567
568 cf::override;
569 },
570 on_extcmd => sub {
571 my ($pl, $buf) = @_;
572
573 my $msg = eval { from_json $buf };
574
575 if (ref $msg) {
576 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
577 if (my %reply = $cb->[0]->($pl, $msg)) {
578 $pl->ext_reply ($msg->{msgid}, %reply);
579 }
580 }
581 } else {
582 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
583 }
584
585 cf::override;
586 },
587);
570 588
571sub register { 589sub register {
572 my ($base, $pkg) = @_; 590 my ($base, $pkg) = @_;
573 591
574 #TODO 592 #TODO
593 . "#line 1 \"$path\"\n{\n" 611 . "#line 1 \"$path\"\n{\n"
594 . (do { local $/; <$fh> }) 612 . (do { local $/; <$fh> })
595 . "\n};\n1"; 613 . "\n};\n1";
596 614
597 eval $source 615 eval $source
598 or die "$path: $@"; 616 or die $@ ? "$path: $@\n"
617 : "extension disabled.\n";
599 618
600 push @exts, $pkg; 619 push @exts, $pkg;
601 $ext_pkg{$base} = $pkg; 620 $ext_pkg{$base} = $pkg;
602 621
603# no strict 'refs'; 622# no strict 'refs';
616# for my $idx (0 .. $#PLUGIN_EVENT) { 635# for my $idx (0 .. $#PLUGIN_EVENT) {
617# delete $hook[$idx]{$pkg}; 636# delete $hook[$idx]{$pkg};
618# } 637# }
619 638
620 # remove commands 639 # remove commands
621 for my $name (keys %command) { 640 for my $name (keys %COMMAND) {
622 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 641 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
623 642
624 if (@cb) { 643 if (@cb) {
625 $command{$name} = \@cb; 644 $COMMAND{$name} = \@cb;
626 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
627 } else { 645 } else {
628 delete $command{$name};
629 delete $COMMAND{"$name\000"}; 646 delete $COMMAND{$name};
630 } 647 }
631 } 648 }
632 649
633 # remove extcmds 650 # remove extcmds
634 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 651 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
635 delete $extcmd{$name}; 652 delete $EXTCMD{$name};
636 } 653 }
637 654
638 if (my $cb = $pkg->can ("unload")) { 655 if (my $cb = $pkg->can ("unload")) {
639 eval { 656 eval {
640 $cb->($pkg); 657 $cb->($pkg);
644 661
645 Symbol::delete_package $pkg; 662 Symbol::delete_package $pkg;
646} 663}
647 664
648sub load_extensions { 665sub load_extensions {
649 my $LIBDIR = maps_directory "perl";
650
651 for my $ext (<$LIBDIR/*.ext>) { 666 for my $ext (<$LIBDIR/*.ext>) {
652 next unless -r $ext; 667 next unless -r $ext;
653 eval { 668 eval {
654 load_extension $ext; 669 load_extension $ext;
655 1 670 1
656 } or warn "$ext not loaded: $@"; 671 } or warn "$ext not loaded: $@";
657 } 672 }
658} 673}
659 674
660sub _perl_reload(&) {
661 my ($msg) = @_;
662
663 $msg->("reloading...");
664
665 eval {
666 # 1. cancel all watchers
667 $_->cancel for Event::all_watchers;
668
669 # 2. unload all extensions
670 for (@exts) {
671 $msg->("unloading <$_>");
672 unload_extension $_;
673 }
674
675 # 3. unload all modules loaded from $LIBDIR
676 while (my ($k, $v) = each %INC) {
677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
678
679 $msg->("removing <$k>");
680 delete $INC{$k};
681
682 $k =~ s/\.pm$//;
683 $k =~ s/\//::/g;
684
685 if (my $cb = $k->can ("unload_module")) {
686 $cb->();
687 }
688
689 Symbol::delete_package $k;
690 }
691
692 # 4. get rid of safe::, as good as possible
693 Symbol::delete_package "safe::$_"
694 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
695
696 # 5. remove register_script_function callbacks
697 # TODO
698
699 # 6. unload cf.pm "a bit"
700 delete $INC{"cf.pm"};
701
702 # don't, removes xs symbols, too,
703 # and global variables created in xs
704 #Symbol::delete_package __PACKAGE__;
705
706 # 7. reload cf.pm
707 $msg->("reloading cf.pm");
708 require cf;
709 };
710 $msg->($@) if $@;
711
712 $msg->("reloaded");
713};
714
715sub perl_reload() {
716 _perl_reload {
717 warn $_[0];
718 print "$_[0]\n";
719 };
720}
721
722register_command "perl-reload", 0, sub {
723 my ($who, $arg) = @_;
724
725 if ($who->flag (FLAG_WIZ)) {
726 _perl_reload {
727 warn $_[0];
728 $who->message ($_[0]);
729 };
730 }
731};
732
733#############################################################################
734# extcmd framework, basically convert ext <msg>
735# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
736
737attach_to_players
738 on_extcmd => sub {
739 my ($pl, $buf) = @_;
740
741 my $msg = eval { from_json $buf };
742
743 if (ref $msg) {
744 if (my $cb = $extcmd{$msg->{msgtype}}) {
745 if (my %reply = $cb->[0]->($pl, $msg)) {
746 $pl->ext_reply ($msg->{msgid}, %reply);
747 }
748 }
749 } else {
750 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
751 }
752
753 cf::override;
754 },
755;
756
757############################################################################# 675#############################################################################
758# load/save/clean perl data associated with a map 676# load/save/clean perl data associated with a map
759 677
760*cf::mapsupport::on_clean = sub { 678*cf::mapsupport::on_clean = sub {
761 my ($map) = @_; 679 my ($map) = @_;
764 defined $path or return; 682 defined $path or return;
765 683
766 unlink "$path.pst"; 684 unlink "$path.pst";
767}; 685};
768 686
769# old style persistent data, TODO: remove #d#
770*cf::mapsupport::on_swapin = sub {
771 my ($map) = @_;
772
773 my $path = $map->tmpname;
774 $path = $map->path unless defined $path;
775
776 warn "$path.cfperl\n";#d#
777
778 open my $fh, "<:raw", "$path.cfperl"
779 or return; # no perl data
780
781 my $data = Storable::thaw do { local $/; <$fh> };
782
783 $data->{version} <= 1
784 or return; # too new
785
786 $map->_set_obs ($data->{obs});
787 $map->invoke (EVENT_MAP_UPGRADE);
788};
789
790attach_to_maps prio => -10000, package => cf::mapsupport::; 687cf::map->attach (prio => -10000, package => cf::mapsupport::);
791 688
792############################################################################# 689#############################################################################
793# load/save perl data associated with player->ob objects 690# load/save perl data associated with player->ob objects
794 691
795sub all_objects(@) { 692sub all_objects(@) {
796 @_, map all_objects ($_->inv), @_ 693 @_, map all_objects ($_->inv), @_
797} 694}
798 695
799attach_to_players 696# TODO: compatibility cruft, remove when no longer needed
697cf::player->attach (
800 on_load => sub { 698 on_load => sub {
801 my ($pl, $path) = @_; 699 my ($pl, $path) = @_;
802 700
803 for my $o (all_objects $pl->ob) { 701 for my $o (all_objects $pl->ob) {
804 if (my $value = $o->get_ob_key_value ("_perl_data")) { 702 if (my $value = $o->get_ob_key_value ("_perl_data")) {
806 704
807 %$o = %{ Storable::thaw pack "H*", $value }; 705 %$o = %{ Storable::thaw pack "H*", $value };
808 } 706 }
809 } 707 }
810 }, 708 },
811; 709);
812 710
813############################################################################# 711#############################################################################
814# core extensions - in perl 712
713=head2 CORE EXTENSIONS
714
715Functions and methods that extend core crossfire objects.
716
717=over 4
815 718
816=item cf::player::exists $login 719=item cf::player::exists $login
817 720
818Returns true when the given account exists. 721Returns true when the given account exists.
819 722
822sub cf::player::exists($) { 725sub cf::player::exists($) {
823 cf::player::find $_[0] 726 cf::player::find $_[0]
824 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 727 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
825} 728}
826 729
827=item $player->reply ($npc, $msg[, $flags]) 730=item $player_object->reply ($npc, $msg[, $flags])
828 731
829Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 732Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
830can be C<undef>. Does the right thing when the player is currently in a 733can be C<undef>. Does the right thing when the player is currently in a
831dialogue with the given NPC character. 734dialogue with the given NPC character.
832 735
859 $msg{msgid} = $id; 762 $msg{msgid} = $id;
860 763
861 $self->send ("ext " . to_json \%msg); 764 $self->send ("ext " . to_json \%msg);
862} 765}
863 766
767=item $player_object->may ("access")
768
769Returns wether the given player is authorized to access resource "access"
770(e.g. "command_wizcast").
771
772=cut
773
774sub cf::object::player::may {
775 my ($self, $access) = @_;
776
777 $self->flag (cf::FLAG_WIZ) ||
778 (ref $cf::CFG{"may_$access"}
779 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
780 : $cf::CFG{"may_$access"})
781}
782
783=cut
784
864############################################################################# 785#############################################################################
865# map scripting support 786
787=head2 SAFE SCRIPTING
788
789Functions that provide a safe environment to compile and execute
790snippets of perl code without them endangering the safety of the server
791itself. Looping constructs, I/O operators and other built-in functionality
792is not available in the safe scripting environment, and the number of
793functions and methods that can be called is greatly reduced.
794
795=cut
866 796
867our $safe = new Safe "safe"; 797our $safe = new Safe "safe";
868our $safe_hole = new Safe::Hole; 798our $safe_hole = new Safe::Hole;
869 799
870$SIG{FPE} = 'IGNORE'; 800$SIG{FPE} = 'IGNORE';
871 801
872$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 802$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
873 803
874# here we export the classes and methods available to script code 804# here we export the classes and methods available to script code
875 805
806=pod
807
808The following fucntions and emthods are available within a safe environment:
809
810 cf::object contr pay_amount pay_player map
811 cf::object::player player
812 cf::player peaceful
813 cf::map trigger
814
815=cut
816
876for ( 817for (
877 ["cf::object" => qw(contr pay_amount pay_player)], 818 ["cf::object" => qw(contr pay_amount pay_player map)],
878 ["cf::object::player" => qw(player)], 819 ["cf::object::player" => qw(player)],
879 ["cf::player" => qw(peaceful)], 820 ["cf::player" => qw(peaceful)],
821 ["cf::map" => qw(trigger)],
880) { 822) {
881 no strict 'refs'; 823 no strict 'refs';
882 my ($pkg, @funs) = @$_; 824 my ($pkg, @funs) = @$_;
883 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 825 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
884 for @funs; 826 for @funs;
885} 827}
828
829=over 4
830
831=item @retval = safe_eval $code, [var => value, ...]
832
833Compiled and executes the given perl code snippet. additional var/value
834pairs result in temporary local (my) scalar variables of the given name
835that are available in the code snippet. Example:
836
837 my $five = safe_eval '$first + $second', first => 1, second => 4;
838
839=cut
886 840
887sub safe_eval($;@) { 841sub safe_eval($;@) {
888 my ($code, %vars) = @_; 842 my ($code, %vars) = @_;
889 843
890 my $qcode = $code; 844 my $qcode = $code;
913 } 867 }
914 868
915 wantarray ? @res : $res[0] 869 wantarray ? @res : $res[0]
916} 870}
917 871
872=item cf::register_script_function $function => $cb
873
874Register a function that can be called from within map/npc scripts. The
875function should be reasonably secure and should be put into a package name
876like the extension.
877
878Example: register a function that gets called whenever a map script calls
879C<rent::overview>, as used by the C<rent> extension.
880
881 cf::register_script_function "rent::overview" => sub {
882 ...
883 };
884
885=cut
886
918sub register_script_function { 887sub register_script_function {
919 my ($fun, $cb) = @_; 888 my ($fun, $cb) = @_;
920 889
921 no strict 'refs'; 890 no strict 'refs';
922 *{"safe::$fun"} = $safe_hole->wrap ($cb); 891 *{"safe::$fun"} = $safe_hole->wrap ($cb);
923} 892}
924 893
894=back
895
896=cut
897
898#############################################################################
899
900=head2 EXTENSION DATABASE SUPPORT
901
902Crossfire maintains a very simple database for extension use. It can
903currently store anything that can be serialised using Storable, which
904excludes objects.
905
906The parameter C<$family> should best start with the name of the extension
907using it, it should be unique.
908
909=over 4
910
911=item $hashref = cf::db_get $family
912
913Return a hashref for use by the extension C<$family>, which can be
914modified. After modifications, you have to call C<cf::db_dirty> or
915C<cf::db_sync>.
916
917=item $value = cf::db_get $family => $key
918
919Returns a single value from the database
920
921=item cf::db_put $family => $hashref
922
923Stores the given family hashref into the database. Updates are delayed, if
924you want the data to be synced to disk immediately, use C<cf::db_sync>.
925
926=item cf::db_put $family => $key => $value
927
928Stores the given C<$value> in the family hash. Updates are delayed, if you
929want the data to be synced to disk immediately, use C<cf::db_sync>.
930
931=item cf::db_dirty
932
933Marks the database as dirty, to be updated at a later time.
934
935=item cf::db_sync
936
937Immediately write the database to disk I<if it is dirty>.
938
939=cut
940
941our $DB;
942
943{
944 my $path = cf::localdir . "/database.pst";
945
946 sub db_load() {
947 warn "loading database $path\n";#d# remove later
948 $DB = stat $path ? Storable::retrieve $path : { };
949 }
950
951 my $pid;
952
953 sub db_save() {
954 warn "saving database $path\n";#d# remove later
955 waitpid $pid, 0 if $pid;
956 if (0 == ($pid = fork)) {
957 $DB->{_meta}{version} = 1;
958 Storable::nstore $DB, "$path~";
959 rename "$path~", $path;
960 cf::_exit 0 if defined $pid;
961 }
962 }
963
964 my $dirty;
965
966 sub db_sync() {
967 db_save if $dirty;
968 undef $dirty;
969 }
970
971 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
972 db_sync;
973 });
974
975 sub db_dirty() {
976 $dirty = 1;
977 $idle->start;
978 }
979
980 sub db_get($;$) {
981 @_ >= 2
982 ? $DB->{$_[0]}{$_[1]}
983 : ($DB->{$_[0]} ||= { })
984 }
985
986 sub db_put($$;$) {
987 if (@_ >= 3) {
988 $DB->{$_[0]}{$_[1]} = $_[2];
989 } else {
990 $DB->{$_[0]} = $_[1];
991 }
992 db_dirty;
993 }
994
995 cf::global->attach (
996 prio => 10000,
997 on_cleanup => sub {
998 db_sync;
999 },
1000 );
1001}
1002
925############################################################################# 1003#############################################################################
926# the server's main() 1004# the server's main()
927 1005
1006sub cfg_load {
1007 open my $fh, "<:utf8", cf::confdir . "/config"
1008 or return;
1009
1010 local $/;
1011 *CFG = YAML::Syck::Load <$fh>;
1012}
1013
928sub main { 1014sub main {
1015 cfg_load;
1016 db_load;
1017 load_extensions;
929 Event::loop; 1018 Event::loop;
930} 1019}
931 1020
932############################################################################# 1021#############################################################################
933# initialisation 1022# initialisation
934 1023
1024sub _perl_reload(&) {
1025 my ($msg) = @_;
1026
1027 $msg->("reloading...");
1028
1029 eval {
1030 # cancel all watchers
1031 for (Event::all_watchers) {
1032 $_->cancel if $_->data & WF_AUTOCANCEL;
1033 }
1034
1035 # unload all extensions
1036 for (@exts) {
1037 $msg->("unloading <$_>");
1038 unload_extension $_;
1039 }
1040
1041 # unload all modules loaded from $LIBDIR
1042 while (my ($k, $v) = each %INC) {
1043 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1044
1045 $msg->("removing <$k>");
1046 delete $INC{$k};
1047
1048 $k =~ s/\.pm$//;
1049 $k =~ s/\//::/g;
1050
1051 if (my $cb = $k->can ("unload_module")) {
1052 $cb->();
1053 }
1054
1055 Symbol::delete_package $k;
1056 }
1057
1058 # sync database to disk
1059 cf::db_sync;
1060
1061 # get rid of safe::, as good as possible
1062 Symbol::delete_package "safe::$_"
1063 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
1064
1065 # remove register_script_function callbacks
1066 # TODO
1067
1068 # unload cf.pm "a bit"
1069 delete $INC{"cf.pm"};
1070
1071 # don't, removes xs symbols, too,
1072 # and global variables created in xs
1073 #Symbol::delete_package __PACKAGE__;
1074
1075 # reload cf.pm
1076 $msg->("reloading cf.pm");
1077 require cf;
1078
1079 # load config and database again
1080 cf::cfg_load;
1081 cf::db_load;
1082
1083 # load extensions
1084 $msg->("load extensions");
1085 cf::load_extensions;
1086
1087 # reattach attachments to objects
1088 $msg->("reattach");
1089 _global_reattach;
1090 };
1091 $msg->($@) if $@;
1092
1093 $msg->("reloaded");
1094};
1095
1096sub perl_reload() {
1097 _perl_reload {
1098 warn $_[0];
1099 print "$_[0]\n";
1100 };
1101}
1102
935register "<global>", __PACKAGE__; 1103register "<global>", __PACKAGE__;
936 1104
1105register_command "perl-reload" => sub {
1106 my ($who, $arg) = @_;
1107
1108 if ($who->flag (FLAG_WIZ)) {
1109 _perl_reload {
1110 warn $_[0];
1111 $who->message ($_[0]);
1112 };
1113 }
1114};
1115
937unshift @INC, $LIBDIR; 1116unshift @INC, $LIBDIR;
938 1117
939load_extensions;
940
941$TICK_WATCHER = Event->timer ( 1118$TICK_WATCHER = Event->timer (
942 prio => 1, 1119 prio => 0,
943 at => $NEXT_TICK || 1, 1120 at => $NEXT_TICK || 1,
1121 data => WF_AUTOCANCEL,
944 cb => sub { 1122 cb => sub {
945 cf::server_tick; # one server iteration 1123 cf::server_tick; # one server iteration
946 1124
947 my $NOW = Event::time; 1125 my $NOW = Event::time;
948 $NEXT_TICK += $TICK; 1126 $NEXT_TICK += $TICK;
949 1127
950 # if we are delayed by four ticks, skip them all 1128 # if we are delayed by four ticks or more, skip them all
951 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1129 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
952 1130
953 $TICK_WATCHER->at ($NEXT_TICK); 1131 $TICK_WATCHER->at ($NEXT_TICK);
954 $TICK_WATCHER->start; 1132 $TICK_WATCHER->start;
955 }, 1133 },
956); 1134);
957 1135
958_reload_2; 1136IO::AIO::max_poll_time $TICK * 0.2;
1137
1138Event->io (fd => IO::AIO::poll_fileno,
1139 poll => 'r',
1140 prio => 5,
1141 data => WF_AUTOCANCEL,
1142 cb => \&IO::AIO::poll_cb);
959 1143
9601 11441
961 1145

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines