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.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;
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 (2); # run main coroutine ("the server") with very high priority
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;
42our $NOW;
25 43
26our %CFG; 44our %CFG;
27 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
28############################################################################# 70#############################################################################
29 71
30=head2 GLOBAL VARIABLES 72=head2 GLOBAL VARIABLES
31 73
32=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.
33 84
34=item $cf::LIBDIR 85=item $cf::LIBDIR
35 86
36The perl library directory, where extensions and cf-specific modules can 87The perl library directory, where extensions and cf-specific modules can
37be 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.
38 93
39=item $cf::TICK 94=item $cf::TICK
40 95
41The interval between server ticks, in seconds. 96The interval between server ticks, in seconds.
42 97
50=cut 105=cut
51 106
52BEGIN { 107BEGIN {
53 *CORE::GLOBAL::warn = sub { 108 *CORE::GLOBAL::warn = sub {
54 my $msg = join "", @_; 109 my $msg = join "", @_;
110 utf8::encode $msg;
111
55 $msg .= "\n" 112 $msg .= "\n"
56 unless $msg =~ /\n$/; 113 unless $msg =~ /\n$/;
57 114
58 print STDERR "cfperl: $msg";
59 LOG llevError, "cfperl: $msg"; 115 LOG llevError, "cfperl: $msg";
60 }; 116 };
61} 117}
62 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';
63@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 124@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
64 125
65# 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
66# within the Safe compartment. 127# 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)) { 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)) {
68 no strict 'refs'; 135 no strict 'refs';
69 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 136 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
70} 137}
71 138
72$Event::DIED = sub { 139$Event::DIED = sub {
74}; 141};
75 142
76my %ext_pkg; 143my %ext_pkg;
77my @exts; 144my @exts;
78my @hook; 145my @hook;
79my %command;
80my %extcmd;
81 146
82=head2 UTILITY FUNCTIONS 147=head2 UTILITY FUNCTIONS
83 148
84=over 4 149=over 4
85 150
107sub to_json($) { 172sub to_json($) {
108 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 173 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
109 JSON::Syck::Dump $_[0] 174 JSON::Syck::Dump $_[0]
110} 175}
111 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
112=back 202=back
113 203
114=cut 204=cut
115 205
116############################################################################# 206#############################################################################
117 207
118=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+).
119 217
120=over 4 218=over 4
121 219
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...) 220=item $attachable->attach ($attachment, key => $value...)
135 221
136=item $map->detach ($attachment) 222=item $attachable->detach ($attachment)
137 223
138Attach/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.
139 226
140=item $bool = $object->attached ($name) 227Example, attach a minesweeper attachment to the given object, making it a
22810x10 minesweeper game:
141 229
142=item $bool = $player->attached ($name) 230 $obj->attach (minesweeper => width => 10, height => 10);
143 231
144=item $bool = $map->attached ($name) 232=item $bool = $attachable->attached ($name)
145 233
146Checks wether the named attachment is currently attached to the object. 234Checks wether the named attachment is currently attached to the object.
147 235
148=item cf::attach_global ... 236=item cf::CLASS->attach ...
149 237
150Attach handlers for global events. 238=item cf::CLASS->detach ...
151 239
152This and all following C<attach_*>-functions expect any number of the 240Define an anonymous attachment and attach it to all objects of the given
153following 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:
154 274
155=over 4 275=over 4
156 276
157=item prio => $number 277=item prio => $number
158 278
160by another C<prio> setting). Lower priority handlers get executed 280by another C<prio> setting). Lower priority handlers get executed
161earlier. 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
162registered at priority C<-1000>, so lower priorities should not be used 282registered at priority C<-1000>, so lower priorities should not be used
163unless you know what you are doing. 283unless you know what you are doing.
164 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
165=item on_I<event> => \&cb 291=item on_I<event> => \&cb
166 292
167Call the given code reference whenever the named event happens (event is 293Call 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 294something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
169handlers are recognised generally depends on the type of object these 295handlers are recognised generally depends on the type of object these
178package and register them. Only handlers for eevents supported by the 304package and register them. Only handlers for eevents supported by the
179object/class are recognised. 305object/class are recognised.
180 306
181=back 307=back
182 308
183=item cf::attach_to_type $object_type, $subtype, ... 309Example, define an attachment called "sockpuppet" that calls the given
310event handler when a monster attacks:
184 311
185Attach handlers for a specific object type (e.g. TRANSPORT) and 312 cf::object::attachment sockpuppet =>
186subtype. If C<$subtype> is zero or undef, matches all objects of the given 313 on_skill_attack => sub {
187type. 314 my ($self, $victim) = @_;
188 315 ...
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 } 316 }
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 317 }
410}
411 318
412=item $bool = cf::invoke EVENT_GLOBAL_XXX, ... 319=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 320
438Just 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
439C-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
440valid C counterpart anymore you get an exception at runtime. This method 323valid 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 324can be used to test for existence of the C object part without causing an
442exception. 325exception.
443 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
444=back 510=back
445 511
446=cut 512=cut
447
448*cf::object::valid =
449*cf::player::valid =
450*cf::map::valid = \&cf::_valid;
451 513
452############################################################################# 514#############################################################################
453# object support 515# object support
454 516
455sub instantiate {
456 my ($obj, $data) = @_;
457
458 $data = from_json $data;
459
460 for (@$data) {
461 my ($name, $args) = @$_;
462
463 $obj->attach ($name, %{$args || {} });
464 }
465}
466
467# basically do the same as instantiate, without calling instantiate
468sub reattach { 517sub reattach {
518 # basically do the same as instantiate, without calling instantiate
469 my ($obj) = @_; 519 my ($obj) = @_;
520
470 my $registry = $obj->registry; 521 my $registry = $obj->registry;
471 522
472 @$registry = (); 523 @$registry = ();
473 524
474 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} }; 525 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
475 526
476 for my $name (keys %{ $obj->{_attachment} || {} }) { 527 for my $name (keys %{ $obj->{_attachment} || {} }) {
477 if (my $attach = $attachment{$name}) { 528 if (my $attach = $attachment{$name}) {
478 for (@$attach) { 529 for (@$attach) {
479 my ($klass, @attach) = @$_; 530 my ($klass, @attach) = @$_;
480 _attach @$registry, $klass, @attach; 531 _attach $registry, $klass, @attach;
481 } 532 }
482 } else { 533 } else {
483 warn "object uses attachment '$name' that is not available, postponing.\n"; 534 warn "object uses attachment '$name' that is not available, postponing.\n";
484 } 535 }
485 } 536 }
486} 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);
487 564
488sub object_freezer_save { 565sub object_freezer_save {
489 my ($filename, $rdata, $objs) = @_; 566 my ($filename, $rdata, $objs) = @_;
490 567
491 if (length $$rdata) { 568 if (length $$rdata) {
514 unlink $filename; 591 unlink $filename;
515 unlink "$filename.pst"; 592 unlink "$filename.pst";
516 } 593 }
517} 594}
518 595
596sub object_freezer_as_string {
597 my ($rdata, $objs) = @_;
598
599 use Data::Dumper;
600
601 $$rdata . Dumper $objs
602}
603
519sub object_thawer_load { 604sub object_thawer_load {
520 my ($filename) = @_; 605 my ($filename) = @_;
521 606
522 local $/; 607 local $/;
523 608
533 } 618 }
534 619
535 () 620 ()
536} 621}
537 622
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############################################################################# 623#############################################################################
553# old plug-in events 624# command handling &c
554 625
555sub inject_event { 626=item cf::register_command $name => \&callback($ob,$args);
556 my $extension = shift;
557 my $event_code = shift;
558 627
559 my $cb = $hook[$event_code]{$extension} 628Register a callback for execution when the client sends the user command
560 or return; 629$name.
561 630
562 &$cb 631=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 632
584sub register_command { 633sub register_command {
585 my ($name, $time, $cb) = @_; 634 my ($name, $cb) = @_;
586 635
587 my $caller = caller; 636 my $caller = caller;
588 #warn "registering command '$name/$time' to '$caller'"; 637 #warn "registering command '$name/$time' to '$caller'";
589 638
590 push @{ $command{$name} }, [$time, $cb, $caller]; 639 push @{ $COMMAND{$name} }, [$caller, $cb];
591 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
592} 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
593 650
594sub register_extcmd { 651sub register_extcmd {
595 my ($name, $cb) = @_; 652 my ($name, $cb) = @_;
596 653
597 my $caller = caller; 654 my $caller = caller;
598 #warn "registering extcmd '$name' to '$caller'"; 655 #warn "registering extcmd '$name' to '$caller'";
599 656
600 $extcmd{$name} = [$cb, $caller]; 657 $EXTCMD{$name} = [$cb, $caller];
601} 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);
602 691
603sub register { 692sub register {
604 my ($base, $pkg) = @_; 693 my ($base, $pkg) = @_;
605 694
606 #TODO 695 #TODO
625 . "#line 1 \"$path\"\n{\n" 714 . "#line 1 \"$path\"\n{\n"
626 . (do { local $/; <$fh> }) 715 . (do { local $/; <$fh> })
627 . "\n};\n1"; 716 . "\n};\n1";
628 717
629 eval $source 718 eval $source
630 or die "$path: $@"; 719 or die $@ ? "$path: $@\n"
720 : "extension disabled.\n";
631 721
632 push @exts, $pkg; 722 push @exts, $pkg;
633 $ext_pkg{$base} = $pkg; 723 $ext_pkg{$base} = $pkg;
634 724
635# no strict 'refs'; 725# no strict 'refs';
648# for my $idx (0 .. $#PLUGIN_EVENT) { 738# for my $idx (0 .. $#PLUGIN_EVENT) {
649# delete $hook[$idx]{$pkg}; 739# delete $hook[$idx]{$pkg};
650# } 740# }
651 741
652 # remove commands 742 # remove commands
653 for my $name (keys %command) { 743 for my $name (keys %COMMAND) {
654 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 744 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
655 745
656 if (@cb) { 746 if (@cb) {
657 $command{$name} = \@cb; 747 $COMMAND{$name} = \@cb;
658 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
659 } else { 748 } else {
660 delete $command{$name};
661 delete $COMMAND{"$name\000"}; 749 delete $COMMAND{$name};
662 } 750 }
663 } 751 }
664 752
665 # remove extcmds 753 # remove extcmds
666 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 754 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
667 delete $extcmd{$name}; 755 delete $EXTCMD{$name};
668 } 756 }
669 757
670 if (my $cb = $pkg->can ("unload")) { 758 if (my $cb = $pkg->can ("unload")) {
671 eval { 759 eval {
672 $cb->($pkg); 760 $cb->($pkg);
676 764
677 Symbol::delete_package $pkg; 765 Symbol::delete_package $pkg;
678} 766}
679 767
680sub load_extensions { 768sub load_extensions {
681 my $LIBDIR = maps_directory "perl";
682
683 for my $ext (<$LIBDIR/*.ext>) { 769 for my $ext (<$LIBDIR/*.ext>) {
684 next unless -r $ext; 770 next unless -r $ext;
685 eval { 771 eval {
686 load_extension $ext; 772 load_extension $ext;
687 1 773 1
688 } or warn "$ext not loaded: $@"; 774 } or warn "$ext not loaded: $@";
689 } 775 }
690} 776}
691 777
692############################################################################# 778#############################################################################
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 779# load/save/clean perl data associated with a map
718 780
719*cf::mapsupport::on_clean = sub { 781*cf::mapsupport::on_clean = sub {
720 my ($map) = @_; 782 my ($map) = @_;
721 783
723 defined $path or return; 785 defined $path or return;
724 786
725 unlink "$path.pst"; 787 unlink "$path.pst";
726}; 788};
727 789
728attach_to_maps prio => -10000, package => cf::mapsupport::; 790cf::map->attach (prio => -10000, package => cf::mapsupport::);
729 791
730############################################################################# 792#############################################################################
731# load/save perl data associated with player->ob objects 793# load/save perl data associated with player->ob objects
732 794
733sub all_objects(@) { 795sub all_objects(@) {
734 @_, map all_objects ($_->inv), @_ 796 @_, map all_objects ($_->inv), @_
735} 797}
736 798
737# TODO: compatibility cruft, remove when no longer needed 799# TODO: compatibility cruft, remove when no longer needed
738attach_to_players 800cf::player->attach (
739 on_load => sub { 801 on_load => sub {
740 my ($pl, $path) = @_; 802 my ($pl, $path) = @_;
741 803
742 for my $o (all_objects $pl->ob) { 804 for my $o (all_objects $pl->ob) {
743 if (my $value = $o->get_ob_key_value ("_perl_data")) { 805 if (my $value = $o->get_ob_key_value ("_perl_data")) {
745 807
746 %$o = %{ Storable::thaw pack "H*", $value }; 808 %$o = %{ Storable::thaw pack "H*", $value };
747 } 809 }
748 } 810 }
749 }, 811 },
750; 812);
751 813
752############################################################################# 814#############################################################################
753 815
754=head2 CORE EXTENSIONS 816=head2 CORE EXTENSIONS
755 817
756Functions and methods that extend core crossfire objects. 818Functions and methods that extend core crossfire objects.
819
820=head3 cf::player
757 821
758=over 4 822=over 4
759 823
760=item cf::player::exists $login 824=item cf::player::exists $login
761 825
766sub cf::player::exists($) { 830sub cf::player::exists($) {
767 cf::player::find $_[0] 831 cf::player::find $_[0]
768 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;
769} 833}
770 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
771=item $player->reply ($npc, $msg[, $flags]) 855=item $player_object->reply ($npc, $msg[, $flags])
772 856
773Sends 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>
774can 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
775dialogue with the given NPC character. 859dialogue with the given NPC character.
776 860
777=cut 861=cut
778 862
779# rough implementation of a future "reply" method that works 863# rough implementation of a future "reply" method that works
780# with dialog boxes. 864# with dialog boxes.
865#TODO: the first argument must go, split into a $npc->reply_to ( method
781sub cf::object::player::reply($$$;$) { 866sub cf::object::player::reply($$$;$) {
782 my ($self, $npc, $msg, $flags) = @_; 867 my ($self, $npc, $msg, $flags) = @_;
783 868
784 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 869 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
785 870
789 $msg = $npc->name . " says: $msg" if $npc; 874 $msg = $npc->name . " says: $msg" if $npc;
790 $self->message ($msg, $flags); 875 $self->message ($msg, $flags);
791 } 876 }
792} 877}
793 878
794=item $player->ext_reply ($msgid, $msgtype, %msg) 879=item $player_object->may ("access")
795 880
796Sends an ext reply to the player. 881Returns wether the given player is authorized to access resource "access"
882(e.g. "command_wizcast").
797 883
798=cut 884=cut
799 885
800sub 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 {
801 my ($self, $id, %msg) = @_; 972 my ($self, $cb) = @_;
802 973
803 $msg{msgid} = $id; 974 my $coro; $coro = async {
975 eval {
976 $cb->();
977 };
978 warn $@ if $@;
979 };
804 980
805 $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
806} 988}
989
990cf::client->attach (
991 on_destroy => sub {
992 my ($ns) = @_;
993
994 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
995 },
996);
807 997
808=back 998=back
809 999
810=cut
811
812#############################################################################
813 1000
814=head2 SAFE SCRIPTING 1001=head2 SAFE SCRIPTING
815 1002
816Functions that provide a safe environment to compile and execute 1003Functions that provide a safe environment to compile and execute
817snippets of perl code without them endangering the safety of the server 1004snippets of perl code without them endangering the safety of the server
818itself. Looping constructs, I/O operators and other built-in functionality 1005itself. Looping constructs, I/O operators and other built-in functionality
819is not available in the safe scripting environment, and the number of 1006is not available in the safe scripting environment, and the number of
820functions and methods that cna be called is greatly reduced. 1007functions and methods that can be called is greatly reduced.
821 1008
822=cut 1009=cut
823 1010
824our $safe = new Safe "safe"; 1011our $safe = new Safe "safe";
825our $safe_hole = new Safe::Hole; 1012our $safe_hole = new Safe::Hole;
832 1019
833=pod 1020=pod
834 1021
835The following fucntions and emthods are available within a safe environment: 1022The following fucntions and emthods are available within a safe environment:
836 1023
837 cf::object contr pay_amount pay_player 1024 cf::object contr pay_amount pay_player map
838 cf::object::player player 1025 cf::object::player player
839 cf::player peaceful 1026 cf::player peaceful
1027 cf::map trigger
840 1028
841=cut 1029=cut
842 1030
843for ( 1031for (
844 ["cf::object" => qw(contr pay_amount pay_player)], 1032 ["cf::object" => qw(contr pay_amount pay_player map)],
845 ["cf::object::player" => qw(player)], 1033 ["cf::object::player" => qw(player)],
846 ["cf::player" => qw(peaceful)], 1034 ["cf::player" => qw(peaceful)],
1035 ["cf::map" => qw(trigger)],
847) { 1036) {
848 no strict 'refs'; 1037 no strict 'refs';
849 my ($pkg, @funs) = @$_; 1038 my ($pkg, @funs) = @$_;
850 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 1039 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
851 for @funs; 1040 for @funs;
961 1150
962Immediately write the database to disk I<if it is dirty>. 1151Immediately write the database to disk I<if it is dirty>.
963 1152
964=cut 1153=cut
965 1154
1155our $DB;
1156
966{ 1157{
967 my $db;
968 my $path = cf::localdir . "/database.pst"; 1158 my $path = cf::localdir . "/database.pst";
969 1159
970 sub db_load() { 1160 sub db_load() {
971 warn "loading database $path\n";#d# remove later 1161 warn "loading database $path\n";#d# remove later
972 $db = stat $path ? Storable::retrieve $path : { }; 1162 $DB = stat $path ? Storable::retrieve $path : { };
973 } 1163 }
974 1164
975 my $pid; 1165 my $pid;
976 1166
977 sub db_save() { 1167 sub db_save() {
978 warn "saving database $path\n";#d# remove later 1168 warn "saving database $path\n";#d# remove later
979 waitpid $pid, 0 if $pid; 1169 waitpid $pid, 0 if $pid;
980 if (0 == ($pid = fork)) { 1170 if (0 == ($pid = fork)) {
981 $db->{_meta}{version} = 1; 1171 $DB->{_meta}{version} = 1;
982 Storable::nstore $db, "$path~"; 1172 Storable::nstore $DB, "$path~";
983 rename "$path~", $path; 1173 rename "$path~", $path;
984 cf::_exit 0 if defined $pid; 1174 cf::_exit 0 if defined $pid;
985 } 1175 }
986 } 1176 }
987 1177
990 sub db_sync() { 1180 sub db_sync() {
991 db_save if $dirty; 1181 db_save if $dirty;
992 undef $dirty; 1182 undef $dirty;
993 } 1183 }
994 1184
995 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 {
996 db_sync; 1186 db_sync;
997 }); 1187 });
998 1188
999 sub db_dirty() { 1189 sub db_dirty() {
1000 $dirty = 1; 1190 $dirty = 1;
1001 $idle->start; 1191 $idle->start;
1002 } 1192 }
1003 1193
1004 sub db_get($;$) { 1194 sub db_get($;$) {
1005 @_ >= 2 1195 @_ >= 2
1006 ? $db->{$_[0]}{$_[1]} 1196 ? $DB->{$_[0]}{$_[1]}
1007 : ($db->{$_[0]} ||= { }) 1197 : ($DB->{$_[0]} ||= { })
1008 } 1198 }
1009 1199
1010 sub db_put($$;$) { 1200 sub db_put($$;$) {
1011 if (@_ >= 3) { 1201 if (@_ >= 3) {
1012 $db->{$_[0]}{$_[1]} = $_[2]; 1202 $DB->{$_[0]}{$_[1]} = $_[2];
1013 } else { 1203 } else {
1014 $db->{$_[0]} = $_[1]; 1204 $DB->{$_[0]} = $_[1];
1015 } 1205 }
1016 db_dirty; 1206 db_dirty;
1017 } 1207 }
1018 1208
1019 attach_global 1209 cf::global->attach (
1020 prio => 10000, 1210 prio => 10000,
1021 on_cleanup => sub { 1211 on_cleanup => sub {
1022 db_sync; 1212 db_sync;
1023 }, 1213 },
1024 ; 1214 );
1025} 1215}
1026 1216
1027############################################################################# 1217#############################################################################
1028# the server's main() 1218# the server's main()
1029 1219
1220sub cfg_load {
1221 open my $fh, "<:utf8", cf::confdir . "/config"
1222 or return;
1223
1224 local $/;
1225 *CFG = YAML::Syck::Load <$fh>;
1226}
1227
1030sub main { 1228sub main {
1229 cfg_load;
1031 db_load; 1230 db_load;
1032 load_extensions; 1231 load_extensions;
1033 Event::loop; 1232 Event::loop;
1034} 1233}
1035 1234
1036############################################################################# 1235#############################################################################
1037# initialisation 1236# initialisation
1038 1237
1039sub _perl_reload(&) { 1238sub _perl_reload() {
1040 my ($msg) = @_; 1239 warn "reloading...";
1041
1042 $msg->("reloading...");
1043 1240
1044 eval { 1241 eval {
1242 local $FREEZE = 1;
1243
1244 cf::emergency_save;
1245
1045 # cancel all watchers 1246 # cancel all watchers
1046 $_->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 = ();
1047 1254
1048 # unload all extensions 1255 # unload all extensions
1049 for (@exts) { 1256 for (@exts) {
1050 $msg->("unloading <$_>"); 1257 warn "unloading <$_>";
1051 unload_extension $_; 1258 unload_extension $_;
1052 } 1259 }
1053 1260
1054 # unload all modules loaded from $LIBDIR 1261 # unload all modules loaded from $LIBDIR
1055 while (my ($k, $v) = each %INC) { 1262 while (my ($k, $v) = each %INC) {
1056 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 1263 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1057 1264
1058 $msg->("removing <$k>"); 1265 warn "removing <$k>";
1059 delete $INC{$k}; 1266 delete $INC{$k};
1060 1267
1061 $k =~ s/\.pm$//; 1268 $k =~ s/\.pm$//;
1062 $k =~ s/\//::/g; 1269 $k =~ s/\//::/g;
1063 1270
1068 Symbol::delete_package $k; 1275 Symbol::delete_package $k;
1069 } 1276 }
1070 1277
1071 # sync database to disk 1278 # sync database to disk
1072 cf::db_sync; 1279 cf::db_sync;
1280 IO::AIO::flush;
1073 1281
1074 # get rid of safe::, as good as possible 1282 # get rid of safe::, as good as possible
1075 Symbol::delete_package "safe::$_" 1283 Symbol::delete_package "safe::$_"
1076 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);
1077 1285
1078 # remove register_script_function callbacks 1286 # remove register_script_function callbacks
1079 # TODO 1287 # TODO
1080 1288
1081 # unload cf.pm "a bit" 1289 # unload cf.pm "a bit"
1084 # don't, removes xs symbols, too, 1292 # don't, removes xs symbols, too,
1085 # and global variables created in xs 1293 # and global variables created in xs
1086 #Symbol::delete_package __PACKAGE__; 1294 #Symbol::delete_package __PACKAGE__;
1087 1295
1088 # reload cf.pm 1296 # reload cf.pm
1089 $msg->("reloading cf.pm"); 1297 warn "reloading cf.pm";
1090 require cf; 1298 require cf;
1299 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1091 1300
1092 # load database again 1301 # load config and database again
1302 cf::cfg_load;
1093 cf::db_load; 1303 cf::db_load;
1094 1304
1095 # load extensions 1305 # load extensions
1096 $msg->("load extensions"); 1306 warn "load extensions";
1097 cf::load_extensions; 1307 cf::load_extensions;
1098 1308
1099 # reattach attachments to objects 1309 # reattach attachments to objects
1100 $msg->("reattach"); 1310 warn "reattach";
1101 _global_reattach; 1311 _global_reattach;
1102 }; 1312 };
1103 $msg->($@) if $@; 1313 warn $@ if $@;
1104 1314
1105 $msg->("reloaded"); 1315 warn "reloaded";
1106}; 1316};
1107 1317
1108sub perl_reload() { 1318sub perl_reload() {
1109 _perl_reload { 1319 _perl_reload;
1110 warn $_[0];
1111 print "$_[0]\n";
1112 };
1113} 1320}
1114 1321
1322register "<global>", __PACKAGE__;
1323
1115register_command "perl-reload", 0, sub { 1324register_command "perl-reload" => sub {
1116 my ($who, $arg) = @_; 1325 my ($who, $arg) = @_;
1117 1326
1118 if ($who->flag (FLAG_WIZ)) { 1327 if ($who->flag (FLAG_WIZ)) {
1328 $who->message ("reloading...");
1119 _perl_reload { 1329 _perl_reload;
1120 warn $_[0];
1121 $who->message ($_[0]);
1122 };
1123 } 1330 }
1124}; 1331};
1125 1332
1126register "<global>", __PACKAGE__;
1127
1128unshift @INC, $LIBDIR; 1333unshift @INC, $LIBDIR;
1129 1334
1130$TICK_WATCHER = Event->timer ( 1335$TICK_WATCHER = Event->timer (
1336 reentrant => 0,
1131 prio => 1, 1337 prio => 0,
1132 at => $NEXT_TICK || 1, 1338 at => $NEXT_TICK || $TICK,
1339 data => WF_AUTOCANCEL,
1133 cb => sub { 1340 cb => sub {
1341 unless ($FREEZE) {
1134 cf::server_tick; # one server iteration 1342 cf::server_tick; # one server iteration
1343 $RUNTIME += $TICK;
1344 }
1135 1345
1136 my $NOW = Event::time;
1137 $NEXT_TICK += $TICK; 1346 $NEXT_TICK += $TICK;
1138 1347
1139 # if we are delayed by four ticks, skip them all 1348 # if we are delayed by four ticks or more, skip them all
1140 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1349 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1141 1350
1142 $TICK_WATCHER->at ($NEXT_TICK); 1351 $TICK_WATCHER->at ($NEXT_TICK);
1143 $TICK_WATCHER->start; 1352 $TICK_WATCHER->start;
1144 }, 1353 },
1145); 1354);
1146 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
11471 13731
1148 1374

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines