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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines