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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines