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.79 by root, Tue Nov 7 14:58:35 2006 UTC vs.
Revision 1.104 by root, Sat Dec 30 16:56:16 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines