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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines