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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines