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.51 by root, Mon Aug 28 14:05:24 2006 UTC vs.
Revision 1.98 by root, Fri Dec 22 16:34:00 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 if (@$objs) { 488 if (length $$rdata) {
489 warn sprintf "saving %s (%d,%d)\n",
490 $filename, length $$rdata, scalar @$objs;
491
391 open my $fh, ">:raw", "$filename.pst~"; 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;
392 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs }; 499 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
393 close $fh; 500 close $fh;
394 chmod SAVE_MODE, "$filename.pst~";
395 rename "$filename.pst~", "$filename.pst"; 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 }
396 } else { 510 } else {
511 unlink $filename;
397 unlink "$filename.pst"; 512 unlink "$filename.pst";
398 } 513 }
514}
399 515
400 chmod SAVE_MODE, "$filename~"; 516sub object_freezer_as_string {
401 rename "$filename~", $filename; 517 my ($rdata, $objs) = @_;
518
519 use Data::Dumper;
520
521 $$rdata . Dumper $objs
402} 522}
403 523
404sub object_thawer_load { 524sub object_thawer_load {
405 my ($filename) = @_; 525 my ($filename) = @_;
406 526
527 local $/;
528
529 my $av;
530
531 #TODO: use sysread etc.
532 if (open my $data, "<:raw:perlio", $filename) {
533 $data = <$data>;
407 open my $fh, "<:raw:perlio", "$filename.pst" 534 if (open my $pst, "<:raw:perlio", "$filename.pst") {
408 or return; 535 $av = eval { (Storable::thaw <$pst>)->{objs} };
536 }
537 return ($data, $av);
538 }
409 539
410 eval { local $/; (Storable::thaw <$fh>)->{objs} } 540 ()
411} 541}
412 542
413attach_to_objects 543cf::object->attach (
414 prio => -1000000, 544 prio => -1000000,
415 on_clone => sub { 545 on_clone => sub {
416 my ($src, $dst) = @_; 546 my ($src, $dst) = @_;
417 547
418 @{$dst->registry} = @{$src->registry}; 548 @{$dst->registry} = @{$src->registry};
420 %$dst = %$src; 550 %$dst = %$src;
421 551
422 %{$dst->{_attachment}} = %{$src->{_attachment}} 552 %{$dst->{_attachment}} = %{$src->{_attachment}}
423 if exists $src->{_attachment}; 553 if exists $src->{_attachment};
424 }, 554 },
425; 555);
426 556
427############################################################################# 557#############################################################################
428# old plug-in events 558# command handling &c
429 559
430sub inject_event { 560=item cf::register_command $name => \&callback($ob,$args);
431 my $extension = shift;
432 my $event_code = shift;
433 561
434 my $cb = $hook[$event_code]{$extension} 562Register a callback for execution when the client sends the user command
435 or return; 563$name.
436 564
437 &$cb 565=cut
438}
439
440sub inject_global_event {
441 my $event = shift;
442
443 my $cb = $hook[$event]
444 or return;
445
446 List::Util::max map &$_, values %$cb
447}
448
449sub inject_command {
450 my ($name, $obj, $params) = @_;
451
452 for my $cmd (@{ $command{$name} }) {
453 $cmd->[1]->($obj, $params);
454 }
455
456 -1
457}
458 566
459sub register_command { 567sub register_command {
460 my ($name, $time, $cb) = @_; 568 my ($name, $cb) = @_;
461 569
462 my $caller = caller; 570 my $caller = caller;
463 #warn "registering command '$name/$time' to '$caller'"; 571 #warn "registering command '$name/$time' to '$caller'";
464 572
465 push @{ $command{$name} }, [$time, $cb, $caller]; 573 push @{ $COMMAND{$name} }, [$caller, $cb];
466 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
467} 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
468 584
469sub register_extcmd { 585sub register_extcmd {
470 my ($name, $cb) = @_; 586 my ($name, $cb) = @_;
471 587
472 my $caller = caller; 588 my $caller = caller;
473 #warn "registering extcmd '$name' to '$caller'"; 589 #warn "registering extcmd '$name' to '$caller'";
474 590
475 $extcmd{$name} = [$cb, $caller]; 591 $EXTCMD{$name} = [$cb, $caller];
476} 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);
477 625
478sub register { 626sub register {
479 my ($base, $pkg) = @_; 627 my ($base, $pkg) = @_;
480 628
481 #TODO 629 #TODO
500 . "#line 1 \"$path\"\n{\n" 648 . "#line 1 \"$path\"\n{\n"
501 . (do { local $/; <$fh> }) 649 . (do { local $/; <$fh> })
502 . "\n};\n1"; 650 . "\n};\n1";
503 651
504 eval $source 652 eval $source
505 or die "$path: $@"; 653 or die $@ ? "$path: $@\n"
654 : "extension disabled.\n";
506 655
507 push @exts, $pkg; 656 push @exts, $pkg;
508 $ext_pkg{$base} = $pkg; 657 $ext_pkg{$base} = $pkg;
509 658
510# no strict 'refs'; 659# no strict 'refs';
523# for my $idx (0 .. $#PLUGIN_EVENT) { 672# for my $idx (0 .. $#PLUGIN_EVENT) {
524# delete $hook[$idx]{$pkg}; 673# delete $hook[$idx]{$pkg};
525# } 674# }
526 675
527 # remove commands 676 # remove commands
528 for my $name (keys %command) { 677 for my $name (keys %COMMAND) {
529 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 678 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
530 679
531 if (@cb) { 680 if (@cb) {
532 $command{$name} = \@cb; 681 $COMMAND{$name} = \@cb;
533 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
534 } else { 682 } else {
535 delete $command{$name};
536 delete $COMMAND{"$name\000"}; 683 delete $COMMAND{$name};
537 } 684 }
538 } 685 }
539 686
540 # remove extcmds 687 # remove extcmds
541 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 688 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
542 delete $extcmd{$name}; 689 delete $EXTCMD{$name};
543 } 690 }
544 691
545 if (my $cb = $pkg->can ("unload")) { 692 if (my $cb = $pkg->can ("unload")) {
546 eval { 693 eval {
547 $cb->($pkg); 694 $cb->($pkg);
551 698
552 Symbol::delete_package $pkg; 699 Symbol::delete_package $pkg;
553} 700}
554 701
555sub load_extensions { 702sub load_extensions {
556 my $LIBDIR = maps_directory "perl";
557
558 for my $ext (<$LIBDIR/*.ext>) { 703 for my $ext (<$LIBDIR/*.ext>) {
559 next unless -r $ext; 704 next unless -r $ext;
560 eval { 705 eval {
561 load_extension $ext; 706 load_extension $ext;
562 1 707 1
563 } or warn "$ext not loaded: $@"; 708 } or warn "$ext not loaded: $@";
564 } 709 }
565} 710}
566 711
567sub _perl_reload(&) {
568 my ($msg) = @_;
569
570 $msg->("reloading...");
571
572 eval {
573 # 1. cancel all watchers
574 $_->cancel for Event::all_watchers;
575
576 # 2. unload all extensions
577 for (@exts) {
578 $msg->("unloading <$_>");
579 unload_extension $_;
580 }
581
582 # 3. unload all modules loaded from $LIBDIR
583 while (my ($k, $v) = each %INC) {
584 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
585
586 $msg->("removing <$k>");
587 delete $INC{$k};
588
589 $k =~ s/\.pm$//;
590 $k =~ s/\//::/g;
591
592 if (my $cb = $k->can ("unload_module")) {
593 $cb->();
594 }
595
596 Symbol::delete_package $k;
597 }
598
599 # 4. get rid of safe::, as good as possible
600 Symbol::delete_package "safe::$_"
601 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
602
603 # 5. remove register_script_function callbacks
604 # TODO
605
606 # 6. unload cf.pm "a bit"
607 delete $INC{"cf.pm"};
608
609 # don't, removes xs symbols, too,
610 # and global variables created in xs
611 #Symbol::delete_package __PACKAGE__;
612
613 # 7. reload cf.pm
614 $msg->("reloading cf.pm");
615 require cf;
616 };
617 $msg->($@) if $@;
618
619 $msg->("reloaded");
620};
621
622sub perl_reload() {
623 _perl_reload {
624 warn $_[0];
625 print "$_[0]\n";
626 };
627}
628
629register_command "perl-reload", 0, sub {
630 my ($who, $arg) = @_;
631
632 if ($who->flag (FLAG_WIZ)) {
633 _perl_reload {
634 warn $_[0];
635 $who->message ($_[0]);
636 };
637 }
638};
639
640#############################################################################
641# extcmd framework, basically convert ext <msg>
642# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
643
644attach_to_players
645 on_extcmd => sub {
646 my ($pl, $buf) = @_;
647
648 my $msg = eval { from_json $buf };
649
650 if (ref $msg) {
651 if (my $cb = $extcmd{$msg->{msgtype}}) {
652 if (my %reply = $cb->[0]->($pl, $msg)) {
653 $pl->ext_reply ($msg->{msgid}, %reply);
654 }
655 }
656 } else {
657 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
658 }
659
660 cf::override;
661 },
662;
663
664############################################################################# 712#############################################################################
665# load/save/clean perl data associated with a map 713# load/save/clean perl data associated with a map
666 714
667*cf::mapsupport::on_clean = sub { 715*cf::mapsupport::on_clean = sub {
668 my ($map) = @_; 716 my ($map) = @_;
671 defined $path or return; 719 defined $path or return;
672 720
673 unlink "$path.pst"; 721 unlink "$path.pst";
674}; 722};
675 723
676# old style persistent data, TODO: remove #d#
677*cf::mapsupport::on_swapin =
678*cf::mapsupport::on_load = sub {
679 my ($map) = @_;
680
681 my $path = $map->tmpname;
682 $path = $map->path unless defined $path;
683
684 open my $fh, "<:raw", "$path.cfperl"
685 or return; # no perl data
686
687 my $data = Storable::thaw do { local $/; <$fh> };
688
689 $data->{version} <= 1
690 or return; # too new
691
692 $map->_set_obs ($data->{obs});
693 $map->invoke (EVENT_MAP_UPGRADE);
694};
695
696attach_to_maps prio => -10000, package => cf::mapsupport::; 724cf::map->attach (prio => -10000, package => cf::mapsupport::);
697 725
698############################################################################# 726#############################################################################
699# load/save perl data associated with player->ob objects 727# load/save perl data associated with player->ob objects
700 728
701sub all_objects(@) { 729sub all_objects(@) {
702 @_, map all_objects ($_->inv), @_ 730 @_, map all_objects ($_->inv), @_
703} 731}
704 732
705attach_to_players 733# TODO: compatibility cruft, remove when no longer needed
734cf::player->attach (
706 on_load => sub { 735 on_load => sub {
707 my ($pl, $path) = @_; 736 my ($pl, $path) = @_;
708 737
709 for my $o (all_objects $pl->ob) { 738 for my $o (all_objects $pl->ob) {
710 if (my $value = $o->get_ob_key_value ("_perl_data")) { 739 if (my $value = $o->get_ob_key_value ("_perl_data")) {
712 741
713 %$o = %{ Storable::thaw pack "H*", $value }; 742 %$o = %{ Storable::thaw pack "H*", $value };
714 } 743 }
715 } 744 }
716 }, 745 },
717; 746);
718 747
719############################################################################# 748#############################################################################
720# 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
721 757
722=item cf::player::exists $login 758=item cf::player::exists $login
723 759
724Returns true when the given account exists. 760Returns true when the given account exists.
725 761
728sub cf::player::exists($) { 764sub cf::player::exists($) {
729 cf::player::find $_[0] 765 cf::player::find $_[0]
730 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;
731} 767}
732 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
733=item $player->reply ($npc, $msg[, $flags]) 789=item $player_object->reply ($npc, $msg[, $flags])
734 790
735Sends 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>
736can 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
737dialogue with the given NPC character. 793dialogue with the given NPC character.
738 794
739=cut 795=cut
740 796
741# rough implementation of a future "reply" method that works 797# rough implementation of a future "reply" method that works
742# with dialog boxes. 798# with dialog boxes.
799#TODO: the first argument must go, split into a $npc->reply_to ( method
743sub cf::object::player::reply($$$;$) { 800sub cf::object::player::reply($$$;$) {
744 my ($self, $npc, $msg, $flags) = @_; 801 my ($self, $npc, $msg, $flags) = @_;
745 802
746 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 803 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
747 804
751 $msg = $npc->name . " says: $msg" if $npc; 808 $msg = $npc->name . " says: $msg" if $npc;
752 $self->message ($msg, $flags); 809 $self->message ($msg, $flags);
753 } 810 }
754} 811}
755 812
756=item $player->ext_reply ($msgid, $msgtype, %msg) 813=item $player_object->may ("access")
757 814
758Sends an ext reply to the player. 815Returns wether the given player is authorized to access resource "access"
816(e.g. "command_wizcast").
759 817
760=cut 818=cut
761 819
762sub 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 {
763 my ($self, $id, %msg) = @_; 906 my ($self, $cb) = @_;
764 907
765 $msg{msgid} = $id; 908 my $coro; $coro = async {
909 eval {
910 $cb->();
911 };
912 warn $@ if $@;
913 delete $self->{_coro}{$coro+0};
914 };
766 915
767 $self->send ("ext " . to_json \%msg); 916 $self->{_coro}{$coro+0} = $coro;
768} 917}
769 918
770############################################################################# 919cf::client->attach (
771# 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
772 939
773our $safe = new Safe "safe"; 940our $safe = new Safe "safe";
774our $safe_hole = new Safe::Hole; 941our $safe_hole = new Safe::Hole;
775 942
776$SIG{FPE} = 'IGNORE'; 943$SIG{FPE} = 'IGNORE';
777 944
778$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));
779 946
780# here we export the classes and methods available to script code 947# here we export the classes and methods available to script code
781 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
782for ( 960for (
783 ["cf::object" => qw(contr pay_amount pay_player)], 961 ["cf::object" => qw(contr pay_amount pay_player map)],
784 ["cf::object::player" => qw(player)], 962 ["cf::object::player" => qw(player)],
785 ["cf::player" => qw(peaceful)], 963 ["cf::player" => qw(peaceful)],
964 ["cf::map" => qw(trigger)],
786) { 965) {
787 no strict 'refs'; 966 no strict 'refs';
788 my ($pkg, @funs) = @$_; 967 my ($pkg, @funs) = @$_;
789 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 968 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
790 for @funs; 969 for @funs;
791} 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
792 983
793sub safe_eval($;@) { 984sub safe_eval($;@) {
794 my ($code, %vars) = @_; 985 my ($code, %vars) = @_;
795 986
796 my $qcode = $code; 987 my $qcode = $code;
819 } 1010 }
820 1011
821 wantarray ? @res : $res[0] 1012 wantarray ? @res : $res[0]
822} 1013}
823 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
824sub register_script_function { 1030sub register_script_function {
825 my ($fun, $cb) = @_; 1031 my ($fun, $cb) = @_;
826 1032
827 no strict 'refs'; 1033 no strict 'refs';
828 *{"safe::$fun"} = $safe_hole->wrap ($cb); 1034 *{"safe::$fun"} = $safe_hole->wrap ($cb);
829} 1035}
830 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
831############################################################################# 1146#############################################################################
832# the server's main() 1147# the server's main()
833 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
834sub main { 1157sub main {
1158 cfg_load;
1159 db_load;
1160 load_extensions;
835 Event::loop; 1161 Event::loop;
836} 1162}
837 1163
838############################################################################# 1164#############################################################################
839# initialisation 1165# initialisation
840 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
841register "<global>", __PACKAGE__; 1246register "<global>", __PACKAGE__;
842 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
843unshift @INC, $LIBDIR; 1259unshift @INC, $LIBDIR;
844 1260
845load_extensions;
846
847$TICK_WATCHER = Event->timer ( 1261$TICK_WATCHER = Event->timer (
848 prio => 1, 1262 prio => 0,
849 at => $NEXT_TICK || 1, 1263 at => $NEXT_TICK || 1,
1264 data => WF_AUTOCANCEL,
850 cb => sub { 1265 cb => sub {
851 cf::server_tick; # one server iteration 1266 cf::server_tick; # one server iteration
852 1267
853 my $NOW = Event::time; 1268 my $NOW = Event::time;
854 $NEXT_TICK += $TICK; 1269 $NEXT_TICK += $TICK;
855 1270
856 # if we are delayed by four ticks, skip them all 1271 # if we are delayed by four ticks or more, skip them all
857 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1272 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
858 1273
859 $TICK_WATCHER->at ($NEXT_TICK); 1274 $TICK_WATCHER->at ($NEXT_TICK);
860 $TICK_WATCHER->start; 1275 $TICK_WATCHER->start;
861 }, 1276 },
862); 1277);
863 1278
864_reload_2; 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);
865 1286
8661 12871
867 1288

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines