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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines