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.45 by root, Sat Aug 26 23:36:32 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;
15 27
28$Coro::main->prio (Coro::PRIO_MIN);
29
30sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31
16our %COMMAND = (); 32our %COMMAND = ();
33our %COMMAND_TIME = ();
34our %EXTCMD = ();
35
36_init_vars;
37
17our @EVENT; 38our @EVENT;
18our %PROP_TYPE; 39our $LIBDIR = datadir . "/ext";
19our %PROP_IDX;
20our $LIBDIR = maps_directory "perl";
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
37my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply! 88@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
38 89@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
39# generate property mutators 90@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
40sub prop_gen { 91@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
41 my ($prefix, $class) = @_; 92@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
42
43 no strict 'refs';
44
45 for my $prop (keys %PROP_TYPE) {
46 $prop =~ /^\Q$prefix\E_(.*$)/ or next;
47 my $sub = lc $1;
48
49 my $type = $PROP_TYPE{$prop};
50 my $idx = $PROP_IDX {$prop};
51
52 *{"$class\::get_$sub"} = *{"$class\::$sub"} = sub {
53 $_[0]->get_property ($type, $idx)
54 };
55
56 *{"$class\::set_$sub"} = sub {
57 $_[0]->set_property ($type, $idx, $_[1]);
58 } unless $ignore_set{$prop};
59 }
60}
61
62# auto-generate most of the API
63
64prop_gen OBJECT_PROP => "cf::object";
65# CFAPI_OBJECT_ANIMATION?
66prop_gen PLAYER_PROP => "cf::object::player";
67
68prop_gen MAP_PROP => "cf::map";
69prop_gen ARCH_PROP => "cf::arch";
70
71@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 93@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
72 94
73# 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
74# within the Safe compartment. 96# within the Safe compartment.
75for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) { 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)) {
76 no strict 'refs'; 104 no strict 'refs';
77 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 105 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
78} 106}
79 107
80$Event::DIED = sub { 108$Event::DIED = sub {
82}; 110};
83 111
84my %ext_pkg; 112my %ext_pkg;
85my @exts; 113my @exts;
86my @hook; 114my @hook;
87my %command;
88my %extcmd;
89 115
90############################################################################# 116=head2 UTILITY FUNCTIONS
91# utility functions 117
118=over 4
119
120=cut
92 121
93use 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
94 129
95sub from_json($) { 130sub from_json($) {
96 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs 131 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
97 JSON::Syck::Load $_[0] 132 JSON::Syck::Load $_[0]
98} 133}
99 134
135=item $json = cf::to_json $ref
136
137Converts a perl data structure into its JSON representation.
138
139=cut
140
100sub to_json($) { 141sub to_json($) {
101 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 142 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
102 JSON::Syck::Dump $_[0] 143 JSON::Syck::Dump $_[0]
103} 144}
104 145
146=back
147
148=cut
149
105############################################################################# 150#############################################################################
106# "new" plug-in system
107 151
108=item cf::object::attach ... # NYI 152=head2 ATTACHABLE OBJECTS
109 153
110=item cf::attach_global ... 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.
111 157
112=item cf::attach_to_type $object_type, ... 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+).
113 161
114=item cf::attach_to_objects ... 162=over 4
115 163
116=item cf::attach_to_players ... 164=item $attachable->attach ($attachment, key => $value...)
117 165
118=item cf::attach_to_maps ... 166=item $attachable->detach ($attachment)
119 167
168Attach/detach a pre-registered attachment to a specific object and give it
169the specified key/value pairs as arguments.
170
171Example, attach a minesweeper attachment to the given object, making it a
17210x10 minesweeper game:
173
174 $obj->attach (minesweeper => width => 10, height => 10);
175
176=item $bool = $attachable->attached ($name)
177
178Checks wether the named attachment is currently attached to the object.
179
180=item cf::CLASS->attach ...
181
182=item cf::CLASS->detach ...
183
184Define an anonymous attachment and attach it to all objects of the given
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
120=item cf:register_attachment $name, ... 209=item cf::CLASS::attachment $name, ...
121 210
122 prio => $number, # lower is earlier 211Register an attachment by C<$name> through which attachable objects of the
123 on_xxx => \&cb, 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:
218
219=over 4
220
221=item prio => $number
222
223Set the priority for all following handlers/hooks (unless overwritten
224by another C<prio> setting). Lower priority handlers get executed
225earlier. The default priority is C<0>, and many built-in handlers are
226registered at priority C<-1000>, so lower priorities should not be used
227unless you know what you are doing.
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
235=item on_I<event> => \&cb
236
237Call the given code reference whenever the named event happens (event is
238something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
239handlers are recognised generally depends on the type of object these
240handlers attach to).
241
242See F<include/eventinc.h> for the full list of events supported, and their
243class.
244
124 package => package::, 245=item package => package::
246
247Look for sub functions of the name C<< on_I<event> >> in the given
248package and register them. Only handlers for eevents supported by the
249object/class are recognised.
250
251=back
252
253Example, define an attachment called "sockpuppet" that calls the given
254event handler when a monster attacks:
255
256 cf::object::attachment sockpuppet =>
257 on_skill_attack => sub {
258 my ($self, $victim) = @_;
259 ...
260 }
261 }
262
263=item $attachable->valid
264
265Just because you have a perl object does not mean that the corresponding
266C-level object still exists. If you try to access an object that has no
267valid C counterpart anymore you get an exception at runtime. This method
268can be used to test for existence of the C object part without causing an
269exception.
125 270
126=cut 271=cut
127 272
128# the following variables are defined in .xs and must not be re-created 273# the following variables are defined in .xs and must not be re-created
129our @CB_GLOBAL = (); # registry for all global events 274our @CB_GLOBAL = (); # registry for all global events
130our @CB_OBJECT = (); # all objects (should not be used except in emergency) 275our @CB_OBJECT = (); # all objects (should not be used except in emergency)
131our @CB_PLAYER = (); 276our @CB_PLAYER = ();
277our @CB_CLIENT = ();
132our @CB_TYPE = (); # registry for type (cf-object class) based events 278our @CB_TYPE = (); # registry for type (cf-object class) based events
133our @CB_MAP = (); 279our @CB_MAP = ();
134 280
135my %attachment; 281my %attachment;
136 282
137sub _attach_cb($\%$$$) { 283sub _attach_cb($$$$) {
138 my ($registry, $undo, $event, $prio, $cb) = @_; 284 my ($registry, $event, $prio, $cb) = @_;
139 285
140 use sort 'stable'; 286 use sort 'stable';
141 287
142 $cb = [$prio, $cb]; 288 $cb = [$prio, $cb];
143 289
144 @{$registry->[$event]} = sort 290 @{$registry->[$event]} = sort
145 { $a->[0] cmp $b->[0] } 291 { $a->[0] cmp $b->[0] }
146 @{$registry->[$event] || []}, $cb; 292 @{$registry->[$event] || []}, $cb;
147
148 push @{$undo->{cb}}, [$event, $cb];
149} 293}
150 294
151# attach handles attaching event callbacks 295# attach handles attaching event callbacks
152# the only thing the caller has to do is pass the correct 296# the only thing the caller has to do is pass the correct
153# registry (== where the callback attaches to). 297# registry (== where the callback attaches to).
154sub _attach(\@$@) { 298sub _attach {
155 my ($registry, $klass, @arg) = @_; 299 my ($registry, $klass, @arg) = @_;
156 300
301 my $object_type;
157 my $prio = 0; 302 my $prio = 0;
158
159 my %undo = (
160 registry => $registry,
161 cb => [],
162 );
163
164 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT; 303 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
165 304
166 while (@arg) { 305 while (@arg) {
167 my $type = shift @arg; 306 my $type = shift @arg;
168 307
169 if ($type eq "prio") { 308 if ($type eq "prio") {
170 $prio = shift @arg; 309 $prio = shift @arg;
171 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
172 } elsif ($type eq "package") { 320 } elsif ($type eq "package") {
173 my $pkg = shift @arg; 321 my $pkg = shift @arg;
174 322
175 while (my ($name, $id) = each %cb_id) { 323 while (my ($name, $id) = each %cb_id) {
176 if (my $cb = $pkg->can ($name)) { 324 if (my $cb = $pkg->can ($name)) {
177 _attach_cb $registry, %undo, $id, $prio, $cb; 325 _attach_cb $registry, $id, $prio, $cb;
178 } 326 }
179 } 327 }
180 328
181 } elsif (exists $cb_id{$type}) { 329 } elsif (exists $cb_id{$type}) {
182 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg; 330 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
183 331
184 } elsif (ref $type) { 332 } elsif (ref $type) {
185 warn "attaching objects not supported, ignoring.\n"; 333 warn "attaching objects not supported, ignoring.\n";
186 334
187 } else { 335 } else {
188 shift @arg; 336 shift @arg;
189 warn "attach argument '$type' not supported, ignoring.\n"; 337 warn "attach argument '$type' not supported, ignoring.\n";
190 } 338 }
191 } 339 }
192
193 \%undo
194} 340}
195 341
196sub cf::object::attach { 342sub _object_attach {
197 die; 343 my ($obj, $name, %arg) = @_;
198}
199 344
200sub attach_global { 345 return if exists $obj->{_attachment}{$name};
201 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
202}
203 346
204sub attach_to_type { 347 if (my $attach = $attachment{$name}) {
205 my $type = shift; 348 my $registry = $obj->registry;
206 349
207 _attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_ 350 for (@$attach) {
208} 351 my ($klass, @attach) = @$_;
352 _attach $registry, $klass, @attach;
353 }
209 354
210sub attach_to_objects { 355 $obj->{$name} = \%arg;
211 _attach @CB_OBJECT, KLASS_OBJECT, @_ 356 } else {
212} 357 warn "object uses attachment '$name' that is not available, postponing.\n";
358 }
213 359
214sub attach_to_players { 360 $obj->{_attachment}{$name} = undef;
215 _attach @CB_PLAYER, KLASS_PLAYER, @_
216} 361}
217 362
218sub attach_to_maps { 363sub cf::attachable::attach {
219 _attach @CB_MAP, KLASS_MAP, @_ 364 if (ref $_[0]) {
220} 365 _object_attach @_;
366 } else {
367 _attach shift->_attach_registry, @_;
368 }
369};
221 370
222sub register_attachment { 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 {
223 my $name = shift; 396 my \$name = shift;
224 397
225 $attachment{$name} = [@_]; 398 \$attachment{\$name} = [[KLASS_$klass, \@_]];
399 }
400 ";
401 die if $@;
226} 402}
227 403
228our $override; 404our $override;
229our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 405our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
230 406
244 for (@$callbacks) { 420 for (@$callbacks) {
245 eval { &{$_->[1]} }; 421 eval { &{$_->[1]} };
246 422
247 if ($@) { 423 if ($@) {
248 warn "$@"; 424 warn "$@";
249 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n"; 425 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
250 override; 426 override;
251 } 427 }
252 428
253 return 1 if $override; 429 return 1 if $override;
254 } 430 }
255 431
256 0 432 0
257} 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
445=back
446
447=cut
258 448
259############################################################################# 449#############################################################################
260# object support 450# object support
261 451
262sub instantiate { 452sub instantiate {
263 my ($obj, $data) = @_; 453 my ($obj, $data) = @_;
264 my $registry = $obj->registry;
265 454
266 $data = from_json $data; 455 $data = from_json $data;
267 456
268 for (@$data) { 457 for (@$data) {
269 my ($pri, $name, @args) = @$_; 458 my ($name, $args) = @$_;
270 459
271 if (my $attach = $attachment{$name}) { 460 $obj->attach ($name, %{$args || {} });
272 _attach @$registry, KLASS_OBJECT, @$attach;
273
274 if (my $cb = delete $registry->[EVENT_OBJECT_INSTANTIATE]) {
275 for (@$cb) {
276 eval { $_->[1]->($obj, @args); };
277 if ($@) {
278 warn "$@";
279 warn "... while processing '$name' instantiate with args <@args>\n";
280 }
281 }
282 }
283 } else {
284 warn "object uses attachment $name that is not available, postponing.\n";
285 }
286
287 push @{$obj->{_attachment}}, $name;
288 } 461 }
289} 462}
290 463
291# basically do the same as instantiate, without calling instantiate 464# basically do the same as instantiate, without calling instantiate
292sub reattach { 465sub reattach {
293 my ($obj) = @_; 466 my ($obj) = @_;
294 my $registry = $obj->registry; 467 my $registry = $obj->registry;
295 468
296 warn "reattach<@_, $_>\n"; 469 @$registry = ();
297}
298 470
299attach_to_objects 471 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
472
473 for my $name (keys %{ $obj->{_attachment} || {} }) {
474 if (my $attach = $attachment{$name}) {
475 for (@$attach) {
476 my ($klass, @attach) = @$_;
477 _attach $registry, $klass, @attach;
478 }
479 } else {
480 warn "object uses attachment '$name' that is not available, postponing.\n";
481 }
482 }
483}
484
485sub object_freezer_save {
486 my ($filename, $rdata, $objs) = @_;
487
488 if (length $$rdata) {
489 warn sprintf "saving %s (%d,%d)\n",
490 $filename, length $$rdata, scalar @$objs;
491
492 if (open my $fh, ">:raw", "$filename~") {
493 chmod SAVE_MODE, $fh;
494 syswrite $fh, $$rdata;
495 close $fh;
496
497 if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
498 chmod SAVE_MODE, $fh;
499 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
500 close $fh;
501 rename "$filename.pst~", "$filename.pst";
502 } else {
503 unlink "$filename.pst";
504 }
505
506 rename "$filename~", $filename;
507 } else {
508 warn "FATAL: $filename~: $!\n";
509 }
510 } else {
511 unlink $filename;
512 unlink "$filename.pst";
513 }
514}
515
516sub object_freezer_as_string {
517 my ($rdata, $objs) = @_;
518
519 use Data::Dumper;
520
521 $$rdata . Dumper $objs
522}
523
524sub object_thawer_load {
525 my ($filename) = @_;
526
527 local $/;
528
529 my $av;
530
531 #TODO: use sysread etc.
532 if (open my $data, "<:raw:perlio", $filename) {
533 $data = <$data>;
534 if (open my $pst, "<:raw:perlio", "$filename.pst") {
535 $av = eval { (Storable::thaw <$pst>)->{objs} };
536 }
537 return ($data, $av);
538 }
539
540 ()
541}
542
543cf::object->attach (
300 prio => -1000000, 544 prio => -1000000,
301 on_clone => sub { 545 on_clone => sub {
302 my ($src, $dst) = @_; 546 my ($src, $dst) = @_;
303 547
304 @{$dst->registry} = @{$src->registry}; 548 @{$dst->registry} = @{$src->registry};
305 warn "registry clone ", join ":", @{$src->registry};#d#
306 549
307 %$dst = %$src; 550 %$dst = %$src;
308 551
309 $dst->{_attachment} = [@{ $src->{_attachment} }] 552 %{$dst->{_attachment}} = %{$src->{_attachment}}
310 if exists $src->{_attachment}; 553 if exists $src->{_attachment};
311
312 warn "clone<@_>\n";#d#
313 }, 554 },
314; 555);
315 556
316############################################################################# 557#############################################################################
317# old plug-in events 558# command handling &c
318 559
319sub inject_event { 560=item cf::register_command $name => \&callback($ob,$args);
320 my $extension = shift;
321 my $event_code = shift;
322 561
323 my $cb = $hook[$event_code]{$extension} 562Register a callback for execution when the client sends the user command
324 or return; 563$name.
325 564
326 &$cb 565=cut
327}
328
329sub inject_global_event {
330 my $event = shift;
331
332 my $cb = $hook[$event]
333 or return;
334
335 List::Util::max map &$_, values %$cb
336}
337
338sub inject_command {
339 my ($name, $obj, $params) = @_;
340
341 for my $cmd (@{ $command{$name} }) {
342 $cmd->[1]->($obj, $params);
343 }
344
345 -1
346}
347 566
348sub register_command { 567sub register_command {
349 my ($name, $time, $cb) = @_; 568 my ($name, $cb) = @_;
350 569
351 my $caller = caller; 570 my $caller = caller;
352 #warn "registering command '$name/$time' to '$caller'"; 571 #warn "registering command '$name/$time' to '$caller'";
353 572
354 push @{ $command{$name} }, [$time, $cb, $caller]; 573 push @{ $COMMAND{$name} }, [$caller, $cb];
355 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
356} 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
357 584
358sub register_extcmd { 585sub register_extcmd {
359 my ($name, $cb) = @_; 586 my ($name, $cb) = @_;
360 587
361 my $caller = caller; 588 my $caller = caller;
362 #warn "registering extcmd '$name' to '$caller'"; 589 #warn "registering extcmd '$name' to '$caller'";
363 590
364 $extcmd{$name} = [$cb, $caller]; 591 $EXTCMD{$name} = [$cb, $caller];
365} 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);
366 625
367sub register { 626sub register {
368 my ($base, $pkg) = @_; 627 my ($base, $pkg) = @_;
369 628
370 #TODO 629 #TODO
389 . "#line 1 \"$path\"\n{\n" 648 . "#line 1 \"$path\"\n{\n"
390 . (do { local $/; <$fh> }) 649 . (do { local $/; <$fh> })
391 . "\n};\n1"; 650 . "\n};\n1";
392 651
393 eval $source 652 eval $source
394 or die "$path: $@"; 653 or die $@ ? "$path: $@\n"
654 : "extension disabled.\n";
395 655
396 push @exts, $pkg; 656 push @exts, $pkg;
397 $ext_pkg{$base} = $pkg; 657 $ext_pkg{$base} = $pkg;
398 658
399# no strict 'refs'; 659# no strict 'refs';
412# for my $idx (0 .. $#PLUGIN_EVENT) { 672# for my $idx (0 .. $#PLUGIN_EVENT) {
413# delete $hook[$idx]{$pkg}; 673# delete $hook[$idx]{$pkg};
414# } 674# }
415 675
416 # remove commands 676 # remove commands
417 for my $name (keys %command) { 677 for my $name (keys %COMMAND) {
418 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 678 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
419 679
420 if (@cb) { 680 if (@cb) {
421 $command{$name} = \@cb; 681 $COMMAND{$name} = \@cb;
422 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
423 } else { 682 } else {
424 delete $command{$name};
425 delete $COMMAND{"$name\000"}; 683 delete $COMMAND{$name};
426 } 684 }
427 } 685 }
428 686
429 # remove extcmds 687 # remove extcmds
430 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 688 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
431 delete $extcmd{$name}; 689 delete $EXTCMD{$name};
432 } 690 }
433 691
434 if (my $cb = $pkg->can ("unload")) { 692 if (my $cb = $pkg->can ("unload")) {
435 eval { 693 eval {
436 $cb->($pkg); 694 $cb->($pkg);
440 698
441 Symbol::delete_package $pkg; 699 Symbol::delete_package $pkg;
442} 700}
443 701
444sub load_extensions { 702sub load_extensions {
445 my $LIBDIR = maps_directory "perl";
446
447 for my $ext (<$LIBDIR/*.ext>) { 703 for my $ext (<$LIBDIR/*.ext>) {
448 next unless -r $ext; 704 next unless -r $ext;
449 eval { 705 eval {
450 load_extension $ext; 706 load_extension $ext;
451 1 707 1
452 } or warn "$ext not loaded: $@"; 708 } or warn "$ext not loaded: $@";
453 } 709 }
454} 710}
455 711
456sub _perl_reload(&) {
457 my ($msg) = @_;
458
459 $msg->("reloading...");
460
461 eval {
462 # 1. cancel all watchers
463 $_->cancel for Event::all_watchers;
464
465 # 2. unload all extensions
466 for (@exts) {
467 $msg->("unloading <$_>");
468 unload_extension $_;
469 }
470
471 # 3. unload all modules loaded from $LIBDIR
472 while (my ($k, $v) = each %INC) {
473 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
474
475 $msg->("removing <$k>");
476 delete $INC{$k};
477
478 $k =~ s/\.pm$//;
479 $k =~ s/\//::/g;
480
481 if (my $cb = $k->can ("unload_module")) {
482 $cb->();
483 }
484
485 Symbol::delete_package $k;
486 }
487
488 # 4. get rid of safe::, as good as possible
489 Symbol::delete_package "safe::$_"
490 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
491
492 # 5. remove register_script_function callbacks
493 # TODO
494
495 # 6. unload cf.pm "a bit"
496 delete $INC{"cf.pm"};
497
498 # don't, removes xs symbols, too,
499 # and global variables created in xs
500 #Symbol::delete_package __PACKAGE__;
501
502 # 7. reload cf.pm
503 $msg->("reloading cf.pm");
504 require cf;
505 };
506 $msg->($@) if $@;
507
508 $msg->("reloaded");
509};
510
511sub perl_reload() {
512 _perl_reload {
513 warn $_[0];
514 print "$_[0]\n";
515 };
516}
517
518register_command "perl-reload", 0, sub {
519 my ($who, $arg) = @_;
520
521 if ($who->flag (FLAG_WIZ)) {
522 _perl_reload {
523 warn $_[0];
524 $who->message ($_[0]);
525 };
526 }
527};
528
529#############################################################################
530# extcmd framework, basically convert ext <msg>
531# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
532
533attach_to_players
534 on_extcmd => sub {
535 my ($pl, $buf) = @_;
536
537 my $msg = eval { from_json $buf };
538
539 if (ref $msg) {
540 if (my $cb = $extcmd{$msg->{msgtype}}) {
541 if (my %reply = $cb->[0]->($pl, $msg)) {
542 $pl->ext_reply ($msg->{msgid}, %reply);
543 }
544 }
545 } else {
546 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
547 }
548
549 cf::override;
550 },
551;
552
553############################################################################# 712#############################################################################
554# load/save/clean perl data associated with a map 713# load/save/clean perl data associated with a map
555 714
556*cf::mapsupport::on_clean = sub { 715*cf::mapsupport::on_clean = sub {
557 my ($map) = @_; 716 my ($map) = @_;
558 717
559 my $path = $map->tmpname; 718 my $path = $map->tmpname;
560 defined $path or return; 719 defined $path or return;
561 720
562 unlink "$path.cfperl"; 721 unlink "$path.pst";
563}; 722};
564 723
565*cf::mapsupport::on_swapin =
566*cf::mapsupport::on_load = sub {
567 my ($map) = @_;
568
569 my $path = $map->tmpname;
570 $path = $map->path unless defined $path;
571
572 open my $fh, "<:raw", "$path.cfperl"
573 or return; # no perl data
574
575 my $data = Storable::thaw do { local $/; <$fh> };
576
577 $data->{version} <= 1
578 or return; # too new
579
580 $map->_set_obs ($data->{obs});
581};
582
583*cf::mapsupport::on_swapout = sub {
584 my ($map) = @_;
585
586 my $path = $map->tmpname;
587 $path = $map->path unless defined $path;
588
589 my $obs = $map->_get_obs;
590
591 if (defined $obs) {
592 open my $fh, ">:raw", "$path.cfperl"
593 or die "$path.cfperl: $!";
594
595 stat $path;
596
597 print $fh Storable::nfreeze {
598 size => (stat _)[7],
599 time => (stat _)[9],
600 version => 1,
601 obs => $obs,
602 };
603
604 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
605 } else {
606 unlink "$path.cfperl";
607 }
608};
609
610attach_to_maps prio => -10000, package => cf::mapsupport::; 724cf::map->attach (prio => -10000, package => cf::mapsupport::);
611 725
612############################################################################# 726#############################################################################
613# load/save perl data associated with player->ob objects 727# load/save perl data associated with player->ob objects
614 728
615sub all_objects(@) { 729sub all_objects(@) {
616 @_, map all_objects ($_->inv), @_ 730 @_, map all_objects ($_->inv), @_
617} 731}
618 732
619attach_to_players 733# TODO: compatibility cruft, remove when no longer needed
734cf::player->attach (
620 on_load => sub { 735 on_load => sub {
621 my ($pl, $path) = @_; 736 my ($pl, $path) = @_;
622 737
623 for my $o (all_objects $pl->ob) { 738 for my $o (all_objects $pl->ob) {
624 if (my $value = $o->get_ob_key_value ("_perl_data")) { 739 if (my $value = $o->get_ob_key_value ("_perl_data")) {
626 741
627 %$o = %{ Storable::thaw pack "H*", $value }; 742 %$o = %{ Storable::thaw pack "H*", $value };
628 } 743 }
629 } 744 }
630 }, 745 },
631 on_save => sub { 746);
632 my ($pl, $path) = @_;
633
634 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
635 for grep %$_, all_objects $pl->ob;
636 },
637;
638 747
639############################################################################# 748#############################################################################
640# 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
641 757
642=item cf::player::exists $login 758=item cf::player::exists $login
643 759
644Returns true when the given account exists. 760Returns true when the given account exists.
645 761
648sub cf::player::exists($) { 764sub cf::player::exists($) {
649 cf::player::find $_[0] 765 cf::player::find $_[0]
650 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;
651} 767}
652 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
653=item $player->reply ($npc, $msg[, $flags]) 789=item $player_object->reply ($npc, $msg[, $flags])
654 790
655Sends 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>
656can 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
657dialogue with the given NPC character. 793dialogue with the given NPC character.
658 794
659=cut 795=cut
660 796
661# rough implementation of a future "reply" method that works 797# rough implementation of a future "reply" method that works
662# with dialog boxes. 798# with dialog boxes.
799#TODO: the first argument must go, split into a $npc->reply_to ( method
663sub cf::object::player::reply($$$;$) { 800sub cf::object::player::reply($$$;$) {
664 my ($self, $npc, $msg, $flags) = @_; 801 my ($self, $npc, $msg, $flags) = @_;
665 802
666 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 803 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
667 804
671 $msg = $npc->name . " says: $msg" if $npc; 808 $msg = $npc->name . " says: $msg" if $npc;
672 $self->message ($msg, $flags); 809 $self->message ($msg, $flags);
673 } 810 }
674} 811}
675 812
676=item $player->ext_reply ($msgid, $msgtype, %msg) 813=item $player_object->may ("access")
677 814
678Sends an ext reply to the player. 815Returns wether the given player is authorized to access resource "access"
816(e.g. "command_wizcast").
679 817
680=cut 818=cut
681 819
682sub 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 {
683 my ($self, $id, %msg) = @_; 906 my ($self, $cb) = @_;
684 907
685 $msg{msgid} = $id; 908 my $coro; $coro = async {
909 eval {
910 $cb->();
911 };
912 warn $@ if $@;
913 delete $self->{_coro}{$coro+0};
914 };
686 915
687 $self->send ("ext " . to_json \%msg); 916 $self->{_coro}{$coro+0} = $coro;
688} 917}
689 918
690############################################################################# 919cf::client->attach (
691# 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
692 939
693our $safe = new Safe "safe"; 940our $safe = new Safe "safe";
694our $safe_hole = new Safe::Hole; 941our $safe_hole = new Safe::Hole;
695 942
696$SIG{FPE} = 'IGNORE'; 943$SIG{FPE} = 'IGNORE';
697 944
698$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));
699 946
700# here we export the classes and methods available to script code 947# here we export the classes and methods available to script code
701 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
702for ( 960for (
703 ["cf::object" => qw(contr pay_amount pay_player)], 961 ["cf::object" => qw(contr pay_amount pay_player map)],
704 ["cf::object::player" => qw(player)], 962 ["cf::object::player" => qw(player)],
705 ["cf::player" => qw(peaceful)], 963 ["cf::player" => qw(peaceful)],
964 ["cf::map" => qw(trigger)],
706) { 965) {
707 no strict 'refs'; 966 no strict 'refs';
708 my ($pkg, @funs) = @$_; 967 my ($pkg, @funs) = @$_;
709 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 968 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
710 for @funs; 969 for @funs;
711} 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
712 983
713sub safe_eval($;@) { 984sub safe_eval($;@) {
714 my ($code, %vars) = @_; 985 my ($code, %vars) = @_;
715 986
716 my $qcode = $code; 987 my $qcode = $code;
739 } 1010 }
740 1011
741 wantarray ? @res : $res[0] 1012 wantarray ? @res : $res[0]
742} 1013}
743 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
744sub register_script_function { 1030sub register_script_function {
745 my ($fun, $cb) = @_; 1031 my ($fun, $cb) = @_;
746 1032
747 no strict 'refs'; 1033 no strict 'refs';
748 *{"safe::$fun"} = $safe_hole->wrap ($cb); 1034 *{"safe::$fun"} = $safe_hole->wrap ($cb);
749} 1035}
750 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
751############################################################################# 1146#############################################################################
752# the server's main() 1147# the server's main()
753 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
754sub main { 1157sub main {
1158 cfg_load;
1159 db_load;
1160 load_extensions;
755 Event::loop; 1161 Event::loop;
756} 1162}
757 1163
758############################################################################# 1164#############################################################################
759# initialisation 1165# initialisation
760 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
761register "<global>", __PACKAGE__; 1246register "<global>", __PACKAGE__;
762 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
763unshift @INC, $LIBDIR; 1259unshift @INC, $LIBDIR;
764 1260
765load_extensions;
766
767$TICK_WATCHER = Event->timer ( 1261$TICK_WATCHER = Event->timer (
768 prio => 1, 1262 prio => 0,
769 at => $NEXT_TICK || 1, 1263 at => $NEXT_TICK || 1,
1264 data => WF_AUTOCANCEL,
770 cb => sub { 1265 cb => sub {
771 cf::server_tick; # one server iteration 1266 cf::server_tick; # one server iteration
772 1267
773 my $NOW = Event::time; 1268 my $NOW = Event::time;
774 $NEXT_TICK += $TICK; 1269 $NEXT_TICK += $TICK;
775 1270
776 # if we are delayed by four ticks, skip them all 1271 # if we are delayed by four ticks or more, skip them all
777 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1272 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
778 1273
779 $TICK_WATCHER->at ($NEXT_TICK); 1274 $TICK_WATCHER->at ($NEXT_TICK);
780 $TICK_WATCHER->start; 1275 $TICK_WATCHER->start;
781 }, 1276 },
782); 1277);
783 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
7841 12871
785 1288

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines