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.71 by root, Sun Oct 1 10:59:30 2006 UTC vs.
Revision 1.100 by root, Mon Dec 25 11:25:49 2006 UTC

1package cf; 1package cf;
2
3use utf8;
4use strict;
2 5
3use Symbol; 6use Symbol;
4use List::Util; 7use List::Util;
5use Storable; 8use Storable;
6use Opcode; 9use Opcode;
7use Safe; 10use Safe;
8use Safe::Hole; 11use Safe::Hole;
9 12
13use Coro;
14use Coro::Event;
15use Coro::Timer;
16use Coro::Signal;
17use Coro::Semaphore;
18
19use IO::AIO 2.3;
20use YAML::Syck ();
10use Time::HiRes; 21use Time::HiRes;
11use Event; 22
12$Event::Eval = 1; # no idea why this is required, but it is 23use Event; $Event::Eval = 1; # no idea why this is required, but it is
13 24
14use strict; 25# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
26$YAML::Syck::ImplicitUnicode = 1;
15 27
16_init_vars; 28$Coro::main->prio (Coro::PRIO_MIN);
17 29
30sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31
18our %COMMAND = (); 32our %COMMAND = ();
33our %COMMAND_TIME = ();
34our %EXTCMD = ();
35
19our @EVENT; 36our @EVENT;
20our $LIBDIR = maps_directory "perl"; 37our $LIBDIR = datadir . "/ext";
21 38
22our $TICK = MAX_TIME * 1e-6; 39our $TICK = MAX_TIME * 1e-6;
23our $TICK_WATCHER; 40our $TICK_WATCHER;
24our $NEXT_TICK; 41our $NEXT_TICK;
25 42
26our %CFG; 43our %CFG;
27 44
45our $UPTIME; $UPTIME ||= time;
46
28############################################################################# 47#############################################################################
29 48
30=head2 GLOBAL VARIABLES 49=head2 GLOBAL VARIABLES
31 50
32=over 4 51=over 4
52
53=item $cf::UPTIME
54
55The timestamp of the server start (so not actually an uptime).
33 56
34=item $cf::LIBDIR 57=item $cf::LIBDIR
35 58
36The perl library directory, where extensions and cf-specific modules can 59The perl library directory, where extensions and cf-specific modules can
37be found. It will be added to C<@INC> automatically. 60be found. It will be added to C<@INC> automatically.
58 print STDERR "cfperl: $msg"; 81 print STDERR "cfperl: $msg";
59 LOG llevError, "cfperl: $msg"; 82 LOG llevError, "cfperl: $msg";
60 }; 83 };
61} 84}
62 85
86@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
87@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
88@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
89@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
90@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
63@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 91@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
64 92
65# we bless all objects into (empty) derived classes to force a method lookup 93# we bless all objects into (empty) derived classes to force a method lookup
66# within the Safe compartment. 94# within the Safe compartment.
67for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) { 95for my $pkg (qw(
96 cf::global cf::attachable
97 cf::object cf::object::player
98 cf::client cf::player
99 cf::arch cf::living
100 cf::map cf::party cf::region
101)) {
68 no strict 'refs'; 102 no strict 'refs';
69 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 103 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
70} 104}
71 105
72$Event::DIED = sub { 106$Event::DIED = sub {
74}; 108};
75 109
76my %ext_pkg; 110my %ext_pkg;
77my @exts; 111my @exts;
78my @hook; 112my @hook;
79my %command;
80my %extcmd;
81 113
82=head2 UTILITY FUNCTIONS 114=head2 UTILITY FUNCTIONS
83 115
84=over 4 116=over 4
85 117
113 145
114=cut 146=cut
115 147
116############################################################################# 148#############################################################################
117 149
118=head2 EVENTS AND OBJECT ATTACHMENTS 150=head2 ATTACHABLE OBJECTS
151
152Many objects in crossfire are so-called attachable objects. That means you can
153attach callbacks/event handlers (a collection of which is called an "attachment")
154to it. All such attachable objects support the following methods.
155
156In the following description, CLASS can be any of C<global>, C<object>
157C<player>, C<client> or C<map> (i.e. the attachable objects in
158crossfire+).
119 159
120=over 4 160=over 4
121 161
122=item $object->attach ($attachment, key => $value...)
123
124=item $object->detach ($attachment)
125
126Attach/detach a pre-registered attachment to an object.
127
128=item $player->attach ($attachment, key => $value...)
129
130=item $player->detach ($attachment)
131
132Attach/detach a pre-registered attachment to a player.
133
134=item $map->attach ($attachment, key => $value...) 162=item $attachable->attach ($attachment, key => $value...)
135 163
136=item $map->detach ($attachment) 164=item $attachable->detach ($attachment)
137 165
138Attach/detach a pre-registered attachment to a map. 166Attach/detach a pre-registered attachment to a specific object and give it
167the specified key/value pairs as arguments.
139 168
140=item $bool = $object->attached ($name) 169Example, attach a minesweeper attachment to the given object, making it a
17010x10 minesweeper game:
141 171
142=item $bool = $player->attached ($name) 172 $obj->attach (minesweeper => width => 10, height => 10);
143 173
144=item $bool = $map->attached ($name) 174=item $bool = $attachable->attached ($name)
145 175
146Checks wether the named attachment is currently attached to the object. 176Checks wether the named attachment is currently attached to the object.
147 177
148=item cf::attach_global ... 178=item cf::CLASS->attach ...
149 179
150Attach handlers for global events. 180=item cf::CLASS->detach ...
151 181
152This and all following C<attach_*>-functions expect any number of the 182Define an anonymous attachment and attach it to all objects of the given
153following handler/hook descriptions: 183CLASS. See the next function for an explanation of its arguments.
184
185You can attach to global events by using the C<cf::global> class.
186
187Example, log all player logins:
188
189 cf::player->attach (
190 on_login => sub {
191 my ($pl) = @_;
192 ...
193 },
194 );
195
196Example, attach to the jeweler skill:
197
198 cf::object->attach (
199 type => cf::SKILL,
200 subtype => cf::SK_JEWELER,
201 on_use_skill => sub {
202 my ($sk, $ob, $part, $dir, $msg) = @_;
203 ...
204 },
205 );
206
207=item cf::CLASS::attachment $name, ...
208
209Register an attachment by C<$name> through which attachable objects of the
210given CLASS can refer to this attachment.
211
212Some classes such as crossfire maps and objects can specify attachments
213that are attached at load/instantiate time, thus the need for a name.
214
215These calls expect any number of the following handler/hook descriptions:
154 216
155=over 4 217=over 4
156 218
157=item prio => $number 219=item prio => $number
158 220
160by another C<prio> setting). Lower priority handlers get executed 222by another C<prio> setting). Lower priority handlers get executed
161earlier. The default priority is C<0>, and many built-in handlers are 223earlier. The default priority is C<0>, and many built-in handlers are
162registered at priority C<-1000>, so lower priorities should not be used 224registered at priority C<-1000>, so lower priorities should not be used
163unless you know what you are doing. 225unless you know what you are doing.
164 226
227=item type => $type
228
229(Only for C<< cf::object->attach >> calls), limits the attachment to the
230given type of objects only (the additional parameter C<subtype> can be
231used to further limit to the given subtype).
232
165=item on_I<event> => \&cb 233=item on_I<event> => \&cb
166 234
167Call the given code reference whenever the named event happens (event is 235Call the given code reference whenever the named event happens (event is
168something like C<instantiate>, C<apply>, C<use_skill> and so on, and which 236something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
169handlers are recognised generally depends on the type of object these 237handlers are recognised generally depends on the type of object these
178package and register them. Only handlers for eevents supported by the 246package and register them. Only handlers for eevents supported by the
179object/class are recognised. 247object/class are recognised.
180 248
181=back 249=back
182 250
183=item cf::attach_to_type $object_type, $subtype, ... 251Example, define an attachment called "sockpuppet" that calls the given
252event handler when a monster attacks:
184 253
185Attach handlers for a specific object type (e.g. TRANSPORT) and 254 cf::object::attachment sockpuppet =>
186subtype. If C<$subtype> is zero or undef, matches all objects of the given 255 on_skill_attack => sub {
187type. 256 my ($self, $victim) = @_;
188 257 ...
189=item cf::attach_to_objects ...
190
191Attach handlers to all objects. Do not use this except for debugging or
192very rare events, as handlers are (obviously) called for I<all> objects in
193the game.
194
195=item cf::attach_to_players ...
196
197Attach handlers to all players.
198
199=item cf::attach_to_maps ...
200
201Attach handlers to all maps.
202
203=item cf:register_attachment $name, ...
204
205Register an attachment by name through which objects can refer to this
206attachment.
207
208=item cf:register_player_attachment $name, ...
209
210Register an attachment by name through which players can refer to this
211attachment.
212
213=item cf:register_map_attachment $name, ...
214
215Register an attachment by name through which maps can refer to this
216attachment.
217
218=cut
219
220# the following variables are defined in .xs and must not be re-created
221our @CB_GLOBAL = (); # registry for all global events
222our @CB_OBJECT = (); # all objects (should not be used except in emergency)
223our @CB_PLAYER = ();
224our @CB_TYPE = (); # registry for type (cf-object class) based events
225our @CB_MAP = ();
226
227my %attachment;
228
229sub _attach_cb($\%$$$) {
230 my ($registry, $undo, $event, $prio, $cb) = @_;
231
232 use sort 'stable';
233
234 $cb = [$prio, $cb];
235
236 @{$registry->[$event]} = sort
237 { $a->[0] cmp $b->[0] }
238 @{$registry->[$event] || []}, $cb;
239
240 push @{$undo->{cb}}, [$event, $cb];
241}
242
243# attach handles attaching event callbacks
244# the only thing the caller has to do is pass the correct
245# registry (== where the callback attaches to).
246sub _attach(\@$@) {
247 my ($registry, $klass, @arg) = @_;
248
249 my $prio = 0;
250
251 my %undo = (
252 registry => $registry,
253 cb => [],
254 );
255
256 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
257
258 while (@arg) {
259 my $type = shift @arg;
260
261 if ($type eq "prio") {
262 $prio = shift @arg;
263
264 } elsif ($type eq "package") {
265 my $pkg = shift @arg;
266
267 while (my ($name, $id) = each %cb_id) {
268 if (my $cb = $pkg->can ($name)) {
269 _attach_cb $registry, %undo, $id, $prio, $cb;
270 }
271 } 258 }
272
273 } elsif (exists $cb_id{$type}) {
274 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
275
276 } elsif (ref $type) {
277 warn "attaching objects not supported, ignoring.\n";
278
279 } else {
280 shift @arg;
281 warn "attach argument '$type' not supported, ignoring.\n";
282 }
283 }
284
285 \%undo
286}
287
288sub _attach_attachment {
289 my ($obj, $name, %arg) = @_;
290
291 return if exists $obj->{_attachment}{$name};
292
293 my $res;
294
295 if (my $attach = $attachment{$name}) {
296 my $registry = $obj->registry;
297
298 for (@$attach) {
299 my ($klass, @attach) = @$_;
300 $res = _attach @$registry, $klass, @attach;
301 }
302
303 $obj->{$name} = \%arg;
304 } else {
305 warn "object uses attachment '$name' that is not available, postponing.\n";
306 }
307
308 $obj->{_attachment}{$name} = undef;
309
310 $res->{attachment} = $name;
311 $res
312}
313
314*cf::object::attach =
315*cf::player::attach =
316*cf::map::attach = sub {
317 my ($obj, $name, %arg) = @_;
318
319 _attach_attachment $obj, $name, %arg;
320};
321
322# all those should be optimised
323*cf::object::detach =
324*cf::player::detach =
325*cf::map::detach = sub {
326 my ($obj, $name) = @_;
327
328 delete $obj->{_attachment}{$name};
329 reattach ($obj);
330};
331
332*cf::object::attached =
333*cf::player::attached =
334*cf::map::attached = sub {
335 my ($obj, $name) = @_;
336
337 exists $obj->{_attachment}{$name}
338};
339
340sub attach_global {
341 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
342}
343
344sub attach_to_type {
345 my $type = shift;
346 my $subtype = shift;
347
348 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
349}
350
351sub attach_to_objects {
352 _attach @CB_OBJECT, KLASS_OBJECT, @_
353}
354
355sub attach_to_players {
356 _attach @CB_PLAYER, KLASS_PLAYER, @_
357}
358
359sub attach_to_maps {
360 _attach @CB_MAP, KLASS_MAP, @_
361}
362
363sub register_attachment {
364 my $name = shift;
365
366 $attachment{$name} = [[KLASS_OBJECT, @_]];
367}
368
369sub register_player_attachment {
370 my $name = shift;
371
372 $attachment{$name} = [[KLASS_PLAYER, @_]];
373}
374
375sub register_map_attachment {
376 my $name = shift;
377
378 $attachment{$name} = [[KLASS_MAP, @_]];
379}
380
381our $override;
382our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
383
384sub override {
385 $override = 1;
386 @invoke_results = ();
387}
388
389sub do_invoke {
390 my $event = shift;
391 my $callbacks = shift;
392
393 @invoke_results = ();
394
395 local $override;
396
397 for (@$callbacks) {
398 eval { &{$_->[1]} };
399
400 if ($@) {
401 warn "$@";
402 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
403 override;
404 }
405
406 return 1 if $override;
407 }
408
409 0 259 }
410}
411 260
412=item $bool = cf::invoke EVENT_GLOBAL_XXX, ... 261=item $attachable->valid
413
414=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
415
416=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
417
418=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
419
420Generate a global/object/player/map-specific event with the given arguments.
421
422This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
423removed in future versions), and there is no public API to access override
424results (if you must, access C<@cf::invoke_results> directly).
425
426=back
427
428=cut
429
430#############################################################################
431
432=head2 METHODS VALID FOR ALL CORE OBJECTS
433
434=over 4
435
436=item $object->valid, $player->valid, $map->valid
437 262
438Just because you have a perl object does not mean that the corresponding 263Just because you have a perl object does not mean that the corresponding
439C-level object still exists. If you try to access an object that has no 264C-level object still exists. If you try to access an object that has no
440valid C counterpart anymore you get an exception at runtime. This method 265valid C counterpart anymore you get an exception at runtime. This method
441can be used to test for existence of the C object part without causing an 266can be used to test for existence of the C object part without causing an
442exception. 267exception.
443 268
269=cut
270
271# the following variables are defined in .xs and must not be re-created
272our @CB_GLOBAL = (); # registry for all global events
273our @CB_ATTACHABLE = (); # registry for all attachables
274our @CB_OBJECT = (); # all objects (should not be used except in emergency)
275our @CB_PLAYER = ();
276our @CB_CLIENT = ();
277our @CB_TYPE = (); # registry for type (cf-object class) based events
278our @CB_MAP = ();
279
280my %attachment;
281
282sub _attach_cb($$$$) {
283 my ($registry, $event, $prio, $cb) = @_;
284
285 use sort 'stable';
286
287 $cb = [$prio, $cb];
288
289 @{$registry->[$event]} = sort
290 { $a->[0] cmp $b->[0] }
291 @{$registry->[$event] || []}, $cb;
292}
293
294# hack
295my %attachable_klass = map +($_ => 1), KLASS_OBJECT, KLASS_CLIENT, KLASS_PLAYER, KLASS_MAP;
296
297# attach handles attaching event callbacks
298# the only thing the caller has to do is pass the correct
299# registry (== where the callback attaches to).
300sub _attach {
301 my ($registry, $klass, @arg) = @_;
302
303 my $object_type;
304 my $prio = 0;
305 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
306
307 #TODO: get rid of this hack
308 if ($attachable_klass{$klass}) {
309 %cb_id = (%cb_id, map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == KLASS_ATTACHABLE, 0 .. $#EVENT);
310 }
311
312 while (@arg) {
313 my $type = shift @arg;
314
315 if ($type eq "prio") {
316 $prio = shift @arg;
317
318 } elsif ($type eq "type") {
319 $object_type = shift @arg;
320 $registry = $CB_TYPE[$object_type] ||= [];
321
322 } elsif ($type eq "subtype") {
323 defined $object_type or Carp::croak "subtype specified without type";
324 my $object_subtype = shift @arg;
325 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];
326
327 } elsif ($type eq "package") {
328 my $pkg = shift @arg;
329
330 while (my ($name, $id) = each %cb_id) {
331 if (my $cb = $pkg->can ($name)) {
332 _attach_cb $registry, $id, $prio, $cb;
333 }
334 }
335
336 } elsif (exists $cb_id{$type}) {
337 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
338
339 } elsif (ref $type) {
340 warn "attaching objects not supported, ignoring.\n";
341
342 } else {
343 shift @arg;
344 warn "attach argument '$type' not supported, ignoring.\n";
345 }
346 }
347}
348
349sub _object_attach {
350 my ($obj, $name, %arg) = @_;
351
352 return if exists $obj->{_attachment}{$name};
353
354 if (my $attach = $attachment{$name}) {
355 my $registry = $obj->registry;
356
357 for (@$attach) {
358 my ($klass, @attach) = @$_;
359 _attach $registry, $klass, @attach;
360 }
361
362 $obj->{$name} = \%arg;
363 } else {
364 warn "object uses attachment '$name' that is not available, postponing.\n";
365 }
366
367 $obj->{_attachment}{$name} = undef;
368}
369
370sub cf::attachable::attach {
371 if (ref $_[0]) {
372 _object_attach @_;
373 } else {
374 _attach shift->_attach_registry, @_;
375 }
376};
377
378# all those should be optimised
379sub cf::attachable::detach {
380 my ($obj, $name) = @_;
381
382 if (ref $obj) {
383 delete $obj->{_attachment}{$name};
384 reattach ($obj);
385 } else {
386 Carp::croak "cannot, currently, detach class attachments";
387 }
388};
389
390sub cf::attachable::attached {
391 my ($obj, $name) = @_;
392
393 exists $obj->{_attachment}{$name}
394}
395
396for my $klass (qw(ATTACHABLE GLOBAL OBJECT PLAYER CLIENT MAP)) {
397 eval "#line " . __LINE__ . " 'cf.pm'
398 sub cf::\L$klass\E::_attach_registry {
399 (\\\@CB_$klass, KLASS_$klass)
400 }
401
402 sub cf::\L$klass\E::attachment {
403 my \$name = shift;
404
405 \$attachment{\$name} = [[KLASS_$klass, \@_]];
406 }
407 ";
408 die if $@;
409}
410
411our $override;
412our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
413
414sub override {
415 $override = 1;
416 @invoke_results = ();
417}
418
419sub do_invoke {
420 my $event = shift;
421 my $callbacks = shift;
422
423 @invoke_results = ();
424
425 local $override;
426
427 for (@$callbacks) {
428 eval { &{$_->[1]} };
429
430 if ($@) {
431 warn "$@";
432 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
433 override;
434 }
435
436 return 1 if $override;
437 }
438
439 0
440}
441
442=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)
443
444=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
445
446Generate an object-specific event with the given arguments.
447
448This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
449removed in future versions), and there is no public API to access override
450results (if you must, access C<@cf::invoke_results> directly).
451
444=back 452=back
445 453
446=cut 454=cut
447
448*cf::object::valid =
449*cf::player::valid =
450*cf::map::valid = \&cf::_valid;
451 455
452############################################################################# 456#############################################################################
453# object support 457# object support
454 458
455sub instantiate { 459cf::attachable->attach (
460 prio => -1000000,
461 on_instantiate => sub {
456 my ($obj, $data) = @_; 462 my ($obj, $data) = @_;
457 463
458 $data = from_json $data; 464 $data = from_json $data;
459 465
460 for (@$data) { 466 for (@$data) {
461 my ($name, $args) = @$_; 467 my ($name, $args) = @$_;
462 468
463 $obj->attach ($name, %{$args || {} }); 469 $obj->attach ($name, %{$args || {} });
470 }
464 } 471 },
465} 472 on_reattach => sub {
466
467# basically do the same as instantiate, without calling instantiate 473 # basically do the same as instantiate, without calling instantiate
468sub reattach {
469 my ($obj) = @_; 474 my ($obj) = @_;
470 my $registry = $obj->registry; 475 my $registry = $obj->registry;
471 476
472 @$registry = (); 477 @$registry = ();
473 478
474 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} }; 479 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
475 480
476 for my $name (keys %{ $obj->{_attachment} || {} }) { 481 for my $name (keys %{ $obj->{_attachment} || {} }) {
477 if (my $attach = $attachment{$name}) { 482 if (my $attach = $attachment{$name}) {
478 for (@$attach) { 483 for (@$attach) {
479 my ($klass, @attach) = @$_; 484 my ($klass, @attach) = @$_;
480 _attach @$registry, $klass, @attach; 485 _attach $registry, $klass, @attach;
486 }
487 } else {
488 warn "object uses attachment '$name' that is not available, postponing.\n";
481 } 489 }
482 } else {
483 warn "object uses attachment '$name' that is not available, postponing.\n";
484 } 490 }
485 } 491 },
486} 492 on_clone => sub {
493 my ($src, $dst) = @_;
494
495 @{$dst->registry} = @{$src->registry};
496
497 %$dst = %$src;
498
499 %{$dst->{_attachment}} = %{$src->{_attachment}}
500 if exists $src->{_attachment};
501 },
502);
487 503
488sub object_freezer_save { 504sub object_freezer_save {
489 my ($filename, $rdata, $objs) = @_; 505 my ($filename, $rdata, $objs) = @_;
490 506
491 if (length $$rdata) { 507 if (length $$rdata) {
514 unlink $filename; 530 unlink $filename;
515 unlink "$filename.pst"; 531 unlink "$filename.pst";
516 } 532 }
517} 533}
518 534
535sub object_freezer_as_string {
536 my ($rdata, $objs) = @_;
537
538 use Data::Dumper;
539
540 $$rdata . Dumper $objs
541}
542
519sub object_thawer_load { 543sub object_thawer_load {
520 my ($filename) = @_; 544 my ($filename) = @_;
521 545
522 local $/; 546 local $/;
523 547
533 } 557 }
534 558
535 () 559 ()
536} 560}
537 561
538attach_to_objects
539 prio => -1000000,
540 on_clone => sub {
541 my ($src, $dst) = @_;
542
543 @{$dst->registry} = @{$src->registry};
544
545 %$dst = %$src;
546
547 %{$dst->{_attachment}} = %{$src->{_attachment}}
548 if exists $src->{_attachment};
549 },
550;
551
552############################################################################# 562#############################################################################
553# old plug-in events 563# command handling &c
554 564
555sub inject_event { 565=item cf::register_command $name => \&callback($ob,$args);
556 my $extension = shift;
557 my $event_code = shift;
558 566
559 my $cb = $hook[$event_code]{$extension} 567Register a callback for execution when the client sends the user command
560 or return; 568$name.
561 569
562 &$cb 570=cut
563}
564
565sub inject_global_event {
566 my $event = shift;
567
568 my $cb = $hook[$event]
569 or return;
570
571 List::Util::max map &$_, values %$cb
572}
573
574sub inject_command {
575 my ($name, $obj, $params) = @_;
576
577 for my $cmd (@{ $command{$name} }) {
578 $cmd->[1]->($obj, $params);
579 }
580
581 -1
582}
583 571
584sub register_command { 572sub register_command {
585 my ($name, $time, $cb) = @_; 573 my ($name, $cb) = @_;
586 574
587 my $caller = caller; 575 my $caller = caller;
588 #warn "registering command '$name/$time' to '$caller'"; 576 #warn "registering command '$name/$time' to '$caller'";
589 577
590 push @{ $command{$name} }, [$time, $cb, $caller]; 578 push @{ $COMMAND{$name} }, [$caller, $cb];
591 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
592} 579}
580
581=item cf::register_extcmd $name => \&callback($pl,$packet);
582
583Register a callbackf ro execution when the client sends an extcmd packet.
584
585If the callback returns something, it is sent back as if reply was being
586called.
587
588=cut
593 589
594sub register_extcmd { 590sub register_extcmd {
595 my ($name, $cb) = @_; 591 my ($name, $cb) = @_;
596 592
597 my $caller = caller; 593 my $caller = caller;
598 #warn "registering extcmd '$name' to '$caller'"; 594 #warn "registering extcmd '$name' to '$caller'";
599 595
600 $extcmd{$name} = [$cb, $caller]; 596 $EXTCMD{$name} = [$cb, $caller];
601} 597}
598
599cf::player->attach (
600 on_command => sub {
601 my ($pl, $name, $params) = @_;
602
603 my $cb = $COMMAND{$name}
604 or return;
605
606 for my $cmd (@$cb) {
607 $cmd->[1]->($pl->ob, $params);
608 }
609
610 cf::override;
611 },
612 on_extcmd => sub {
613 my ($pl, $buf) = @_;
614
615 my $msg = eval { from_json $buf };
616
617 if (ref $msg) {
618 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
619 if (my %reply = $cb->[0]->($pl, $msg)) {
620 $pl->ext_reply ($msg->{msgid}, %reply);
621 }
622 }
623 } else {
624 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
625 }
626
627 cf::override;
628 },
629);
602 630
603sub register { 631sub register {
604 my ($base, $pkg) = @_; 632 my ($base, $pkg) = @_;
605 633
606 #TODO 634 #TODO
625 . "#line 1 \"$path\"\n{\n" 653 . "#line 1 \"$path\"\n{\n"
626 . (do { local $/; <$fh> }) 654 . (do { local $/; <$fh> })
627 . "\n};\n1"; 655 . "\n};\n1";
628 656
629 eval $source 657 eval $source
630 or die "$path: $@"; 658 or die $@ ? "$path: $@\n"
659 : "extension disabled.\n";
631 660
632 push @exts, $pkg; 661 push @exts, $pkg;
633 $ext_pkg{$base} = $pkg; 662 $ext_pkg{$base} = $pkg;
634 663
635# no strict 'refs'; 664# no strict 'refs';
648# for my $idx (0 .. $#PLUGIN_EVENT) { 677# for my $idx (0 .. $#PLUGIN_EVENT) {
649# delete $hook[$idx]{$pkg}; 678# delete $hook[$idx]{$pkg};
650# } 679# }
651 680
652 # remove commands 681 # remove commands
653 for my $name (keys %command) { 682 for my $name (keys %COMMAND) {
654 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 683 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
655 684
656 if (@cb) { 685 if (@cb) {
657 $command{$name} = \@cb; 686 $COMMAND{$name} = \@cb;
658 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
659 } else { 687 } else {
660 delete $command{$name};
661 delete $COMMAND{"$name\000"}; 688 delete $COMMAND{$name};
662 } 689 }
663 } 690 }
664 691
665 # remove extcmds 692 # remove extcmds
666 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 693 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
667 delete $extcmd{$name}; 694 delete $EXTCMD{$name};
668 } 695 }
669 696
670 if (my $cb = $pkg->can ("unload")) { 697 if (my $cb = $pkg->can ("unload")) {
671 eval { 698 eval {
672 $cb->($pkg); 699 $cb->($pkg);
676 703
677 Symbol::delete_package $pkg; 704 Symbol::delete_package $pkg;
678} 705}
679 706
680sub load_extensions { 707sub load_extensions {
681 my $LIBDIR = maps_directory "perl";
682
683 for my $ext (<$LIBDIR/*.ext>) { 708 for my $ext (<$LIBDIR/*.ext>) {
684 next unless -r $ext; 709 next unless -r $ext;
685 eval { 710 eval {
686 load_extension $ext; 711 load_extension $ext;
687 1 712 1
688 } or warn "$ext not loaded: $@"; 713 } or warn "$ext not loaded: $@";
689 } 714 }
690} 715}
691 716
692############################################################################# 717#############################################################################
693# extcmd framework, basically convert ext <msg>
694# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
695
696attach_to_players
697 on_extcmd => sub {
698 my ($pl, $buf) = @_;
699
700 my $msg = eval { from_json $buf };
701
702 if (ref $msg) {
703 if (my $cb = $extcmd{$msg->{msgtype}}) {
704 if (my %reply = $cb->[0]->($pl, $msg)) {
705 $pl->ext_reply ($msg->{msgid}, %reply);
706 }
707 }
708 } else {
709 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
710 }
711
712 cf::override;
713 },
714;
715
716#############################################################################
717# load/save/clean perl data associated with a map 718# load/save/clean perl data associated with a map
718 719
719*cf::mapsupport::on_clean = sub { 720*cf::mapsupport::on_clean = sub {
720 my ($map) = @_; 721 my ($map) = @_;
721 722
723 defined $path or return; 724 defined $path or return;
724 725
725 unlink "$path.pst"; 726 unlink "$path.pst";
726}; 727};
727 728
728attach_to_maps prio => -10000, package => cf::mapsupport::; 729cf::map->attach (prio => -10000, package => cf::mapsupport::);
729 730
730############################################################################# 731#############################################################################
731# load/save perl data associated with player->ob objects 732# load/save perl data associated with player->ob objects
732 733
733sub all_objects(@) { 734sub all_objects(@) {
734 @_, map all_objects ($_->inv), @_ 735 @_, map all_objects ($_->inv), @_
735} 736}
736 737
737# TODO: compatibility cruft, remove when no longer needed 738# TODO: compatibility cruft, remove when no longer needed
738attach_to_players 739cf::player->attach (
739 on_load => sub { 740 on_load => sub {
740 my ($pl, $path) = @_; 741 my ($pl, $path) = @_;
741 742
742 for my $o (all_objects $pl->ob) { 743 for my $o (all_objects $pl->ob) {
743 if (my $value = $o->get_ob_key_value ("_perl_data")) { 744 if (my $value = $o->get_ob_key_value ("_perl_data")) {
745 746
746 %$o = %{ Storable::thaw pack "H*", $value }; 747 %$o = %{ Storable::thaw pack "H*", $value };
747 } 748 }
748 } 749 }
749 }, 750 },
750; 751);
751 752
752############################################################################# 753#############################################################################
753 754
754=head2 CORE EXTENSIONS 755=head2 CORE EXTENSIONS
755 756
756Functions and methods that extend core crossfire objects. 757Functions and methods that extend core crossfire objects.
758
759=head3 cf::player
757 760
758=over 4 761=over 4
759 762
760=item cf::player::exists $login 763=item cf::player::exists $login
761 764
766sub cf::player::exists($) { 769sub cf::player::exists($) {
767 cf::player::find $_[0] 770 cf::player::find $_[0]
768 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 771 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
769} 772}
770 773
774=item $player->ext_reply ($msgid, $msgtype, %msg)
775
776Sends an ext reply to the player.
777
778=cut
779
780sub cf::player::ext_reply($$$%) {
781 my ($self, $id, %msg) = @_;
782
783 $msg{msgid} = $id;
784
785 $self->send ("ext " . to_json \%msg);
786}
787
788=back
789
790=head3 cf::object::player
791
792=over 4
793
771=item $player->reply ($npc, $msg[, $flags]) 794=item $player_object->reply ($npc, $msg[, $flags])
772 795
773Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 796Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
774can be C<undef>. Does the right thing when the player is currently in a 797can be C<undef>. Does the right thing when the player is currently in a
775dialogue with the given NPC character. 798dialogue with the given NPC character.
776 799
777=cut 800=cut
778 801
779# rough implementation of a future "reply" method that works 802# rough implementation of a future "reply" method that works
780# with dialog boxes. 803# with dialog boxes.
804#TODO: the first argument must go, split into a $npc->reply_to ( method
781sub cf::object::player::reply($$$;$) { 805sub cf::object::player::reply($$$;$) {
782 my ($self, $npc, $msg, $flags) = @_; 806 my ($self, $npc, $msg, $flags) = @_;
783 807
784 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 808 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
785 809
789 $msg = $npc->name . " says: $msg" if $npc; 813 $msg = $npc->name . " says: $msg" if $npc;
790 $self->message ($msg, $flags); 814 $self->message ($msg, $flags);
791 } 815 }
792} 816}
793 817
794=item $player->ext_reply ($msgid, $msgtype, %msg) 818=item $player_object->may ("access")
795 819
796Sends an ext reply to the player. 820Returns wether the given player is authorized to access resource "access"
821(e.g. "command_wizcast").
797 822
798=cut 823=cut
799 824
800sub cf::player::ext_reply($$$%) { 825sub cf::object::player::may {
826 my ($self, $access) = @_;
827
828 $self->flag (cf::FLAG_WIZ) ||
829 (ref $cf::CFG{"may_$access"}
830 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
831 : $cf::CFG{"may_$access"})
832}
833
834=head3 cf::client
835
836=over 4
837
838=item $client->send_drawinfo ($text, $flags)
839
840Sends a drawinfo packet to the client. Circumvents output buffering so
841should not be used under normal circumstances.
842
843=cut
844
845sub cf::client::send_drawinfo {
846 my ($self, $text, $flags) = @_;
847
848 utf8::encode $text;
849 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text);
850}
851
852
853=item $success = $client->query ($flags, "text", \&cb)
854
855Queues a query to the client, calling the given callback with
856the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
857C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
858
859Queries can fail, so check the return code. Or don't, as queries will become
860reliable at some point in the future.
861
862=cut
863
864sub cf::client::query {
865 my ($self, $flags, $text, $cb) = @_;
866
867 return unless $self->state == ST_PLAYING
868 || $self->state == ST_SETUP
869 || $self->state == ST_CUSTOM;
870
871 $self->state (ST_CUSTOM);
872
873 utf8::encode $text;
874 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
875
876 $self->send_packet ($self->{query_queue}[0][0])
877 if @{ $self->{query_queue} } == 1;
878}
879
880cf::client->attach (
881 on_reply => sub {
882 my ($ns, $msg) = @_;
883
884 # this weird shuffling is so that direct followup queries
885 # get handled first
886 my $queue = delete $ns->{query_queue};
887
888 (shift @$queue)->[1]->($msg);
889
890 push @{ $ns->{query_queue} }, @$queue;
891
892 if (@{ $ns->{query_queue} } == @$queue) {
893 if (@$queue) {
894 $ns->send_packet ($ns->{query_queue}[0][0]);
895 } else {
896 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
897 }
898 }
899 },
900);
901
902=item $client->coro (\&cb)
903
904Create a new coroutine, running the specified callback. The coroutine will
905be automatically cancelled when the client gets destroyed (e.g. on logout,
906or loss of connection).
907
908=cut
909
910sub cf::client::coro {
801 my ($self, $id, %msg) = @_; 911 my ($self, $cb) = @_;
802 912
803 $msg{msgid} = $id; 913 my $coro; $coro = async {
914 eval {
915 $cb->();
916 };
917 warn $@ if $@;
918 delete $self->{_coro}{$coro+0};
919 };
804 920
805 $self->send ("ext " . to_json \%msg); 921 $self->{_coro}{$coro+0} = $coro;
806} 922}
923
924cf::client->attach (
925 on_destroy => sub {
926 my ($ns) = @_;
927
928 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
929 },
930);
807 931
808=back 932=back
809 933
810=cut
811
812#############################################################################
813 934
814=head2 SAFE SCRIPTING 935=head2 SAFE SCRIPTING
815 936
816Functions that provide a safe environment to compile and execute 937Functions that provide a safe environment to compile and execute
817snippets of perl code without them endangering the safety of the server 938snippets of perl code without them endangering the safety of the server
818itself. Looping constructs, I/O operators and other built-in functionality 939itself. Looping constructs, I/O operators and other built-in functionality
819is not available in the safe scripting environment, and the number of 940is not available in the safe scripting environment, and the number of
820functions and methods that cna be called is greatly reduced. 941functions and methods that can be called is greatly reduced.
821 942
822=cut 943=cut
823 944
824our $safe = new Safe "safe"; 945our $safe = new Safe "safe";
825our $safe_hole = new Safe::Hole; 946our $safe_hole = new Safe::Hole;
832 953
833=pod 954=pod
834 955
835The following fucntions and emthods are available within a safe environment: 956The following fucntions and emthods are available within a safe environment:
836 957
837 cf::object contr pay_amount pay_player 958 cf::object contr pay_amount pay_player map
838 cf::object::player player 959 cf::object::player player
839 cf::player peaceful 960 cf::player peaceful
961 cf::map trigger
840 962
841=cut 963=cut
842 964
843for ( 965for (
844 ["cf::object" => qw(contr pay_amount pay_player)], 966 ["cf::object" => qw(contr pay_amount pay_player map)],
845 ["cf::object::player" => qw(player)], 967 ["cf::object::player" => qw(player)],
846 ["cf::player" => qw(peaceful)], 968 ["cf::player" => qw(peaceful)],
969 ["cf::map" => qw(trigger)],
847) { 970) {
848 no strict 'refs'; 971 no strict 'refs';
849 my ($pkg, @funs) = @$_; 972 my ($pkg, @funs) = @$_;
850 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 973 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
851 for @funs; 974 for @funs;
961 1084
962Immediately write the database to disk I<if it is dirty>. 1085Immediately write the database to disk I<if it is dirty>.
963 1086
964=cut 1087=cut
965 1088
1089our $DB;
1090
966{ 1091{
967 my $db;
968 my $path = cf::localdir . "/database.pst"; 1092 my $path = cf::localdir . "/database.pst";
969 1093
970 sub db_load() { 1094 sub db_load() {
971 warn "loading database $path\n";#d# remove later 1095 warn "loading database $path\n";#d# remove later
972 $db = stat $path ? Storable::retrieve $path : { }; 1096 $DB = stat $path ? Storable::retrieve $path : { };
973 } 1097 }
974 1098
975 my $pid; 1099 my $pid;
976 1100
977 sub db_save() { 1101 sub db_save() {
978 warn "saving database $path\n";#d# remove later 1102 warn "saving database $path\n";#d# remove later
979 waitpid $pid, 0 if $pid; 1103 waitpid $pid, 0 if $pid;
980 if (0 == ($pid = fork)) { 1104 if (0 == ($pid = fork)) {
981 $db->{_meta}{version} = 1; 1105 $DB->{_meta}{version} = 1;
982 Storable::nstore $db, "$path~"; 1106 Storable::nstore $DB, "$path~";
983 rename "$path~", $path; 1107 rename "$path~", $path;
984 cf::_exit 0 if defined $pid; 1108 cf::_exit 0 if defined $pid;
985 } 1109 }
986 } 1110 }
987 1111
990 sub db_sync() { 1114 sub db_sync() {
991 db_save if $dirty; 1115 db_save if $dirty;
992 undef $dirty; 1116 undef $dirty;
993 } 1117 }
994 1118
995 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, cb => sub { 1119 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
996 db_sync; 1120 db_sync;
997 }); 1121 });
998 1122
999 sub db_dirty() { 1123 sub db_dirty() {
1000 $dirty = 1; 1124 $dirty = 1;
1001 $idle->start; 1125 $idle->start;
1002 } 1126 }
1003 1127
1004 sub db_get($;$) { 1128 sub db_get($;$) {
1005 @_ >= 2 1129 @_ >= 2
1006 ? $db->{$_[0]}{$_[1]} 1130 ? $DB->{$_[0]}{$_[1]}
1007 : ($db->{$_[0]} ||= { }) 1131 : ($DB->{$_[0]} ||= { })
1008 } 1132 }
1009 1133
1010 sub db_put($$;$) { 1134 sub db_put($$;$) {
1011 if (@_ >= 3) { 1135 if (@_ >= 3) {
1012 $db->{$_[0]}{$_[1]} = $_[2]; 1136 $DB->{$_[0]}{$_[1]} = $_[2];
1013 } else { 1137 } else {
1014 $db->{$_[0]} = $_[1]; 1138 $DB->{$_[0]} = $_[1];
1015 } 1139 }
1016 db_dirty; 1140 db_dirty;
1017 } 1141 }
1018 1142
1019 attach_global 1143 cf::global->attach (
1020 prio => 10000, 1144 prio => 10000,
1021 on_cleanup => sub { 1145 on_cleanup => sub {
1022 db_sync; 1146 db_sync;
1023 }, 1147 },
1024 ; 1148 );
1025} 1149}
1026 1150
1027############################################################################# 1151#############################################################################
1028# the server's main() 1152# the server's main()
1029 1153
1154sub cfg_load {
1155 open my $fh, "<:utf8", cf::confdir . "/config"
1156 or return;
1157
1158 local $/;
1159 *CFG = YAML::Syck::Load <$fh>;
1160}
1161
1030sub main { 1162sub main {
1163 cfg_load;
1031 db_load; 1164 db_load;
1032 load_extensions; 1165 load_extensions;
1033 Event::loop; 1166 Event::loop;
1034} 1167}
1035 1168
1041 1174
1042 $msg->("reloading..."); 1175 $msg->("reloading...");
1043 1176
1044 eval { 1177 eval {
1045 # cancel all watchers 1178 # cancel all watchers
1046 $_->cancel for Event::all_watchers; 1179 for (Event::all_watchers) {
1180 $_->cancel if $_->data & WF_AUTOCANCEL;
1181 }
1047 1182
1048 # unload all extensions 1183 # unload all extensions
1049 for (@exts) { 1184 for (@exts) {
1050 $msg->("unloading <$_>"); 1185 $msg->("unloading <$_>");
1051 unload_extension $_; 1186 unload_extension $_;
1086 #Symbol::delete_package __PACKAGE__; 1221 #Symbol::delete_package __PACKAGE__;
1087 1222
1088 # reload cf.pm 1223 # reload cf.pm
1089 $msg->("reloading cf.pm"); 1224 $msg->("reloading cf.pm");
1090 require cf; 1225 require cf;
1226 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1091 1227
1228
1092 # load database again 1229 # load config and database again
1230 cf::cfg_load;
1093 cf::db_load; 1231 cf::db_load;
1094 1232
1095 # load extensions 1233 # load extensions
1096 $msg->("load extensions"); 1234 $msg->("load extensions");
1097 cf::load_extensions; 1235 cf::load_extensions;
1110 warn $_[0]; 1248 warn $_[0];
1111 print "$_[0]\n"; 1249 print "$_[0]\n";
1112 }; 1250 };
1113} 1251}
1114 1252
1253register "<global>", __PACKAGE__;
1254
1115register_command "perl-reload", 0, sub { 1255register_command "perl-reload" => sub {
1116 my ($who, $arg) = @_; 1256 my ($who, $arg) = @_;
1117 1257
1118 if ($who->flag (FLAG_WIZ)) { 1258 if ($who->flag (FLAG_WIZ)) {
1119 _perl_reload { 1259 _perl_reload {
1120 warn $_[0]; 1260 warn $_[0];
1121 $who->message ($_[0]); 1261 $who->message ($_[0]);
1122 }; 1262 };
1123 } 1263 }
1124}; 1264};
1125 1265
1126register "<global>", __PACKAGE__;
1127
1128unshift @INC, $LIBDIR; 1266unshift @INC, $LIBDIR;
1129 1267
1130$TICK_WATCHER = Event->timer ( 1268$TICK_WATCHER = Event->timer (
1131 prio => 1, 1269 prio => 0,
1132 at => $NEXT_TICK || 1, 1270 at => $NEXT_TICK || 1,
1271 data => WF_AUTOCANCEL,
1133 cb => sub { 1272 cb => sub {
1134 cf::server_tick; # one server iteration 1273 cf::server_tick; # one server iteration
1135 1274
1136 my $NOW = Event::time; 1275 my $NOW = Event::time;
1137 $NEXT_TICK += $TICK; 1276 $NEXT_TICK += $TICK;
1138 1277
1139 # if we are delayed by four ticks, skip them all 1278 # if we are delayed by four ticks or more, skip them all
1140 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1279 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
1141 1280
1142 $TICK_WATCHER->at ($NEXT_TICK); 1281 $TICK_WATCHER->at ($NEXT_TICK);
1143 $TICK_WATCHER->start; 1282 $TICK_WATCHER->start;
1144 }, 1283 },
1145); 1284);
1146 1285
1286IO::AIO::max_poll_time $TICK * 0.2;
1287
1288Event->io (fd => IO::AIO::poll_fileno,
1289 poll => 'r',
1290 prio => 5,
1291 data => WF_AUTOCANCEL,
1292 cb => \&IO::AIO::poll_cb);
1293
11471 12941
1148 1295

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines