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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines