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.43 by root, Fri Aug 25 17:11:53 2006 UTC vs.
Revision 1.96 by root, Fri Dec 22 06:02:29 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;
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# "new" plug-in system
98 151
99=item cf::object::attach ... # NYI 152=head2 ATTACHABLE OBJECTS
100 153
101=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.
102 157
103=item cf::attach_to_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+).
104 161
105=item cf::attach_to_objects ... 162=over 4
106 163
107=item cf::attach_to_players ... 164=item $attachable->attach ($attachment, key => $value...)
108 165
109=item cf::attach_to_maps ... 166=item $attachable->detach ($attachment)
110 167
111 prio => $number, # lower is earlier 168Attach/detach a pre-registered attachment to a specific object and give it
112 on_xxx => \&cb, 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
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
113 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.
114 270
115=cut 271=cut
116 272
117# 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
118our @CB_GLOBAL = (); # registry for all global events 274our @CB_GLOBAL = (); # registry for all global events
119our @CB_OBJECT = (); 275our @CB_OBJECT = (); # all objects (should not be used except in emergency)
120our @CB_PLAYER = (); 276our @CB_PLAYER = ();
277our @CB_CLIENT = ();
121our @CB_TYPE = (); # registry for type (cf-object class) based events 278our @CB_TYPE = (); # registry for type (cf-object class) based events
122our @CB_MAP = (); 279our @CB_MAP = ();
123 280
281my %attachment;
282
124sub _attach_cb($\%$$$) { 283sub _attach_cb($$$$) {
125 my ($registry, $undo, $event, $prio, $cb) = @_; 284 my ($registry, $event, $prio, $cb) = @_;
126 285
127 use sort 'stable'; 286 use sort 'stable';
128 287
129 $cb = [$prio, $cb]; 288 $cb = [$prio, $cb];
130 289
131 @{$registry->[$event]} = sort 290 @{$registry->[$event]} = sort
132 { $a->[0] cmp $b->[0] } 291 { $a->[0] cmp $b->[0] }
133 @{$registry->[$event] || []}, $cb; 292 @{$registry->[$event] || []}, $cb;
134
135 push @{$undo->{cb}}, [$event, $cb];
136} 293}
137 294
138# attach handles attaching event callbacks 295# attach handles attaching event callbacks
139# 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
140# registry (== where the callback attaches to). 297# registry (== where the callback attaches to).
141sub _attach(\@$\@) { 298sub _attach {
142 my ($registry, $klass, $arg) = @_; 299 my ($registry, $klass, @arg) = @_;
143 300
301 my $object_type;
144 my $prio = 0; 302 my $prio = 0;
145
146 my %undo = (
147 registry => $registry,
148 cb => [],
149 );
150
151 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;
152 304
153 while (@$arg) { 305 while (@arg) {
154 my $type = shift @$arg; 306 my $type = shift @arg;
155 307
156 if ($type eq "prio") { 308 if ($type eq "prio") {
157 $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] ||= [];
158 319
159 } elsif ($type eq "package") { 320 } elsif ($type eq "package") {
160 my $pkg = shift @$arg; 321 my $pkg = shift @arg;
161 322
162 while (my ($name, $id) = each %cb_id) { 323 while (my ($name, $id) = each %cb_id) {
163 if (my $cb = $pkg->can ($name)) { 324 if (my $cb = $pkg->can ($name)) {
164 _attach_cb $registry, %undo, $id, $prio, $cb; 325 _attach_cb $registry, $id, $prio, $cb;
165 } 326 }
166 } 327 }
167 328
168 } elsif (exists $cb_id{$type}) { 329 } elsif (exists $cb_id{$type}) {
169 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @$arg; 330 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
170 331
171 } elsif (ref $type) { 332 } elsif (ref $type) {
172 warn "attaching objects not supported, ignoring.\n"; 333 warn "attaching objects not supported, ignoring.\n";
173 334
174 } else { 335 } else {
175 shift @$arg; 336 shift @arg;
176 warn "attach argument '$type' not supported, ignoring.\n"; 337 warn "attach argument '$type' not supported, ignoring.\n";
177 } 338 }
178 } 339 }
179
180 \%undo
181} 340}
182 341
183sub cf::object::attach { 342sub _object_attach {
184 die; 343 my ($obj, $name, %arg) = @_;
185}
186 344
187sub attach_global { 345 return if exists $obj->{_attachment}{$name};
188 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
189}
190 346
191sub attach_to_type { 347 if (my $attach = $attachment{$name}) {
192 my $type = shift; 348 my $registry = $obj->registry;
193 _attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_
194}
195 349
196sub attach_to_objects { 350 for (@$attach) {
197 _attach @CB_OBJECT, KLASS_OBJECT, @_ 351 my ($klass, @attach) = @$_;
198} 352 _attach $registry, $klass, @attach;
353 }
199 354
200sub attach_to_players { 355 $obj->{$name} = \%arg;
201 _attach @CB_PLAYER, KLASS_PLAYER, @_ 356 } else {
202} 357 warn "object uses attachment '$name' that is not available, postponing.\n";
358 }
203 359
204sub attach_to_maps { 360 $obj->{_attachment}{$name} = undef;
205 _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 $@;
206} 402}
207 403
208our $override; 404our $override;
405our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
209 406
210sub override() { 407sub override {
211 $override = 1 408 $override = 1;
409 @invoke_results = ();
212} 410}
213 411
214sub invoke { 412sub do_invoke {
215 my $event = shift; 413 my $event = shift;
216 my $callbacks = shift; 414 my $callbacks = shift;
217 415
416 @invoke_results = ();
417
218 local $override; 418 local $override;
219 419
220 for (@$callbacks) { 420 for (@$callbacks) {
221 eval { &{$_->[1]} }; 421 eval { &{$_->[1]} };
222 422
223 if ($@) { 423 if ($@) {
224 warn "$@"; 424 warn "$@";
225 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n"; 425 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
226 override; 426 override;
227 } 427 }
228 428
229 return 1 if $override; 429 return 1 if $override;
230 } 430 }
231 431
232 0 432 0
233} 433}
234 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
235############################################################################# 449#############################################################################
236# old plug-in events 450# object support
237 451
238sub inject_event { 452sub instantiate {
239 my $extension = shift; 453 my ($obj, $data) = @_;
240 my $event_code = shift;
241 454
242 my $cb = $hook[$event_code]{$extension} 455 $data = from_json $data;
243 or return;
244 456
245 &$cb 457 for (@$data) {
246}
247
248sub inject_global_event {
249 my $event = shift;
250
251 my $cb = $hook[$event]
252 or return;
253
254 List::Util::max map &$_, values %$cb
255}
256
257sub inject_command {
258 my ($name, $obj, $params) = @_; 458 my ($name, $args) = @$_;
259 459
260 for my $cmd (@{ $command{$name} }) { 460 $obj->attach ($name, %{$args || {} });
261 $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};
262 } 554 },
555);
263 556
264 -1 557#############################################################################
265} 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
266 566
267sub register_command { 567sub register_command {
268 my ($name, $time, $cb) = @_; 568 my ($name, $cb) = @_;
269 569
270 my $caller = caller; 570 my $caller = caller;
271 #warn "registering command '$name/$time' to '$caller'"; 571 #warn "registering command '$name/$time' to '$caller'";
272 572
273 push @{ $command{$name} }, [$time, $cb, $caller]; 573 push @{ $COMMAND{$name} }, [$caller, $cb];
274 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
275} 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
276 584
277sub register_extcmd { 585sub register_extcmd {
278 my ($name, $cb) = @_; 586 my ($name, $cb) = @_;
279 587
280 my $caller = caller; 588 my $caller = caller;
281 #warn "registering extcmd '$name' to '$caller'"; 589 #warn "registering extcmd '$name' to '$caller'";
282 590
283 $extcmd{$name} = [$cb, $caller]; 591 $EXTCMD{$name} = [$cb, $caller];
284} 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);
285 625
286sub register { 626sub register {
287 my ($base, $pkg) = @_; 627 my ($base, $pkg) = @_;
288 628
289 for my $idx (0 .. $#PLUGIN_EVENT) { 629 #TODO
290 if (my $ref = $pkg->can ("on_$PLUGIN_EVENT[$idx]")) {
291 #warn "registering $PLUGIN_EVENT[$idx] hook to '$pkg'\n";
292 $hook[$idx]{$base} = $ref;
293 }
294 }
295} 630}
296 631
297sub load_extension { 632sub load_extension {
298 my ($path) = @_; 633 my ($path) = @_;
299 634
313 . "#line 1 \"$path\"\n{\n" 648 . "#line 1 \"$path\"\n{\n"
314 . (do { local $/; <$fh> }) 649 . (do { local $/; <$fh> })
315 . "\n};\n1"; 650 . "\n};\n1";
316 651
317 eval $source 652 eval $source
318 or die "$path: $@"; 653 or die $@ ? "$path: $@\n"
654 : "extension disabled.\n";
319 655
320 push @exts, $pkg; 656 push @exts, $pkg;
321 $ext_pkg{$base} = $pkg; 657 $ext_pkg{$base} = $pkg;
322 658
323# no strict 'refs'; 659# no strict 'refs';
330 my ($pkg) = @_; 666 my ($pkg) = @_;
331 667
332 warn "removing extension $pkg\n"; 668 warn "removing extension $pkg\n";
333 669
334 # remove hooks 670 # remove hooks
671 #TODO
335 for my $idx (0 .. $#PLUGIN_EVENT) { 672# for my $idx (0 .. $#PLUGIN_EVENT) {
336 delete $hook[$idx]{$pkg}; 673# delete $hook[$idx]{$pkg};
337 } 674# }
338 675
339 # remove commands 676 # remove commands
340 for my $name (keys %command) { 677 for my $name (keys %COMMAND) {
341 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 678 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
342 679
343 if (@cb) { 680 if (@cb) {
344 $command{$name} = \@cb; 681 $COMMAND{$name} = \@cb;
345 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
346 } else { 682 } else {
347 delete $command{$name};
348 delete $COMMAND{"$name\000"}; 683 delete $COMMAND{$name};
349 } 684 }
350 } 685 }
351 686
352 # remove extcmds 687 # remove extcmds
353 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 688 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
354 delete $extcmd{$name}; 689 delete $EXTCMD{$name};
355 } 690 }
356 691
357 if (my $cb = $pkg->can ("unload")) { 692 if (my $cb = $pkg->can ("unload")) {
358 eval { 693 eval {
359 $cb->($pkg); 694 $cb->($pkg);
363 698
364 Symbol::delete_package $pkg; 699 Symbol::delete_package $pkg;
365} 700}
366 701
367sub load_extensions { 702sub load_extensions {
368 my $LIBDIR = maps_directory "perl";
369
370 for my $ext (<$LIBDIR/*.ext>) { 703 for my $ext (<$LIBDIR/*.ext>) {
371 next unless -r $ext; 704 next unless -r $ext;
372 eval { 705 eval {
373 load_extension $ext; 706 load_extension $ext;
374 1 707 1
375 } or warn "$ext not loaded: $@"; 708 } or warn "$ext not loaded: $@";
376 } 709 }
377} 710}
378 711
379sub _perl_reload(&) {
380 my ($msg) = @_;
381
382 $msg->("reloading...");
383
384 eval {
385 # 1. cancel all watchers
386 $_->cancel for Event::all_watchers;
387
388 # 2. unload all extensions
389 for (@exts) {
390 $msg->("unloading <$_>");
391 unload_extension $_;
392 }
393
394 # 3. unload all modules loaded from $LIBDIR
395 while (my ($k, $v) = each %INC) {
396 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
397
398 $msg->("removing <$k>");
399 delete $INC{$k};
400
401 $k =~ s/\.pm$//;
402 $k =~ s/\//::/g;
403
404 if (my $cb = $k->can ("unload_module")) {
405 $cb->();
406 }
407
408 Symbol::delete_package $k;
409 }
410
411 # 4. get rid of safe::, as good as possible
412 Symbol::delete_package "safe::$_"
413 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
414
415 # 5. remove register_script_function callbacks
416 # TODO
417
418 # 6. unload cf.pm "a bit"
419 delete $INC{"cf.pm"};
420
421 # don't, removes xs symbols, too,
422 # and global variables created in xs
423 #Symbol::delete_package __PACKAGE__;
424
425 # 7. reload cf.pm
426 $msg->("reloading cf.pm");
427 require cf;
428 };
429 $msg->($@) if $@;
430
431 $msg->("reloaded");
432};
433
434sub perl_reload() {
435 _perl_reload {
436 warn $_[0];
437 print "$_[0]\n";
438 };
439}
440
441register_command "perl-reload", 0, sub {
442 my ($who, $arg) = @_;
443
444 if ($who->flag (FLAG_WIZ)) {
445 _perl_reload {
446 warn $_[0];
447 $who->message ($_[0]);
448 };
449 }
450};
451
452#############################################################################
453# utility functions
454
455use JSON::Syck (); # TODO# replace by JSON::PC once working
456
457sub from_json($) {
458 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
459 JSON::Syck::Load $_[0]
460}
461
462sub to_json($) {
463 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
464 JSON::Syck::Dump $_[0]
465}
466
467#############################################################################
468# extcmd framework, basically convert ext <msg>
469# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
470
471attach_global
472 on_extcmd => sub {
473 my ($pl, $buf) = @_;
474
475 my $msg = eval { from_json $buf };
476
477 if (ref $msg) {
478 if (my $cb = $extcmd{$msg->{msgtype}}) {
479 if (my %reply = $cb->[0]->($pl, $msg)) {
480 $pl->ext_reply ($msg->{msgid}, %reply);
481 }
482 }
483 } else {
484 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
485 }
486
487 cf::override;
488 },
489;
490
491############################################################################# 712#############################################################################
492# load/save/clean perl data associated with a map 713# load/save/clean perl data associated with a map
493 714
494*cf::mapsupport::on_clean = sub { 715*cf::mapsupport::on_clean = sub {
495 my ($map) = @_; 716 my ($map) = @_;
496 717
497 my $path = $map->tmpname; 718 my $path = $map->tmpname;
498 defined $path or return; 719 defined $path or return;
499 720
500 unlink "$path.cfperl"; 721 unlink "$path.pst";
501}; 722};
502 723
503*cf::mapsupport::on_swapin =
504*cf::mapsupport::on_load = sub {
505 my ($map) = @_;
506
507 my $path = $map->tmpname;
508 $path = $map->path unless defined $path;
509
510 open my $fh, "<:raw", "$path.cfperl"
511 or return; # no perl data
512
513 my $data = Storable::thaw do { local $/; <$fh> };
514
515 $data->{version} <= 1
516 or return; # too new
517
518 $map->_set_obs ($data->{obs});
519};
520
521*cf::mapsupport::on_swapout = sub {
522 my ($map) = @_;
523
524 my $path = $map->tmpname;
525 $path = $map->path unless defined $path;
526
527 my $obs = $map->_get_obs;
528
529 if (defined $obs) {
530 open my $fh, ">:raw", "$path.cfperl"
531 or die "$path.cfperl: $!";
532
533 stat $path;
534
535 print $fh Storable::nfreeze {
536 size => (stat _)[7],
537 time => (stat _)[9],
538 version => 1,
539 obs => $obs,
540 };
541
542 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
543 } else {
544 unlink "$path.cfperl";
545 }
546};
547
548attach_to_maps prio => -10000, package => cf::mapsupport::; 724cf::map->attach (prio => -10000, package => cf::mapsupport::);
549 725
550############################################################################# 726#############################################################################
551# load/save perl data associated with player->ob objects 727# load/save perl data associated with player->ob objects
552 728
553sub all_objects(@) { 729sub all_objects(@) {
554 @_, map all_objects ($_->inv), @_ 730 @_, map all_objects ($_->inv), @_
555} 731}
556 732
557attach_to_players 733# TODO: compatibility cruft, remove when no longer needed
734cf::player->attach (
558 on_load => sub { 735 on_load => sub {
559 my ($pl, $path) = @_; 736 my ($pl, $path) = @_;
560 737
561 for my $o (all_objects $pl->ob) { 738 for my $o (all_objects $pl->ob) {
562 if (my $value = $o->get_ob_key_value ("_perl_data")) { 739 if (my $value = $o->get_ob_key_value ("_perl_data")) {
564 741
565 %$o = %{ Storable::thaw pack "H*", $value }; 742 %$o = %{ Storable::thaw pack "H*", $value };
566 } 743 }
567 } 744 }
568 }, 745 },
569 on_save => sub { 746);
570 my ($pl, $path) = @_;
571
572 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
573 for grep %$_, all_objects $pl->ob;
574 },
575;
576 747
577############################################################################# 748#############################################################################
578# 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
579 757
580=item cf::player::exists $login 758=item cf::player::exists $login
581 759
582Returns true when the given account exists. 760Returns true when the given account exists.
583 761
586sub cf::player::exists($) { 764sub cf::player::exists($) {
587 cf::player::find $_[0] 765 cf::player::find $_[0]
588 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;
589} 767}
590 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
591=item $player->reply ($npc, $msg[, $flags]) 789=item $player_object->reply ($npc, $msg[, $flags])
592 790
593Sends 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>
594can 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
595dialogue with the given NPC character. 793dialogue with the given NPC character.
596 794
597=cut 795=cut
598 796
599# rough implementation of a future "reply" method that works 797# rough implementation of a future "reply" method that works
600# with dialog boxes. 798# with dialog boxes.
799#TODO: the first argument must go, split into a $npc->reply_to ( method
601sub cf::object::player::reply($$$;$) { 800sub cf::object::player::reply($$$;$) {
602 my ($self, $npc, $msg, $flags) = @_; 801 my ($self, $npc, $msg, $flags) = @_;
603 802
604 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 803 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
605 804
609 $msg = $npc->name . " says: $msg" if $npc; 808 $msg = $npc->name . " says: $msg" if $npc;
610 $self->message ($msg, $flags); 809 $self->message ($msg, $flags);
611 } 810 }
612} 811}
613 812
614=item $player->ext_reply ($msgid, $msgtype, %msg) 813=item $player_object->may ("access")
615 814
616Sends an ext reply to the player. 815Returns wether the given player is authorized to access resource "access"
816(e.g. "command_wizcast").
617 817
618=cut 818=cut
619 819
620sub 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);
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 {
621 my ($self, $id, %msg) = @_; 906 my ($self, $cb) = @_;
622 907
623 $msg{msgid} = $id; 908 my $coro; $coro = async {
909 eval {
910 $cb->();
911 };
912 warn $@ if $@;
913 warn "cancel myself\n";#d#
914 delete $self->{_coro}{$coro+0};
915 };
624 916
625 $self->send ("ext " . to_json \%msg); 917 $self->{_coro}{$coro+0} = $coro;
626} 918}
627 919
628############################################################################# 920cf::client->attach (
629# map scripting support 921 on_destroy => sub {
922 my ($ns) = @_;
923
924 warn "cancel $_" for values %{ $ns->{_coro} || {} };#d#
925 $_->cancel for values %{ $ns->{_coro} || {} };
926 },
927);
928
929=back
930
931
932=head2 SAFE SCRIPTING
933
934Functions that provide a safe environment to compile and execute
935snippets of perl code without them endangering the safety of the server
936itself. Looping constructs, I/O operators and other built-in functionality
937is not available in the safe scripting environment, and the number of
938functions and methods that can be called is greatly reduced.
939
940=cut
630 941
631our $safe = new Safe "safe"; 942our $safe = new Safe "safe";
632our $safe_hole = new Safe::Hole; 943our $safe_hole = new Safe::Hole;
633 944
634$SIG{FPE} = 'IGNORE'; 945$SIG{FPE} = 'IGNORE';
635 946
636$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 947$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
637 948
638# here we export the classes and methods available to script code 949# here we export the classes and methods available to script code
639 950
951=pod
952
953The following fucntions and emthods are available within a safe environment:
954
955 cf::object contr pay_amount pay_player map
956 cf::object::player player
957 cf::player peaceful
958 cf::map trigger
959
960=cut
961
640for ( 962for (
641 ["cf::object" => qw(contr pay_amount pay_player)], 963 ["cf::object" => qw(contr pay_amount pay_player map)],
642 ["cf::object::player" => qw(player)], 964 ["cf::object::player" => qw(player)],
643 ["cf::player" => qw(peaceful)], 965 ["cf::player" => qw(peaceful)],
966 ["cf::map" => qw(trigger)],
644) { 967) {
645 no strict 'refs'; 968 no strict 'refs';
646 my ($pkg, @funs) = @$_; 969 my ($pkg, @funs) = @$_;
647 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 970 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
648 for @funs; 971 for @funs;
649} 972}
973
974=over 4
975
976=item @retval = safe_eval $code, [var => value, ...]
977
978Compiled and executes the given perl code snippet. additional var/value
979pairs result in temporary local (my) scalar variables of the given name
980that are available in the code snippet. Example:
981
982 my $five = safe_eval '$first + $second', first => 1, second => 4;
983
984=cut
650 985
651sub safe_eval($;@) { 986sub safe_eval($;@) {
652 my ($code, %vars) = @_; 987 my ($code, %vars) = @_;
653 988
654 my $qcode = $code; 989 my $qcode = $code;
677 } 1012 }
678 1013
679 wantarray ? @res : $res[0] 1014 wantarray ? @res : $res[0]
680} 1015}
681 1016
1017=item cf::register_script_function $function => $cb
1018
1019Register a function that can be called from within map/npc scripts. The
1020function should be reasonably secure and should be put into a package name
1021like the extension.
1022
1023Example: register a function that gets called whenever a map script calls
1024C<rent::overview>, as used by the C<rent> extension.
1025
1026 cf::register_script_function "rent::overview" => sub {
1027 ...
1028 };
1029
1030=cut
1031
682sub register_script_function { 1032sub register_script_function {
683 my ($fun, $cb) = @_; 1033 my ($fun, $cb) = @_;
684 1034
685 no strict 'refs'; 1035 no strict 'refs';
686 *{"safe::$fun"} = $safe_hole->wrap ($cb); 1036 *{"safe::$fun"} = $safe_hole->wrap ($cb);
687} 1037}
688 1038
1039=back
1040
1041=cut
1042
1043#############################################################################
1044
1045=head2 EXTENSION DATABASE SUPPORT
1046
1047Crossfire maintains a very simple database for extension use. It can
1048currently store anything that can be serialised using Storable, which
1049excludes objects.
1050
1051The parameter C<$family> should best start with the name of the extension
1052using it, it should be unique.
1053
1054=over 4
1055
1056=item $hashref = cf::db_get $family
1057
1058Return a hashref for use by the extension C<$family>, which can be
1059modified. After modifications, you have to call C<cf::db_dirty> or
1060C<cf::db_sync>.
1061
1062=item $value = cf::db_get $family => $key
1063
1064Returns a single value from the database
1065
1066=item cf::db_put $family => $hashref
1067
1068Stores the given family hashref into the database. Updates are delayed, if
1069you want the data to be synced to disk immediately, use C<cf::db_sync>.
1070
1071=item cf::db_put $family => $key => $value
1072
1073Stores the given C<$value> in the family hash. Updates are delayed, if you
1074want the data to be synced to disk immediately, use C<cf::db_sync>.
1075
1076=item cf::db_dirty
1077
1078Marks the database as dirty, to be updated at a later time.
1079
1080=item cf::db_sync
1081
1082Immediately write the database to disk I<if it is dirty>.
1083
1084=cut
1085
1086our $DB;
1087
1088{
1089 my $path = cf::localdir . "/database.pst";
1090
1091 sub db_load() {
1092 warn "loading database $path\n";#d# remove later
1093 $DB = stat $path ? Storable::retrieve $path : { };
1094 }
1095
1096 my $pid;
1097
1098 sub db_save() {
1099 warn "saving database $path\n";#d# remove later
1100 waitpid $pid, 0 if $pid;
1101 if (0 == ($pid = fork)) {
1102 $DB->{_meta}{version} = 1;
1103 Storable::nstore $DB, "$path~";
1104 rename "$path~", $path;
1105 cf::_exit 0 if defined $pid;
1106 }
1107 }
1108
1109 my $dirty;
1110
1111 sub db_sync() {
1112 db_save if $dirty;
1113 undef $dirty;
1114 }
1115
1116 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
1117 db_sync;
1118 });
1119
1120 sub db_dirty() {
1121 $dirty = 1;
1122 $idle->start;
1123 }
1124
1125 sub db_get($;$) {
1126 @_ >= 2
1127 ? $DB->{$_[0]}{$_[1]}
1128 : ($DB->{$_[0]} ||= { })
1129 }
1130
1131 sub db_put($$;$) {
1132 if (@_ >= 3) {
1133 $DB->{$_[0]}{$_[1]} = $_[2];
1134 } else {
1135 $DB->{$_[0]} = $_[1];
1136 }
1137 db_dirty;
1138 }
1139
1140 cf::global->attach (
1141 prio => 10000,
1142 on_cleanup => sub {
1143 db_sync;
1144 },
1145 );
1146}
1147
689############################################################################# 1148#############################################################################
690# the server's main() 1149# the server's main()
691 1150
1151sub cfg_load {
1152 open my $fh, "<:utf8", cf::confdir . "/config"
1153 or return;
1154
1155 local $/;
1156 *CFG = YAML::Syck::Load <$fh>;
1157}
1158
692sub main { 1159sub main {
1160 cfg_load;
1161 db_load;
1162 load_extensions;
693 Event::loop; 1163 Event::loop;
694} 1164}
695 1165
696############################################################################# 1166#############################################################################
697# initialisation 1167# initialisation
698 1168
1169sub _perl_reload(&) {
1170 my ($msg) = @_;
1171
1172 $msg->("reloading...");
1173
1174 eval {
1175 # cancel all watchers
1176 for (Event::all_watchers) {
1177 $_->cancel if $_->data & WF_AUTOCANCEL;
1178 }
1179
1180 # unload all extensions
1181 for (@exts) {
1182 $msg->("unloading <$_>");
1183 unload_extension $_;
1184 }
1185
1186 # unload all modules loaded from $LIBDIR
1187 while (my ($k, $v) = each %INC) {
1188 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1189
1190 $msg->("removing <$k>");
1191 delete $INC{$k};
1192
1193 $k =~ s/\.pm$//;
1194 $k =~ s/\//::/g;
1195
1196 if (my $cb = $k->can ("unload_module")) {
1197 $cb->();
1198 }
1199
1200 Symbol::delete_package $k;
1201 }
1202
1203 # sync database to disk
1204 cf::db_sync;
1205
1206 # get rid of safe::, as good as possible
1207 Symbol::delete_package "safe::$_"
1208 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
1209
1210 # remove register_script_function callbacks
1211 # TODO
1212
1213 # unload cf.pm "a bit"
1214 delete $INC{"cf.pm"};
1215
1216 # don't, removes xs symbols, too,
1217 # and global variables created in xs
1218 #Symbol::delete_package __PACKAGE__;
1219
1220 # reload cf.pm
1221 $msg->("reloading cf.pm");
1222 require cf;
1223
1224 # load config and database again
1225 cf::cfg_load;
1226 cf::db_load;
1227
1228 # load extensions
1229 $msg->("load extensions");
1230 cf::load_extensions;
1231
1232 # reattach attachments to objects
1233 $msg->("reattach");
1234 _global_reattach;
1235 };
1236 $msg->($@) if $@;
1237
1238 $msg->("reloaded");
1239};
1240
1241sub perl_reload() {
1242 _perl_reload {
1243 warn $_[0];
1244 print "$_[0]\n";
1245 };
1246}
1247
699register "<global>", __PACKAGE__; 1248register "<global>", __PACKAGE__;
700 1249
1250register_command "perl-reload" => sub {
1251 my ($who, $arg) = @_;
1252
1253 if ($who->flag (FLAG_WIZ)) {
1254 _perl_reload {
1255 warn $_[0];
1256 $who->message ($_[0]);
1257 };
1258 }
1259};
1260
701unshift @INC, $LIBDIR; 1261unshift @INC, $LIBDIR;
702 1262
703load_extensions;
704
705$TICK_WATCHER = Event->timer ( 1263$TICK_WATCHER = Event->timer (
706 prio => 1, 1264 prio => 0,
707 at => $NEXT_TICK || 1, 1265 at => $NEXT_TICK || 1,
1266 data => WF_AUTOCANCEL,
708 cb => sub { 1267 cb => sub {
709 cf::server_tick; # one server iteration 1268 cf::server_tick; # one server iteration
710 1269
711 my $NOW = Event::time; 1270 my $NOW = Event::time;
712 $NEXT_TICK += $TICK; 1271 $NEXT_TICK += $TICK;
713 1272
714 # if we are delayed by four ticks, skip them all 1273 # if we are delayed by four ticks or more, skip them all
715 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1274 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
716 1275
717 $TICK_WATCHER->at ($NEXT_TICK); 1276 $TICK_WATCHER->at ($NEXT_TICK);
718 $TICK_WATCHER->start; 1277 $TICK_WATCHER->start;
719 }, 1278 },
720); 1279);
721 1280
1281IO::AIO::max_poll_time $TICK * 0.2;
1282
1283Event->io (fd => IO::AIO::poll_fileno,
1284 poll => 'r',
1285 prio => 5,
1286 data => WF_AUTOCANCEL,
1287 cb => \&IO::AIO::poll_cb);
1288
7221 12891
723 1290

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines