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.70 by root, Sun Oct 1 10:55:37 2006 UTC vs.
Revision 1.103 by root, Sat Dec 30 10:16:11 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
204=cut
205
114############################################################################# 206#############################################################################
115 207
116=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+).
117 217
118=over 4 218=over 4
119 219
120=item $object->attach ($attachment, key => $value...)
121
122=item $object->detach ($attachment)
123
124Attach/detach a pre-registered attachment to an object.
125
126=item $player->attach ($attachment, key => $value...)
127
128=item $player->detach ($attachment)
129
130Attach/detach a pre-registered attachment to a player.
131
132=item $map->attach ($attachment, key => $value...) 220=item $attachable->attach ($attachment, key => $value...)
133 221
134=item $map->detach ($attachment) 222=item $attachable->detach ($attachment)
135 223
136Attach/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.
137 226
138=item $bool = $object->attached ($name) 227Example, attach a minesweeper attachment to the given object, making it a
22810x10 minesweeper game:
139 229
140=item $bool = $player->attached ($name) 230 $obj->attach (minesweeper => width => 10, height => 10);
141 231
142=item $bool = $map->attached ($name) 232=item $bool = $attachable->attached ($name)
143 233
144Checks wether the named attachment is currently attached to the object. 234Checks wether the named attachment is currently attached to the object.
145 235
146=item cf::attach_global ... 236=item cf::CLASS->attach ...
147 237
148Attach handlers for global events. 238=item cf::CLASS->detach ...
149 239
150This and all following C<attach_*>-functions expect any number of the 240Define an anonymous attachment and attach it to all objects of the given
151following 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:
152 274
153=over 4 275=over 4
154 276
155=item prio => $number 277=item prio => $number
156 278
158by another C<prio> setting). Lower priority handlers get executed 280by another C<prio> setting). Lower priority handlers get executed
159earlier. 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
160registered at priority C<-1000>, so lower priorities should not be used 282registered at priority C<-1000>, so lower priorities should not be used
161unless you know what you are doing. 283unless you know what you are doing.
162 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
163=item on_I<event> => \&cb 291=item on_I<event> => \&cb
164 292
165Call the given code reference whenever the named event happens (event is 293Call the given code reference whenever the named event happens (event is
166something 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
167handlers are recognised generally depends on the type of object these 295handlers are recognised generally depends on the type of object these
176package and register them. Only handlers for eevents supported by the 304package and register them. Only handlers for eevents supported by the
177object/class are recognised. 305object/class are recognised.
178 306
179=back 307=back
180 308
181=item cf::attach_to_type $object_type, $subtype, ... 309Example, define an attachment called "sockpuppet" that calls the given
310event handler when a monster attacks:
182 311
183Attach handlers for a specific object type (e.g. TRANSPORT) and 312 cf::object::attachment sockpuppet =>
184subtype. If C<$subtype> is zero or undef, matches all objects of the given 313 on_skill_attack => sub {
185type. 314 my ($self, $victim) = @_;
186 315 ...
187=item cf::attach_to_objects ...
188
189Attach handlers to all objects. Do not use this except for debugging or
190very rare events, as handlers are (obviously) called for I<all> objects in
191the game.
192
193=item cf::attach_to_players ...
194
195Attach handlers to all players.
196
197=item cf::attach_to_maps ...
198
199Attach handlers to all maps.
200
201=item cf:register_attachment $name, ...
202
203Register an attachment by name through which objects can refer to this
204attachment.
205
206=item cf:register_player_attachment $name, ...
207
208Register an attachment by name through which players can refer to this
209attachment.
210
211=item cf:register_map_attachment $name, ...
212
213Register an attachment by name through which maps can refer to this
214attachment.
215
216=cut
217
218# the following variables are defined in .xs and must not be re-created
219our @CB_GLOBAL = (); # registry for all global events
220our @CB_OBJECT = (); # all objects (should not be used except in emergency)
221our @CB_PLAYER = ();
222our @CB_TYPE = (); # registry for type (cf-object class) based events
223our @CB_MAP = ();
224
225my %attachment;
226
227sub _attach_cb($\%$$$) {
228 my ($registry, $undo, $event, $prio, $cb) = @_;
229
230 use sort 'stable';
231
232 $cb = [$prio, $cb];
233
234 @{$registry->[$event]} = sort
235 { $a->[0] cmp $b->[0] }
236 @{$registry->[$event] || []}, $cb;
237
238 push @{$undo->{cb}}, [$event, $cb];
239}
240
241# attach handles attaching event callbacks
242# the only thing the caller has to do is pass the correct
243# registry (== where the callback attaches to).
244sub _attach(\@$@) {
245 my ($registry, $klass, @arg) = @_;
246
247 my $prio = 0;
248
249 my %undo = (
250 registry => $registry,
251 cb => [],
252 );
253
254 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
255
256 while (@arg) {
257 my $type = shift @arg;
258
259 if ($type eq "prio") {
260 $prio = shift @arg;
261
262 } elsif ($type eq "package") {
263 my $pkg = shift @arg;
264
265 while (my ($name, $id) = each %cb_id) {
266 if (my $cb = $pkg->can ($name)) {
267 _attach_cb $registry, %undo, $id, $prio, $cb;
268 }
269 } 316 }
270
271 } elsif (exists $cb_id{$type}) {
272 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
273
274 } elsif (ref $type) {
275 warn "attaching objects not supported, ignoring.\n";
276
277 } else {
278 shift @arg;
279 warn "attach argument '$type' not supported, ignoring.\n";
280 }
281 }
282
283 \%undo
284}
285
286sub _attach_attachment {
287 my ($obj, $name, %arg) = @_;
288
289 return if exists $obj->{_attachment}{$name};
290
291 my $res;
292
293 if (my $attach = $attachment{$name}) {
294 my $registry = $obj->registry;
295
296 for (@$attach) {
297 my ($klass, @attach) = @$_;
298 $res = _attach @$registry, $klass, @attach;
299 }
300
301 $obj->{$name} = \%arg;
302 } else {
303 warn "object uses attachment '$name' that is not available, postponing.\n";
304 }
305
306 $obj->{_attachment}{$name} = undef;
307
308 $res->{attachment} = $name;
309 $res
310}
311
312*cf::object::attach =
313*cf::player::attach =
314*cf::map::attach = sub {
315 my ($obj, $name, %arg) = @_;
316
317 _attach_attachment $obj, $name, %arg;
318};
319
320# all those should be optimised
321*cf::object::detach =
322*cf::player::detach =
323*cf::map::detach = sub {
324 my ($obj, $name) = @_;
325
326 delete $obj->{_attachment}{$name};
327 reattach ($obj);
328};
329
330*cf::object::attached =
331*cf::player::attached =
332*cf::map::attached = sub {
333 my ($obj, $name) = @_;
334
335 exists $obj->{_attachment}{$name}
336};
337
338sub attach_global {
339 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
340}
341
342sub attach_to_type {
343 my $type = shift;
344 my $subtype = shift;
345
346 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
347}
348
349sub attach_to_objects {
350 _attach @CB_OBJECT, KLASS_OBJECT, @_
351}
352
353sub attach_to_players {
354 _attach @CB_PLAYER, KLASS_PLAYER, @_
355}
356
357sub attach_to_maps {
358 _attach @CB_MAP, KLASS_MAP, @_
359}
360
361sub register_attachment {
362 my $name = shift;
363
364 $attachment{$name} = [[KLASS_OBJECT, @_]];
365}
366
367sub register_player_attachment {
368 my $name = shift;
369
370 $attachment{$name} = [[KLASS_PLAYER, @_]];
371}
372
373sub register_map_attachment {
374 my $name = shift;
375
376 $attachment{$name} = [[KLASS_MAP, @_]];
377}
378
379our $override;
380our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
381
382sub override {
383 $override = 1;
384 @invoke_results = ();
385}
386
387sub do_invoke {
388 my $event = shift;
389 my $callbacks = shift;
390
391 @invoke_results = ();
392
393 local $override;
394
395 for (@$callbacks) {
396 eval { &{$_->[1]} };
397
398 if ($@) {
399 warn "$@";
400 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
401 override;
402 }
403
404 return 1 if $override;
405 }
406
407 0 317 }
408}
409 318
410=item $bool = cf::invoke EVENT_GLOBAL_XXX, ... 319=item $attachable->valid
411
412=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
413
414=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
415
416=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
417
418Generate a global/object/player/map-specific event with the given arguments.
419
420This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
421removed in future versions), and there is no public API to access override
422results (if you must, access C<@cf::invoke_results> directly).
423
424=back
425
426#############################################################################
427
428=head2 METHODS VALID FOR ALL CORE OBJECTS
429
430=over 4
431
432=item $object->valid, $player->valid, $map->valid
433 320
434Just 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
435C-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
436valid C counterpart anymore you get an exception at runtime. This method 323valid C counterpart anymore you get an exception at runtime. This method
437can 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
438exception. 325exception.
439 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
440=back 510=back
441 511
442=cut 512=cut
443
444*cf::object::valid =
445*cf::player::valid =
446*cf::map::valid = \&cf::_valid;
447 513
448############################################################################# 514#############################################################################
449# object support 515# object support
450 516
451sub instantiate {
452 my ($obj, $data) = @_;
453
454 $data = from_json $data;
455
456 for (@$data) {
457 my ($name, $args) = @$_;
458
459 $obj->attach ($name, %{$args || {} });
460 }
461}
462
463# basically do the same as instantiate, without calling instantiate
464sub reattach { 517sub reattach {
518 # basically do the same as instantiate, without calling instantiate
465 my ($obj) = @_; 519 my ($obj) = @_;
520
466 my $registry = $obj->registry; 521 my $registry = $obj->registry;
467 522
468 @$registry = (); 523 @$registry = ();
469 524
470 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} }; 525 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
471 526
472 for my $name (keys %{ $obj->{_attachment} || {} }) { 527 for my $name (keys %{ $obj->{_attachment} || {} }) {
473 if (my $attach = $attachment{$name}) { 528 if (my $attach = $attachment{$name}) {
474 for (@$attach) { 529 for (@$attach) {
475 my ($klass, @attach) = @$_; 530 my ($klass, @attach) = @$_;
476 _attach @$registry, $klass, @attach; 531 _attach $registry, $klass, @attach;
477 } 532 }
478 } else { 533 } else {
479 warn "object uses attachment '$name' that is not available, postponing.\n"; 534 warn "object uses attachment '$name' that is not available, postponing.\n";
480 } 535 }
481 } 536 }
482} 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);
483 564
484sub object_freezer_save { 565sub object_freezer_save {
485 my ($filename, $rdata, $objs) = @_; 566 my ($filename, $rdata, $objs) = @_;
486 567
487 if (length $$rdata) { 568 if (length $$rdata) {
510 unlink $filename; 591 unlink $filename;
511 unlink "$filename.pst"; 592 unlink "$filename.pst";
512 } 593 }
513} 594}
514 595
596sub object_freezer_as_string {
597 my ($rdata, $objs) = @_;
598
599 use Data::Dumper;
600
601 $$rdata . Dumper $objs
602}
603
515sub object_thawer_load { 604sub object_thawer_load {
516 my ($filename) = @_; 605 my ($filename) = @_;
517 606
518 local $/; 607 local $/;
519 608
529 } 618 }
530 619
531 () 620 ()
532} 621}
533 622
534attach_to_objects
535 prio => -1000000,
536 on_clone => sub {
537 my ($src, $dst) = @_;
538
539 @{$dst->registry} = @{$src->registry};
540
541 %$dst = %$src;
542
543 %{$dst->{_attachment}} = %{$src->{_attachment}}
544 if exists $src->{_attachment};
545 },
546;
547
548############################################################################# 623#############################################################################
549# old plug-in events 624# command handling &c
550 625
551sub inject_event { 626=item cf::register_command $name => \&callback($ob,$args);
552 my $extension = shift;
553 my $event_code = shift;
554 627
555 my $cb = $hook[$event_code]{$extension} 628Register a callback for execution when the client sends the user command
556 or return; 629$name.
557 630
558 &$cb 631=cut
559}
560
561sub inject_global_event {
562 my $event = shift;
563
564 my $cb = $hook[$event]
565 or return;
566
567 List::Util::max map &$_, values %$cb
568}
569
570sub inject_command {
571 my ($name, $obj, $params) = @_;
572
573 for my $cmd (@{ $command{$name} }) {
574 $cmd->[1]->($obj, $params);
575 }
576
577 -1
578}
579 632
580sub register_command { 633sub register_command {
581 my ($name, $time, $cb) = @_; 634 my ($name, $cb) = @_;
582 635
583 my $caller = caller; 636 my $caller = caller;
584 #warn "registering command '$name/$time' to '$caller'"; 637 #warn "registering command '$name/$time' to '$caller'";
585 638
586 push @{ $command{$name} }, [$time, $cb, $caller]; 639 push @{ $COMMAND{$name} }, [$caller, $cb];
587 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
588} 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
589 650
590sub register_extcmd { 651sub register_extcmd {
591 my ($name, $cb) = @_; 652 my ($name, $cb) = @_;
592 653
593 my $caller = caller; 654 my $caller = caller;
594 #warn "registering extcmd '$name' to '$caller'"; 655 #warn "registering extcmd '$name' to '$caller'";
595 656
596 $extcmd{$name} = [$cb, $caller]; 657 $EXTCMD{$name} = [$cb, $caller];
597} 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);
598 691
599sub register { 692sub register {
600 my ($base, $pkg) = @_; 693 my ($base, $pkg) = @_;
601 694
602 #TODO 695 #TODO
621 . "#line 1 \"$path\"\n{\n" 714 . "#line 1 \"$path\"\n{\n"
622 . (do { local $/; <$fh> }) 715 . (do { local $/; <$fh> })
623 . "\n};\n1"; 716 . "\n};\n1";
624 717
625 eval $source 718 eval $source
626 or die "$path: $@"; 719 or die $@ ? "$path: $@\n"
720 : "extension disabled.\n";
627 721
628 push @exts, $pkg; 722 push @exts, $pkg;
629 $ext_pkg{$base} = $pkg; 723 $ext_pkg{$base} = $pkg;
630 724
631# no strict 'refs'; 725# no strict 'refs';
644# for my $idx (0 .. $#PLUGIN_EVENT) { 738# for my $idx (0 .. $#PLUGIN_EVENT) {
645# delete $hook[$idx]{$pkg}; 739# delete $hook[$idx]{$pkg};
646# } 740# }
647 741
648 # remove commands 742 # remove commands
649 for my $name (keys %command) { 743 for my $name (keys %COMMAND) {
650 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 744 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
651 745
652 if (@cb) { 746 if (@cb) {
653 $command{$name} = \@cb; 747 $COMMAND{$name} = \@cb;
654 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
655 } else { 748 } else {
656 delete $command{$name};
657 delete $COMMAND{"$name\000"}; 749 delete $COMMAND{$name};
658 } 750 }
659 } 751 }
660 752
661 # remove extcmds 753 # remove extcmds
662 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 754 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
663 delete $extcmd{$name}; 755 delete $EXTCMD{$name};
664 } 756 }
665 757
666 if (my $cb = $pkg->can ("unload")) { 758 if (my $cb = $pkg->can ("unload")) {
667 eval { 759 eval {
668 $cb->($pkg); 760 $cb->($pkg);
672 764
673 Symbol::delete_package $pkg; 765 Symbol::delete_package $pkg;
674} 766}
675 767
676sub load_extensions { 768sub load_extensions {
677 my $LIBDIR = maps_directory "perl";
678
679 for my $ext (<$LIBDIR/*.ext>) { 769 for my $ext (<$LIBDIR/*.ext>) {
680 next unless -r $ext; 770 next unless -r $ext;
681 eval { 771 eval {
682 load_extension $ext; 772 load_extension $ext;
683 1 773 1
684 } or warn "$ext not loaded: $@"; 774 } or warn "$ext not loaded: $@";
685 } 775 }
686} 776}
687 777
688############################################################################# 778#############################################################################
689# extcmd framework, basically convert ext <msg>
690# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
691
692attach_to_players
693 on_extcmd => sub {
694 my ($pl, $buf) = @_;
695
696 my $msg = eval { from_json $buf };
697
698 if (ref $msg) {
699 if (my $cb = $extcmd{$msg->{msgtype}}) {
700 if (my %reply = $cb->[0]->($pl, $msg)) {
701 $pl->ext_reply ($msg->{msgid}, %reply);
702 }
703 }
704 } else {
705 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
706 }
707
708 cf::override;
709 },
710;
711
712#############################################################################
713# load/save/clean perl data associated with a map 779# load/save/clean perl data associated with a map
714 780
715*cf::mapsupport::on_clean = sub { 781*cf::mapsupport::on_clean = sub {
716 my ($map) = @_; 782 my ($map) = @_;
717 783
719 defined $path or return; 785 defined $path or return;
720 786
721 unlink "$path.pst"; 787 unlink "$path.pst";
722}; 788};
723 789
724attach_to_maps prio => -10000, package => cf::mapsupport::; 790cf::map->attach (prio => -10000, package => cf::mapsupport::);
725 791
726############################################################################# 792#############################################################################
727# load/save perl data associated with player->ob objects 793# load/save perl data associated with player->ob objects
728 794
729sub all_objects(@) { 795sub all_objects(@) {
730 @_, map all_objects ($_->inv), @_ 796 @_, map all_objects ($_->inv), @_
731} 797}
732 798
733# TODO: compatibility cruft, remove when no longer needed 799# TODO: compatibility cruft, remove when no longer needed
734attach_to_players 800cf::player->attach (
735 on_load => sub { 801 on_load => sub {
736 my ($pl, $path) = @_; 802 my ($pl, $path) = @_;
737 803
738 for my $o (all_objects $pl->ob) { 804 for my $o (all_objects $pl->ob) {
739 if (my $value = $o->get_ob_key_value ("_perl_data")) { 805 if (my $value = $o->get_ob_key_value ("_perl_data")) {
741 807
742 %$o = %{ Storable::thaw pack "H*", $value }; 808 %$o = %{ Storable::thaw pack "H*", $value };
743 } 809 }
744 } 810 }
745 }, 811 },
746; 812);
747 813
748############################################################################# 814#############################################################################
749 815
750=head2 CORE EXTENSIONS 816=head2 CORE EXTENSIONS
751 817
752Functions and methods that extend core crossfire objects. 818Functions and methods that extend core crossfire objects.
819
820=head3 cf::player
753 821
754=over 4 822=over 4
755 823
756=item cf::player::exists $login 824=item cf::player::exists $login
757 825
762sub cf::player::exists($) { 830sub cf::player::exists($) {
763 cf::player::find $_[0] 831 cf::player::find $_[0]
764 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;
765} 833}
766 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
767=item $player->reply ($npc, $msg[, $flags]) 855=item $player_object->reply ($npc, $msg[, $flags])
768 856
769Sends 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>
770can 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
771dialogue with the given NPC character. 859dialogue with the given NPC character.
772 860
773=cut 861=cut
774 862
775# rough implementation of a future "reply" method that works 863# rough implementation of a future "reply" method that works
776# with dialog boxes. 864# with dialog boxes.
865#TODO: the first argument must go, split into a $npc->reply_to ( method
777sub cf::object::player::reply($$$;$) { 866sub cf::object::player::reply($$$;$) {
778 my ($self, $npc, $msg, $flags) = @_; 867 my ($self, $npc, $msg, $flags) = @_;
779 868
780 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 869 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
781 870
785 $msg = $npc->name . " says: $msg" if $npc; 874 $msg = $npc->name . " says: $msg" if $npc;
786 $self->message ($msg, $flags); 875 $self->message ($msg, $flags);
787 } 876 }
788} 877}
789 878
790=item $player->ext_reply ($msgid, $msgtype, %msg) 879=item $player_object->may ("access")
791 880
792Sends an ext reply to the player. 881Returns wether the given player is authorized to access resource "access"
882(e.g. "command_wizcast").
793 883
794=cut 884=cut
795 885
796sub 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 {
797 my ($self, $id, %msg) = @_; 972 my ($self, $cb) = @_;
798 973
799 $msg{msgid} = $id; 974 my $coro; $coro = async {
975 eval {
976 $cb->();
977 };
978 warn $@ if $@;
979 };
800 980
801 $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
802} 988}
989
990cf::client->attach (
991 on_destroy => sub {
992 my ($ns) = @_;
993
994 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
995 },
996);
803 997
804=back 998=back
805 999
806=cut
807
808#############################################################################
809 1000
810=head2 SAFE SCRIPTING 1001=head2 SAFE SCRIPTING
811 1002
812Functions that provide a safe environment to compile and execute 1003Functions that provide a safe environment to compile and execute
813snippets of perl code without them endangering the safety of the server 1004snippets of perl code without them endangering the safety of the server
814itself. Looping constructs, I/O operators and other built-in functionality 1005itself. Looping constructs, I/O operators and other built-in functionality
815is not available in the safe scripting environment, and the number of 1006is not available in the safe scripting environment, and the number of
816functions and methods that cna be called is greatly reduced. 1007functions and methods that can be called is greatly reduced.
817 1008
818=cut 1009=cut
819 1010
820our $safe = new Safe "safe"; 1011our $safe = new Safe "safe";
821our $safe_hole = new Safe::Hole; 1012our $safe_hole = new Safe::Hole;
828 1019
829=pod 1020=pod
830 1021
831The following fucntions and emthods are available within a safe environment: 1022The following fucntions and emthods are available within a safe environment:
832 1023
833 cf::object contr pay_amount pay_player 1024 cf::object contr pay_amount pay_player map
834 cf::object::player player 1025 cf::object::player player
835 cf::player peaceful 1026 cf::player peaceful
1027 cf::map trigger
836 1028
837=cut 1029=cut
838 1030
839for ( 1031for (
840 ["cf::object" => qw(contr pay_amount pay_player)], 1032 ["cf::object" => qw(contr pay_amount pay_player map)],
841 ["cf::object::player" => qw(player)], 1033 ["cf::object::player" => qw(player)],
842 ["cf::player" => qw(peaceful)], 1034 ["cf::player" => qw(peaceful)],
1035 ["cf::map" => qw(trigger)],
843) { 1036) {
844 no strict 'refs'; 1037 no strict 'refs';
845 my ($pkg, @funs) = @$_; 1038 my ($pkg, @funs) = @$_;
846 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 1039 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
847 for @funs; 1040 for @funs;
912 *{"safe::$fun"} = $safe_hole->wrap ($cb); 1105 *{"safe::$fun"} = $safe_hole->wrap ($cb);
913} 1106}
914 1107
915=back 1108=back
916 1109
1110=cut
1111
917############################################################################# 1112#############################################################################
918 1113
919=head2 EXTENSION DATABASE SUPPORT 1114=head2 EXTENSION DATABASE SUPPORT
920 1115
921Crossfire maintains a very simple database for extension use. It can 1116Crossfire maintains a very simple database for extension use. It can
955 1150
956Immediately write the database to disk I<if it is dirty>. 1151Immediately write the database to disk I<if it is dirty>.
957 1152
958=cut 1153=cut
959 1154
1155our $DB;
1156
960{ 1157{
961 my $db;
962 my $path = cf::localdir . "/database.pst"; 1158 my $path = cf::localdir . "/database.pst";
963 1159
964 sub db_load() { 1160 sub db_load() {
965 warn "loading database $path\n";#d# remove later 1161 warn "loading database $path\n";#d# remove later
966 $db = stat $path ? Storable::retrieve $path : { }; 1162 $DB = stat $path ? Storable::retrieve $path : { };
967 } 1163 }
968 1164
969 my $pid; 1165 my $pid;
970 1166
971 sub db_save() { 1167 sub db_save() {
972 warn "saving database $path\n";#d# remove later 1168 warn "saving database $path\n";#d# remove later
973 waitpid $pid, 0 if $pid; 1169 waitpid $pid, 0 if $pid;
974 if (0 == ($pid = fork)) { 1170 if (0 == ($pid = fork)) {
975 $db->{_meta}{version} = 1; 1171 $DB->{_meta}{version} = 1;
976 Storable::nstore $db, "$path~"; 1172 Storable::nstore $DB, "$path~";
977 rename "$path~", $path; 1173 rename "$path~", $path;
978 cf::_exit 0 if defined $pid; 1174 cf::_exit 0 if defined $pid;
979 } 1175 }
980 } 1176 }
981 1177
984 sub db_sync() { 1180 sub db_sync() {
985 db_save if $dirty; 1181 db_save if $dirty;
986 undef $dirty; 1182 undef $dirty;
987 } 1183 }
988 1184
989 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 {
990 db_sync; 1186 db_sync;
991 }); 1187 });
992 1188
993 sub db_dirty() { 1189 sub db_dirty() {
994 $dirty = 1; 1190 $dirty = 1;
995 $idle->start; 1191 $idle->start;
996 } 1192 }
997 1193
998 sub db_get($;$) { 1194 sub db_get($;$) {
999 @_ >= 2 1195 @_ >= 2
1000 ? $db->{$_[0]}{$_[1]} 1196 ? $DB->{$_[0]}{$_[1]}
1001 : ($db->{$_[0]} ||= { }) 1197 : ($DB->{$_[0]} ||= { })
1002 } 1198 }
1003 1199
1004 sub db_put($$;$) { 1200 sub db_put($$;$) {
1005 if (@_ >= 3) { 1201 if (@_ >= 3) {
1006 $db->{$_[0]}{$_[1]} = $_[2]; 1202 $DB->{$_[0]}{$_[1]} = $_[2];
1007 } else { 1203 } else {
1008 $db->{$_[0]} = $_[1]; 1204 $DB->{$_[0]} = $_[1];
1009 } 1205 }
1010 db_dirty; 1206 db_dirty;
1011 } 1207 }
1012 1208
1013 attach_global 1209 cf::global->attach (
1014 prio => 10000, 1210 prio => 10000,
1015 on_cleanup => sub { 1211 on_cleanup => sub {
1016 db_sync; 1212 db_sync;
1017 }, 1213 },
1018 ; 1214 );
1019} 1215}
1020 1216
1021############################################################################# 1217#############################################################################
1022# the server's main() 1218# the server's main()
1023 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
1024sub main { 1228sub main {
1229 cfg_load;
1025 db_load; 1230 db_load;
1026 load_extensions; 1231 load_extensions;
1027 Event::loop; 1232 Event::loop;
1028} 1233}
1029 1234
1030############################################################################# 1235#############################################################################
1031# initialisation 1236# initialisation
1032 1237
1033sub _perl_reload(&) { 1238sub _perl_reload() {
1034 my ($msg) = @_; 1239 warn "reloading...";
1035
1036 $msg->("reloading...");
1037 1240
1038 eval { 1241 eval {
1242 local $FREEZE = 1;
1243
1244 cf::emergency_save;
1245
1039 # cancel all watchers 1246 # cancel all watchers
1040 $_->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 = ();
1041 1254
1042 # unload all extensions 1255 # unload all extensions
1043 for (@exts) { 1256 for (@exts) {
1044 $msg->("unloading <$_>"); 1257 warn "unloading <$_>";
1045 unload_extension $_; 1258 unload_extension $_;
1046 } 1259 }
1047 1260
1048 # unload all modules loaded from $LIBDIR 1261 # unload all modules loaded from $LIBDIR
1049 while (my ($k, $v) = each %INC) { 1262 while (my ($k, $v) = each %INC) {
1050 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 1263 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1051 1264
1052 $msg->("removing <$k>"); 1265 warn "removing <$k>";
1053 delete $INC{$k}; 1266 delete $INC{$k};
1054 1267
1055 $k =~ s/\.pm$//; 1268 $k =~ s/\.pm$//;
1056 $k =~ s/\//::/g; 1269 $k =~ s/\//::/g;
1057 1270
1062 Symbol::delete_package $k; 1275 Symbol::delete_package $k;
1063 } 1276 }
1064 1277
1065 # sync database to disk 1278 # sync database to disk
1066 cf::db_sync; 1279 cf::db_sync;
1280 IO::AIO::flush;
1067 1281
1068 # get rid of safe::, as good as possible 1282 # get rid of safe::, as good as possible
1069 Symbol::delete_package "safe::$_" 1283 Symbol::delete_package "safe::$_"
1070 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);
1071 1285
1072 # remove register_script_function callbacks 1286 # remove register_script_function callbacks
1073 # TODO 1287 # TODO
1074 1288
1075 # unload cf.pm "a bit" 1289 # unload cf.pm "a bit"
1078 # don't, removes xs symbols, too, 1292 # don't, removes xs symbols, too,
1079 # and global variables created in xs 1293 # and global variables created in xs
1080 #Symbol::delete_package __PACKAGE__; 1294 #Symbol::delete_package __PACKAGE__;
1081 1295
1082 # reload cf.pm 1296 # reload cf.pm
1083 $msg->("reloading cf.pm"); 1297 warn "reloading cf.pm";
1084 require cf; 1298 require cf;
1299 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1085 1300
1086 # load database again 1301 # load config and database again
1302 cf::cfg_load;
1087 cf::db_load; 1303 cf::db_load;
1088 1304
1089 # load extensions 1305 # load extensions
1090 $msg->("load extensions"); 1306 warn "load extensions";
1091 cf::load_extensions; 1307 cf::load_extensions;
1092 1308
1093 # reattach attachments to objects 1309 # reattach attachments to objects
1094 $msg->("reattach"); 1310 warn "reattach";
1095 _global_reattach; 1311 _global_reattach;
1096 }; 1312 };
1097 $msg->($@) if $@; 1313 warn $@ if $@;
1098 1314
1099 $msg->("reloaded"); 1315 warn "reloaded";
1100}; 1316};
1101 1317
1102sub perl_reload() { 1318sub perl_reload() {
1103 _perl_reload { 1319 _perl_reload;
1104 warn $_[0];
1105 print "$_[0]\n";
1106 };
1107} 1320}
1108 1321
1322register "<global>", __PACKAGE__;
1323
1109register_command "perl-reload", 0, sub { 1324register_command "perl-reload" => sub {
1110 my ($who, $arg) = @_; 1325 my ($who, $arg) = @_;
1111 1326
1112 if ($who->flag (FLAG_WIZ)) { 1327 if ($who->flag (FLAG_WIZ)) {
1328 $who->message ("reloading...");
1113 _perl_reload { 1329 _perl_reload;
1114 warn $_[0];
1115 $who->message ($_[0]);
1116 };
1117 } 1330 }
1118}; 1331};
1119 1332
1120register "<global>", __PACKAGE__;
1121
1122unshift @INC, $LIBDIR; 1333unshift @INC, $LIBDIR;
1123 1334
1124$TICK_WATCHER = Event->timer ( 1335$TICK_WATCHER = Event->timer (
1125 prio => 1, 1336 prio => 0,
1126 at => $NEXT_TICK || 1, 1337 at => $NEXT_TICK || $TICK,
1338 data => WF_AUTOCANCEL,
1127 cb => sub { 1339 cb => sub {
1340 unless ($FREEZE) {
1128 cf::server_tick; # one server iteration 1341 cf::server_tick; # one server iteration
1342 $RUNTIME += $TICK;
1343 }
1129 1344
1130 my $NOW = Event::time;
1131 $NEXT_TICK += $TICK; 1345 $NEXT_TICK += $TICK;
1132 1346
1133 # if we are delayed by four ticks, skip them all 1347 # if we are delayed by four ticks or more, skip them all
1134 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1348 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1135 1349
1136 $TICK_WATCHER->at ($NEXT_TICK); 1350 $TICK_WATCHER->at ($NEXT_TICK);
1137 $TICK_WATCHER->start; 1351 $TICK_WATCHER->start;
1138 }, 1352 },
1139); 1353);
1140 1354
1355IO::AIO::max_poll_time $TICK * 0.2;
1356
1357Event->io (fd => IO::AIO::poll_fileno,
1358 poll => 'r',
1359 prio => 5,
1360 data => WF_AUTOCANCEL,
1361 cb => \&IO::AIO::poll_cb);
1362
1363# we must not ever block the main coroutine
1364$Coro::idle = sub {
1365 #Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d#
1366 warn "FATAL: Coro::idle was called, major BUG\n";
1367 (Coro::unblock_sub {
1368 Event::one_event;
1369 })->();
1370};
1371
11411 13721
1142 1373

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines