ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.45 by root, Sat Aug 26 23:36:32 2006 UTC vs.
Revision 1.102 by root, Wed Dec 27 15:20:54 2006 UTC

1package cf; 1package cf;
2
3use utf8;
4use strict;
2 5
3use Symbol; 6use Symbol;
4use List::Util; 7use List::Util;
5use Storable; 8use Storable;
6use Opcode; 9use Opcode;
7use Safe; 10use Safe;
8use Safe::Hole; 11use Safe::Hole;
9 12
13use Coro;
14use Coro::Event;
15use Coro::Timer;
16use Coro::Signal;
17use Coro::Semaphore;
18
19use IO::AIO 2.3;
20use YAML::Syck ();
10use Time::HiRes; 21use Time::HiRes;
11use Event; 22
12$Event::Eval = 1; # no idea why this is required, but it is 23use Event; $Event::Eval = 1; # no idea why this is required, but it is
13 24
14use strict; 25# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
26$YAML::Syck::ImplicitUnicode = 1;
15 27
28$Coro::main->prio (Coro::PRIO_MIN);
29
30sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31
16our %COMMAND = (); 32our %COMMAND = ();
33our %COMMAND_TIME = ();
34our %EXTCMD = ();
35
17our @EVENT; 36our @EVENT;
18our %PROP_TYPE; 37our $LIBDIR = datadir . "/ext";
19our %PROP_IDX;
20our $LIBDIR = maps_directory "perl";
21 38
22our $TICK = MAX_TIME * 1e-6; 39our $TICK = MAX_TIME * 1e-6;
23our $TICK_WATCHER; 40our $TICK_WATCHER;
24our $NEXT_TICK; 41our $NEXT_TICK;
42
43our %CFG;
44
45our $UPTIME; $UPTIME ||= time;
46
47#############################################################################
48
49=head2 GLOBAL VARIABLES
50
51=over 4
52
53=item $cf::UPTIME
54
55The timestamp of the server start (so not actually an uptime).
56
57=item $cf::LIBDIR
58
59The perl library directory, where extensions and cf-specific modules can
60be found. It will be added to C<@INC> automatically.
61
62=item $cf::TICK
63
64The interval between server ticks, in seconds.
65
66=item %cf::CFG
67
68Configuration for the server, loaded from C</etc/crossfire/config>, or
69from wherever your confdir points to.
70
71=back
72
73=cut
25 74
26BEGIN { 75BEGIN {
27 *CORE::GLOBAL::warn = sub { 76 *CORE::GLOBAL::warn = sub {
28 my $msg = join "", @_; 77 my $msg = join "", @_;
29 $msg .= "\n" 78 $msg .= "\n"
32 print STDERR "cfperl: $msg"; 81 print STDERR "cfperl: $msg";
33 LOG llevError, "cfperl: $msg"; 82 LOG llevError, "cfperl: $msg";
34 }; 83 };
35} 84}
36 85
37my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply! 86@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
38 87@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
39# generate property mutators 88@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
40sub prop_gen { 89@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
41 my ($prefix, $class) = @_; 90@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
42
43 no strict 'refs';
44
45 for my $prop (keys %PROP_TYPE) {
46 $prop =~ /^\Q$prefix\E_(.*$)/ or next;
47 my $sub = lc $1;
48
49 my $type = $PROP_TYPE{$prop};
50 my $idx = $PROP_IDX {$prop};
51
52 *{"$class\::get_$sub"} = *{"$class\::$sub"} = sub {
53 $_[0]->get_property ($type, $idx)
54 };
55
56 *{"$class\::set_$sub"} = sub {
57 $_[0]->set_property ($type, $idx, $_[1]);
58 } unless $ignore_set{$prop};
59 }
60}
61
62# auto-generate most of the API
63
64prop_gen OBJECT_PROP => "cf::object";
65# CFAPI_OBJECT_ANIMATION?
66prop_gen PLAYER_PROP => "cf::object::player";
67
68prop_gen MAP_PROP => "cf::map";
69prop_gen ARCH_PROP => "cf::arch";
70
71@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 91@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
72 92
73# we bless all objects into (empty) derived classes to force a method lookup 93# we bless all objects into (empty) derived classes to force a method lookup
74# within the Safe compartment. 94# within the Safe compartment.
75for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) { 95for my $pkg (qw(
96 cf::global cf::attachable
97 cf::object cf::object::player
98 cf::client cf::player
99 cf::arch cf::living
100 cf::map cf::party cf::region
101)) {
76 no strict 'refs'; 102 no strict 'refs';
77 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 103 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
78} 104}
79 105
80$Event::DIED = sub { 106$Event::DIED = sub {
82}; 108};
83 109
84my %ext_pkg; 110my %ext_pkg;
85my @exts; 111my @exts;
86my @hook; 112my @hook;
87my %command;
88my %extcmd;
89 113
90############################################################################# 114=head2 UTILITY FUNCTIONS
91# utility functions 115
116=over 4
117
118=cut
92 119
93use JSON::Syck (); # TODO# replace by JSON::PC once working 120use JSON::Syck (); # TODO# replace by JSON::PC once working
121
122=item $ref = cf::from_json $json
123
124Converts a JSON string into the corresponding perl data structure.
125
126=cut
94 127
95sub from_json($) { 128sub from_json($) {
96 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs 129 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
97 JSON::Syck::Load $_[0] 130 JSON::Syck::Load $_[0]
98} 131}
99 132
133=item $json = cf::to_json $ref
134
135Converts a perl data structure into its JSON representation.
136
137=cut
138
100sub to_json($) { 139sub to_json($) {
101 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 140 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
102 JSON::Syck::Dump $_[0] 141 JSON::Syck::Dump $_[0]
103} 142}
104 143
144=back
145
146=cut
147
105############################################################################# 148#############################################################################
106# "new" plug-in system
107 149
108=item cf::object::attach ... # NYI 150=head2 ATTACHABLE OBJECTS
109 151
110=item cf::attach_global ... 152Many objects in crossfire are so-called attachable objects. That means you can
153attach callbacks/event handlers (a collection of which is called an "attachment")
154to it. All such attachable objects support the following methods.
111 155
112=item cf::attach_to_type $object_type, ... 156In the following description, CLASS can be any of C<global>, C<object>
157C<player>, C<client> or C<map> (i.e. the attachable objects in
158crossfire+).
113 159
114=item cf::attach_to_objects ... 160=over 4
115 161
116=item cf::attach_to_players ... 162=item $attachable->attach ($attachment, key => $value...)
117 163
118=item cf::attach_to_maps ... 164=item $attachable->detach ($attachment)
119 165
166Attach/detach a pre-registered attachment to a specific object and give it
167the specified key/value pairs as arguments.
168
169Example, attach a minesweeper attachment to the given object, making it a
17010x10 minesweeper game:
171
172 $obj->attach (minesweeper => width => 10, height => 10);
173
174=item $bool = $attachable->attached ($name)
175
176Checks wether the named attachment is currently attached to the object.
177
178=item cf::CLASS->attach ...
179
180=item cf::CLASS->detach ...
181
182Define an anonymous attachment and attach it to all objects of the given
183CLASS. See the next function for an explanation of its arguments.
184
185You can attach to global events by using the C<cf::global> class.
186
187Example, log all player logins:
188
189 cf::player->attach (
190 on_login => sub {
191 my ($pl) = @_;
192 ...
193 },
194 );
195
196Example, attach to the jeweler skill:
197
198 cf::object->attach (
199 type => cf::SKILL,
200 subtype => cf::SK_JEWELER,
201 on_use_skill => sub {
202 my ($sk, $ob, $part, $dir, $msg) = @_;
203 ...
204 },
205 );
206
120=item cf:register_attachment $name, ... 207=item cf::CLASS::attachment $name, ...
121 208
122 prio => $number, # lower is earlier 209Register an attachment by C<$name> through which attachable objects of the
123 on_xxx => \&cb, 210given CLASS can refer to this attachment.
211
212Some classes such as crossfire maps and objects can specify attachments
213that are attached at load/instantiate time, thus the need for a name.
214
215These calls expect any number of the following handler/hook descriptions:
216
217=over 4
218
219=item prio => $number
220
221Set the priority for all following handlers/hooks (unless overwritten
222by another C<prio> setting). Lower priority handlers get executed
223earlier. The default priority is C<0>, and many built-in handlers are
224registered at priority C<-1000>, so lower priorities should not be used
225unless you know what you are doing.
226
227=item type => $type
228
229(Only for C<< cf::object->attach >> calls), limits the attachment to the
230given type of objects only (the additional parameter C<subtype> can be
231used to further limit to the given subtype).
232
233=item on_I<event> => \&cb
234
235Call the given code reference whenever the named event happens (event is
236something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
237handlers are recognised generally depends on the type of object these
238handlers attach to).
239
240See F<include/eventinc.h> for the full list of events supported, and their
241class.
242
124 package => package::, 243=item package => package::
244
245Look for sub functions of the name C<< on_I<event> >> in the given
246package and register them. Only handlers for eevents supported by the
247object/class are recognised.
248
249=back
250
251Example, define an attachment called "sockpuppet" that calls the given
252event handler when a monster attacks:
253
254 cf::object::attachment sockpuppet =>
255 on_skill_attack => sub {
256 my ($self, $victim) = @_;
257 ...
258 }
259 }
260
261=item $attachable->valid
262
263Just because you have a perl object does not mean that the corresponding
264C-level object still exists. If you try to access an object that has no
265valid C counterpart anymore you get an exception at runtime. This method
266can be used to test for existence of the C object part without causing an
267exception.
125 268
126=cut 269=cut
127 270
128# the following variables are defined in .xs and must not be re-created 271# the following variables are defined in .xs and must not be re-created
129our @CB_GLOBAL = (); # registry for all global events 272our @CB_GLOBAL = (); # registry for all global events
273our @CB_ATTACHABLE = (); # registry for all attachables
130our @CB_OBJECT = (); # all objects (should not be used except in emergency) 274our @CB_OBJECT = (); # all objects (should not be used except in emergency)
131our @CB_PLAYER = (); 275our @CB_PLAYER = ();
276our @CB_CLIENT = ();
132our @CB_TYPE = (); # registry for type (cf-object class) based events 277our @CB_TYPE = (); # registry for type (cf-object class) based events
133our @CB_MAP = (); 278our @CB_MAP = ();
134 279
135my %attachment; 280my %attachment;
136 281
137sub _attach_cb($\%$$$) { 282sub _attach_cb($$$$) {
138 my ($registry, $undo, $event, $prio, $cb) = @_; 283 my ($registry, $event, $prio, $cb) = @_;
139 284
140 use sort 'stable'; 285 use sort 'stable';
141 286
142 $cb = [$prio, $cb]; 287 $cb = [$prio, $cb];
143 288
144 @{$registry->[$event]} = sort 289 @{$registry->[$event]} = sort
145 { $a->[0] cmp $b->[0] } 290 { $a->[0] cmp $b->[0] }
146 @{$registry->[$event] || []}, $cb; 291 @{$registry->[$event] || []}, $cb;
147
148 push @{$undo->{cb}}, [$event, $cb];
149} 292}
293
294# hack
295my %attachable_klass = map +($_ => 1), KLASS_OBJECT, KLASS_CLIENT, KLASS_PLAYER, KLASS_MAP;
150 296
151# attach handles attaching event callbacks 297# attach handles attaching event callbacks
152# the only thing the caller has to do is pass the correct 298# the only thing the caller has to do is pass the correct
153# registry (== where the callback attaches to). 299# registry (== where the callback attaches to).
154sub _attach(\@$@) { 300sub _attach {
155 my ($registry, $klass, @arg) = @_; 301 my ($registry, $klass, @arg) = @_;
156 302
303 my $object_type;
157 my $prio = 0; 304 my $prio = 0;
158
159 my %undo = (
160 registry => $registry,
161 cb => [],
162 );
163
164 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT; 305 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
306
307 #TODO: get rid of this hack
308 if ($attachable_klass{$klass}) {
309 %cb_id = (%cb_id, map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == KLASS_ATTACHABLE, 0 .. $#EVENT);
310 }
165 311
166 while (@arg) { 312 while (@arg) {
167 my $type = shift @arg; 313 my $type = shift @arg;
168 314
169 if ($type eq "prio") { 315 if ($type eq "prio") {
170 $prio = shift @arg; 316 $prio = shift @arg;
171 317
318 } elsif ($type eq "type") {
319 $object_type = shift @arg;
320 $registry = $CB_TYPE[$object_type] ||= [];
321
322 } elsif ($type eq "subtype") {
323 defined $object_type or Carp::croak "subtype specified without type";
324 my $object_subtype = shift @arg;
325 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];
326
172 } elsif ($type eq "package") { 327 } elsif ($type eq "package") {
173 my $pkg = shift @arg; 328 my $pkg = shift @arg;
174 329
175 while (my ($name, $id) = each %cb_id) { 330 while (my ($name, $id) = each %cb_id) {
176 if (my $cb = $pkg->can ($name)) { 331 if (my $cb = $pkg->can ($name)) {
177 _attach_cb $registry, %undo, $id, $prio, $cb; 332 _attach_cb $registry, $id, $prio, $cb;
178 } 333 }
179 } 334 }
180 335
181 } elsif (exists $cb_id{$type}) { 336 } elsif (exists $cb_id{$type}) {
182 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg; 337 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
183 338
184 } elsif (ref $type) { 339 } elsif (ref $type) {
185 warn "attaching objects not supported, ignoring.\n"; 340 warn "attaching objects not supported, ignoring.\n";
186 341
187 } else { 342 } else {
188 shift @arg; 343 shift @arg;
189 warn "attach argument '$type' not supported, ignoring.\n"; 344 warn "attach argument '$type' not supported, ignoring.\n";
190 } 345 }
191 } 346 }
192
193 \%undo
194} 347}
195 348
196sub cf::object::attach { 349sub _object_attach {
197 die; 350 my ($obj, $name, %arg) = @_;
198}
199 351
200sub attach_global { 352 return if exists $obj->{_attachment}{$name};
201 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
202}
203 353
204sub attach_to_type { 354 if (my $attach = $attachment{$name}) {
205 my $type = shift; 355 my $registry = $obj->registry;
206 356
207 _attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_ 357 for (@$attach) {
208} 358 my ($klass, @attach) = @$_;
359 _attach $registry, $klass, @attach;
360 }
209 361
210sub attach_to_objects { 362 $obj->{$name} = \%arg;
211 _attach @CB_OBJECT, KLASS_OBJECT, @_ 363 } else {
212} 364 warn "object uses attachment '$name' that is not available, postponing.\n";
365 }
213 366
214sub attach_to_players { 367 $obj->{_attachment}{$name} = undef;
215 _attach @CB_PLAYER, KLASS_PLAYER, @_
216} 368}
217 369
218sub attach_to_maps { 370sub cf::attachable::attach {
219 _attach @CB_MAP, KLASS_MAP, @_ 371 if (ref $_[0]) {
220} 372 _object_attach @_;
373 } else {
374 _attach shift->_attach_registry, @_;
375 }
376};
221 377
222sub register_attachment { 378# all those should be optimised
379sub cf::attachable::detach {
380 my ($obj, $name) = @_;
381
382 if (ref $obj) {
383 delete $obj->{_attachment}{$name};
384 reattach ($obj);
385 } else {
386 Carp::croak "cannot, currently, detach class attachments";
387 }
388};
389
390sub cf::attachable::attached {
391 my ($obj, $name) = @_;
392
393 exists $obj->{_attachment}{$name}
394}
395
396for my $klass (qw(ATTACHABLE GLOBAL OBJECT PLAYER CLIENT MAP)) {
397 eval "#line " . __LINE__ . " 'cf.pm'
398 sub cf::\L$klass\E::_attach_registry {
399 (\\\@CB_$klass, KLASS_$klass)
400 }
401
402 sub cf::\L$klass\E::attachment {
223 my $name = shift; 403 my \$name = shift;
224 404
225 $attachment{$name} = [@_]; 405 \$attachment{\$name} = [[KLASS_$klass, \@_]];
406 }
407 ";
408 die if $@;
226} 409}
227 410
228our $override; 411our $override;
229our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 412our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
230 413
244 for (@$callbacks) { 427 for (@$callbacks) {
245 eval { &{$_->[1]} }; 428 eval { &{$_->[1]} };
246 429
247 if ($@) { 430 if ($@) {
248 warn "$@"; 431 warn "$@";
249 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n"; 432 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
250 override; 433 override;
251 } 434 }
252 435
253 return 1 if $override; 436 return 1 if $override;
254 } 437 }
255 438
256 0 439 0
257} 440}
441
442=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)
443
444=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
445
446Generate an object-specific event with the given arguments.
447
448This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
449removed in future versions), and there is no public API to access override
450results (if you must, access C<@cf::invoke_results> directly).
451
452=back
453
454=cut
258 455
259############################################################################# 456#############################################################################
260# object support 457# object support
261 458
262sub instantiate { 459sub reattach {
460 # basically do the same as instantiate, without calling instantiate
263 my ($obj, $data) = @_; 461 my ($obj) = @_;
462
264 my $registry = $obj->registry; 463 my $registry = $obj->registry;
265 464
266 $data = from_json $data; 465 @$registry = ();
267 466
268 for (@$data) { 467 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
269 my ($pri, $name, @args) = @$_;
270 468
469 for my $name (keys %{ $obj->{_attachment} || {} }) {
271 if (my $attach = $attachment{$name}) { 470 if (my $attach = $attachment{$name}) {
272 _attach @$registry, KLASS_OBJECT, @$attach;
273
274 if (my $cb = delete $registry->[EVENT_OBJECT_INSTANTIATE]) {
275 for (@$cb) { 471 for (@$attach) {
276 eval { $_->[1]->($obj, @args); }; 472 my ($klass, @attach) = @$_;
277 if ($@) { 473 _attach $registry, $klass, @attach;
278 warn "$@";
279 warn "... while processing '$name' instantiate with args <@args>\n";
280 } 474 }
475 } else {
476 warn "object uses attachment '$name' that is not available, postponing.\n";
477 }
478 }
479}
480
481cf::attachable->attach (
482 prio => -1000000,
483 on_instantiate => sub {
484 my ($obj, $data) = @_;
485
486 $data = from_json $data;
487
488 for (@$data) {
489 my ($name, $args) = @$_;
490
491 $obj->attach ($name, %{$args || {} });
492 }
493 },
494 on_reattach => \&reattach,
495 on_clone => sub {
496 my ($src, $dst) = @_;
497
498 @{$dst->registry} = @{$src->registry};
499
500 %$dst = %$src;
501
502 %{$dst->{_attachment}} = %{$src->{_attachment}}
503 if exists $src->{_attachment};
504 },
505);
506
507sub object_freezer_save {
508 my ($filename, $rdata, $objs) = @_;
509
510 if (length $$rdata) {
511 warn sprintf "saving %s (%d,%d)\n",
512 $filename, length $$rdata, scalar @$objs;
513
514 if (open my $fh, ">:raw", "$filename~") {
515 chmod SAVE_MODE, $fh;
516 syswrite $fh, $$rdata;
517 close $fh;
518
519 if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
520 chmod SAVE_MODE, $fh;
521 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
522 close $fh;
523 rename "$filename.pst~", "$filename.pst";
524 } else {
525 unlink "$filename.pst";
526 }
527
528 rename "$filename~", $filename;
529 } else {
530 warn "FATAL: $filename~: $!\n";
531 }
532 } else {
533 unlink $filename;
534 unlink "$filename.pst";
535 }
536}
537
538sub object_freezer_as_string {
539 my ($rdata, $objs) = @_;
540
541 use Data::Dumper;
542
543 $$rdata . Dumper $objs
544}
545
546sub object_thawer_load {
547 my ($filename) = @_;
548
549 local $/;
550
551 my $av;
552
553 #TODO: use sysread etc.
554 if (open my $data, "<:raw:perlio", $filename) {
555 $data = <$data>;
556 if (open my $pst, "<:raw:perlio", "$filename.pst") {
557 $av = eval { (Storable::thaw <$pst>)->{objs} };
558 }
559 return ($data, $av);
560 }
561
562 ()
563}
564
565#############################################################################
566# command handling &c
567
568=item cf::register_command $name => \&callback($ob,$args);
569
570Register a callback for execution when the client sends the user command
571$name.
572
573=cut
574
575sub register_command {
576 my ($name, $cb) = @_;
577
578 my $caller = caller;
579 #warn "registering command '$name/$time' to '$caller'";
580
581 push @{ $COMMAND{$name} }, [$caller, $cb];
582}
583
584=item cf::register_extcmd $name => \&callback($pl,$packet);
585
586Register a callbackf ro execution when the client sends an extcmd packet.
587
588If the callback returns something, it is sent back as if reply was being
589called.
590
591=cut
592
593sub register_extcmd {
594 my ($name, $cb) = @_;
595
596 my $caller = caller;
597 #warn "registering extcmd '$name' to '$caller'";
598
599 $EXTCMD{$name} = [$cb, $caller];
600}
601
602cf::player->attach (
603 on_command => sub {
604 my ($pl, $name, $params) = @_;
605
606 my $cb = $COMMAND{$name}
607 or return;
608
609 for my $cmd (@$cb) {
610 $cmd->[1]->($pl->ob, $params);
611 }
612
613 cf::override;
614 },
615 on_extcmd => sub {
616 my ($pl, $buf) = @_;
617
618 my $msg = eval { from_json $buf };
619
620 if (ref $msg) {
621 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
622 if (my %reply = $cb->[0]->($pl, $msg)) {
623 $pl->ext_reply ($msg->{msgid}, %reply);
281 } 624 }
282 } 625 }
283 } else { 626 } else {
284 warn "object uses attachment $name that is not available, postponing.\n"; 627 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
285 } 628 }
286 629
287 push @{$obj->{_attachment}}, $name; 630 cf::override;
288 }
289}
290
291# basically do the same as instantiate, without calling instantiate
292sub reattach {
293 my ($obj) = @_;
294 my $registry = $obj->registry;
295
296 warn "reattach<@_, $_>\n";
297}
298
299attach_to_objects
300 prio => -1000000,
301 on_clone => sub {
302 my ($src, $dst) = @_;
303
304 @{$dst->registry} = @{$src->registry};
305 warn "registry clone ", join ":", @{$src->registry};#d#
306
307 %$dst = %$src;
308
309 $dst->{_attachment} = [@{ $src->{_attachment} }]
310 if exists $src->{_attachment};
311
312 warn "clone<@_>\n";#d#
313 }, 631 },
314; 632);
315
316#############################################################################
317# old plug-in events
318
319sub inject_event {
320 my $extension = shift;
321 my $event_code = shift;
322
323 my $cb = $hook[$event_code]{$extension}
324 or return;
325
326 &$cb
327}
328
329sub inject_global_event {
330 my $event = shift;
331
332 my $cb = $hook[$event]
333 or return;
334
335 List::Util::max map &$_, values %$cb
336}
337
338sub inject_command {
339 my ($name, $obj, $params) = @_;
340
341 for my $cmd (@{ $command{$name} }) {
342 $cmd->[1]->($obj, $params);
343 }
344
345 -1
346}
347
348sub register_command {
349 my ($name, $time, $cb) = @_;
350
351 my $caller = caller;
352 #warn "registering command '$name/$time' to '$caller'";
353
354 push @{ $command{$name} }, [$time, $cb, $caller];
355 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
356}
357
358sub register_extcmd {
359 my ($name, $cb) = @_;
360
361 my $caller = caller;
362 #warn "registering extcmd '$name' to '$caller'";
363
364 $extcmd{$name} = [$cb, $caller];
365}
366 633
367sub register { 634sub register {
368 my ($base, $pkg) = @_; 635 my ($base, $pkg) = @_;
369 636
370 #TODO 637 #TODO
389 . "#line 1 \"$path\"\n{\n" 656 . "#line 1 \"$path\"\n{\n"
390 . (do { local $/; <$fh> }) 657 . (do { local $/; <$fh> })
391 . "\n};\n1"; 658 . "\n};\n1";
392 659
393 eval $source 660 eval $source
394 or die "$path: $@"; 661 or die $@ ? "$path: $@\n"
662 : "extension disabled.\n";
395 663
396 push @exts, $pkg; 664 push @exts, $pkg;
397 $ext_pkg{$base} = $pkg; 665 $ext_pkg{$base} = $pkg;
398 666
399# no strict 'refs'; 667# no strict 'refs';
412# for my $idx (0 .. $#PLUGIN_EVENT) { 680# for my $idx (0 .. $#PLUGIN_EVENT) {
413# delete $hook[$idx]{$pkg}; 681# delete $hook[$idx]{$pkg};
414# } 682# }
415 683
416 # remove commands 684 # remove commands
417 for my $name (keys %command) { 685 for my $name (keys %COMMAND) {
418 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 686 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
419 687
420 if (@cb) { 688 if (@cb) {
421 $command{$name} = \@cb; 689 $COMMAND{$name} = \@cb;
422 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
423 } else { 690 } else {
424 delete $command{$name};
425 delete $COMMAND{"$name\000"}; 691 delete $COMMAND{$name};
426 } 692 }
427 } 693 }
428 694
429 # remove extcmds 695 # remove extcmds
430 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 696 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
431 delete $extcmd{$name}; 697 delete $EXTCMD{$name};
432 } 698 }
433 699
434 if (my $cb = $pkg->can ("unload")) { 700 if (my $cb = $pkg->can ("unload")) {
435 eval { 701 eval {
436 $cb->($pkg); 702 $cb->($pkg);
440 706
441 Symbol::delete_package $pkg; 707 Symbol::delete_package $pkg;
442} 708}
443 709
444sub load_extensions { 710sub load_extensions {
445 my $LIBDIR = maps_directory "perl";
446
447 for my $ext (<$LIBDIR/*.ext>) { 711 for my $ext (<$LIBDIR/*.ext>) {
448 next unless -r $ext; 712 next unless -r $ext;
449 eval { 713 eval {
450 load_extension $ext; 714 load_extension $ext;
451 1 715 1
452 } or warn "$ext not loaded: $@"; 716 } or warn "$ext not loaded: $@";
453 } 717 }
454} 718}
455 719
456sub _perl_reload(&) {
457 my ($msg) = @_;
458
459 $msg->("reloading...");
460
461 eval {
462 # 1. cancel all watchers
463 $_->cancel for Event::all_watchers;
464
465 # 2. unload all extensions
466 for (@exts) {
467 $msg->("unloading <$_>");
468 unload_extension $_;
469 }
470
471 # 3. unload all modules loaded from $LIBDIR
472 while (my ($k, $v) = each %INC) {
473 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
474
475 $msg->("removing <$k>");
476 delete $INC{$k};
477
478 $k =~ s/\.pm$//;
479 $k =~ s/\//::/g;
480
481 if (my $cb = $k->can ("unload_module")) {
482 $cb->();
483 }
484
485 Symbol::delete_package $k;
486 }
487
488 # 4. get rid of safe::, as good as possible
489 Symbol::delete_package "safe::$_"
490 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
491
492 # 5. remove register_script_function callbacks
493 # TODO
494
495 # 6. unload cf.pm "a bit"
496 delete $INC{"cf.pm"};
497
498 # don't, removes xs symbols, too,
499 # and global variables created in xs
500 #Symbol::delete_package __PACKAGE__;
501
502 # 7. reload cf.pm
503 $msg->("reloading cf.pm");
504 require cf;
505 };
506 $msg->($@) if $@;
507
508 $msg->("reloaded");
509};
510
511sub perl_reload() {
512 _perl_reload {
513 warn $_[0];
514 print "$_[0]\n";
515 };
516}
517
518register_command "perl-reload", 0, sub {
519 my ($who, $arg) = @_;
520
521 if ($who->flag (FLAG_WIZ)) {
522 _perl_reload {
523 warn $_[0];
524 $who->message ($_[0]);
525 };
526 }
527};
528
529#############################################################################
530# extcmd framework, basically convert ext <msg>
531# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
532
533attach_to_players
534 on_extcmd => sub {
535 my ($pl, $buf) = @_;
536
537 my $msg = eval { from_json $buf };
538
539 if (ref $msg) {
540 if (my $cb = $extcmd{$msg->{msgtype}}) {
541 if (my %reply = $cb->[0]->($pl, $msg)) {
542 $pl->ext_reply ($msg->{msgid}, %reply);
543 }
544 }
545 } else {
546 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
547 }
548
549 cf::override;
550 },
551;
552
553############################################################################# 720#############################################################################
554# load/save/clean perl data associated with a map 721# load/save/clean perl data associated with a map
555 722
556*cf::mapsupport::on_clean = sub { 723*cf::mapsupport::on_clean = sub {
557 my ($map) = @_; 724 my ($map) = @_;
558 725
559 my $path = $map->tmpname; 726 my $path = $map->tmpname;
560 defined $path or return; 727 defined $path or return;
561 728
562 unlink "$path.cfperl"; 729 unlink "$path.pst";
563}; 730};
564 731
565*cf::mapsupport::on_swapin =
566*cf::mapsupport::on_load = sub {
567 my ($map) = @_;
568
569 my $path = $map->tmpname;
570 $path = $map->path unless defined $path;
571
572 open my $fh, "<:raw", "$path.cfperl"
573 or return; # no perl data
574
575 my $data = Storable::thaw do { local $/; <$fh> };
576
577 $data->{version} <= 1
578 or return; # too new
579
580 $map->_set_obs ($data->{obs});
581};
582
583*cf::mapsupport::on_swapout = sub {
584 my ($map) = @_;
585
586 my $path = $map->tmpname;
587 $path = $map->path unless defined $path;
588
589 my $obs = $map->_get_obs;
590
591 if (defined $obs) {
592 open my $fh, ">:raw", "$path.cfperl"
593 or die "$path.cfperl: $!";
594
595 stat $path;
596
597 print $fh Storable::nfreeze {
598 size => (stat _)[7],
599 time => (stat _)[9],
600 version => 1,
601 obs => $obs,
602 };
603
604 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
605 } else {
606 unlink "$path.cfperl";
607 }
608};
609
610attach_to_maps prio => -10000, package => cf::mapsupport::; 732cf::map->attach (prio => -10000, package => cf::mapsupport::);
611 733
612############################################################################# 734#############################################################################
613# load/save perl data associated with player->ob objects 735# load/save perl data associated with player->ob objects
614 736
615sub all_objects(@) { 737sub all_objects(@) {
616 @_, map all_objects ($_->inv), @_ 738 @_, map all_objects ($_->inv), @_
617} 739}
618 740
619attach_to_players 741# TODO: compatibility cruft, remove when no longer needed
742cf::player->attach (
620 on_load => sub { 743 on_load => sub {
621 my ($pl, $path) = @_; 744 my ($pl, $path) = @_;
622 745
623 for my $o (all_objects $pl->ob) { 746 for my $o (all_objects $pl->ob) {
624 if (my $value = $o->get_ob_key_value ("_perl_data")) { 747 if (my $value = $o->get_ob_key_value ("_perl_data")) {
626 749
627 %$o = %{ Storable::thaw pack "H*", $value }; 750 %$o = %{ Storable::thaw pack "H*", $value };
628 } 751 }
629 } 752 }
630 }, 753 },
631 on_save => sub { 754);
632 my ($pl, $path) = @_;
633
634 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
635 for grep %$_, all_objects $pl->ob;
636 },
637;
638 755
639############################################################################# 756#############################################################################
640# core extensions - in perl 757
758=head2 CORE EXTENSIONS
759
760Functions and methods that extend core crossfire objects.
761
762=head3 cf::player
763
764=over 4
641 765
642=item cf::player::exists $login 766=item cf::player::exists $login
643 767
644Returns true when the given account exists. 768Returns true when the given account exists.
645 769
648sub cf::player::exists($) { 772sub cf::player::exists($) {
649 cf::player::find $_[0] 773 cf::player::find $_[0]
650 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 774 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
651} 775}
652 776
777=item $player->ext_reply ($msgid, $msgtype, %msg)
778
779Sends an ext reply to the player.
780
781=cut
782
783sub cf::player::ext_reply($$$%) {
784 my ($self, $id, %msg) = @_;
785
786 $msg{msgid} = $id;
787
788 $self->send ("ext " . to_json \%msg);
789}
790
791=back
792
793=head3 cf::object::player
794
795=over 4
796
653=item $player->reply ($npc, $msg[, $flags]) 797=item $player_object->reply ($npc, $msg[, $flags])
654 798
655Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 799Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
656can be C<undef>. Does the right thing when the player is currently in a 800can be C<undef>. Does the right thing when the player is currently in a
657dialogue with the given NPC character. 801dialogue with the given NPC character.
658 802
659=cut 803=cut
660 804
661# rough implementation of a future "reply" method that works 805# rough implementation of a future "reply" method that works
662# with dialog boxes. 806# with dialog boxes.
807#TODO: the first argument must go, split into a $npc->reply_to ( method
663sub cf::object::player::reply($$$;$) { 808sub cf::object::player::reply($$$;$) {
664 my ($self, $npc, $msg, $flags) = @_; 809 my ($self, $npc, $msg, $flags) = @_;
665 810
666 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 811 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
667 812
671 $msg = $npc->name . " says: $msg" if $npc; 816 $msg = $npc->name . " says: $msg" if $npc;
672 $self->message ($msg, $flags); 817 $self->message ($msg, $flags);
673 } 818 }
674} 819}
675 820
676=item $player->ext_reply ($msgid, $msgtype, %msg) 821=item $player_object->may ("access")
677 822
678Sends an ext reply to the player. 823Returns wether the given player is authorized to access resource "access"
824(e.g. "command_wizcast").
679 825
680=cut 826=cut
681 827
682sub cf::player::ext_reply($$$%) { 828sub cf::object::player::may {
829 my ($self, $access) = @_;
830
831 $self->flag (cf::FLAG_WIZ) ||
832 (ref $cf::CFG{"may_$access"}
833 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
834 : $cf::CFG{"may_$access"})
835}
836
837=head3 cf::client
838
839=over 4
840
841=item $client->send_drawinfo ($text, $flags)
842
843Sends a drawinfo packet to the client. Circumvents output buffering so
844should not be used under normal circumstances.
845
846=cut
847
848sub cf::client::send_drawinfo {
849 my ($self, $text, $flags) = @_;
850
851 utf8::encode $text;
852 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text);
853}
854
855
856=item $success = $client->query ($flags, "text", \&cb)
857
858Queues a query to the client, calling the given callback with
859the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
860C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
861
862Queries can fail, so check the return code. Or don't, as queries will become
863reliable at some point in the future.
864
865=cut
866
867sub cf::client::query {
868 my ($self, $flags, $text, $cb) = @_;
869
870 return unless $self->state == ST_PLAYING
871 || $self->state == ST_SETUP
872 || $self->state == ST_CUSTOM;
873
874 $self->state (ST_CUSTOM);
875
876 utf8::encode $text;
877 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
878
879 $self->send_packet ($self->{query_queue}[0][0])
880 if @{ $self->{query_queue} } == 1;
881}
882
883cf::client->attach (
884 on_reply => sub {
885 my ($ns, $msg) = @_;
886
887 # this weird shuffling is so that direct followup queries
888 # get handled first
889 my $queue = delete $ns->{query_queue};
890
891 (shift @$queue)->[1]->($msg);
892
893 push @{ $ns->{query_queue} }, @$queue;
894
895 if (@{ $ns->{query_queue} } == @$queue) {
896 if (@$queue) {
897 $ns->send_packet ($ns->{query_queue}[0][0]);
898 } else {
899 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
900 }
901 }
902 },
903);
904
905=item $client->coro (\&cb)
906
907Create a new coroutine, running the specified callback. The coroutine will
908be automatically cancelled when the client gets destroyed (e.g. on logout,
909or loss of connection).
910
911=cut
912
913sub cf::client::coro {
683 my ($self, $id, %msg) = @_; 914 my ($self, $cb) = @_;
684 915
685 $msg{msgid} = $id; 916 my $coro; $coro = async {
917 eval {
918 $cb->();
919 };
920 warn $@ if $@;
921 delete $self->{_coro}{$coro+0};
922 };
686 923
687 $self->send ("ext " . to_json \%msg); 924 $self->{_coro}{$coro+0} = $coro;
688} 925}
689 926
690############################################################################# 927cf::client->attach (
691# map scripting support 928 on_destroy => sub {
929 my ($ns) = @_;
930
931 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
932 },
933);
934
935=back
936
937
938=head2 SAFE SCRIPTING
939
940Functions that provide a safe environment to compile and execute
941snippets of perl code without them endangering the safety of the server
942itself. Looping constructs, I/O operators and other built-in functionality
943is not available in the safe scripting environment, and the number of
944functions and methods that can be called is greatly reduced.
945
946=cut
692 947
693our $safe = new Safe "safe"; 948our $safe = new Safe "safe";
694our $safe_hole = new Safe::Hole; 949our $safe_hole = new Safe::Hole;
695 950
696$SIG{FPE} = 'IGNORE'; 951$SIG{FPE} = 'IGNORE';
697 952
698$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 953$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
699 954
700# here we export the classes and methods available to script code 955# here we export the classes and methods available to script code
701 956
957=pod
958
959The following fucntions and emthods are available within a safe environment:
960
961 cf::object contr pay_amount pay_player map
962 cf::object::player player
963 cf::player peaceful
964 cf::map trigger
965
966=cut
967
702for ( 968for (
703 ["cf::object" => qw(contr pay_amount pay_player)], 969 ["cf::object" => qw(contr pay_amount pay_player map)],
704 ["cf::object::player" => qw(player)], 970 ["cf::object::player" => qw(player)],
705 ["cf::player" => qw(peaceful)], 971 ["cf::player" => qw(peaceful)],
972 ["cf::map" => qw(trigger)],
706) { 973) {
707 no strict 'refs'; 974 no strict 'refs';
708 my ($pkg, @funs) = @$_; 975 my ($pkg, @funs) = @$_;
709 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 976 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
710 for @funs; 977 for @funs;
711} 978}
979
980=over 4
981
982=item @retval = safe_eval $code, [var => value, ...]
983
984Compiled and executes the given perl code snippet. additional var/value
985pairs result in temporary local (my) scalar variables of the given name
986that are available in the code snippet. Example:
987
988 my $five = safe_eval '$first + $second', first => 1, second => 4;
989
990=cut
712 991
713sub safe_eval($;@) { 992sub safe_eval($;@) {
714 my ($code, %vars) = @_; 993 my ($code, %vars) = @_;
715 994
716 my $qcode = $code; 995 my $qcode = $code;
739 } 1018 }
740 1019
741 wantarray ? @res : $res[0] 1020 wantarray ? @res : $res[0]
742} 1021}
743 1022
1023=item cf::register_script_function $function => $cb
1024
1025Register a function that can be called from within map/npc scripts. The
1026function should be reasonably secure and should be put into a package name
1027like the extension.
1028
1029Example: register a function that gets called whenever a map script calls
1030C<rent::overview>, as used by the C<rent> extension.
1031
1032 cf::register_script_function "rent::overview" => sub {
1033 ...
1034 };
1035
1036=cut
1037
744sub register_script_function { 1038sub register_script_function {
745 my ($fun, $cb) = @_; 1039 my ($fun, $cb) = @_;
746 1040
747 no strict 'refs'; 1041 no strict 'refs';
748 *{"safe::$fun"} = $safe_hole->wrap ($cb); 1042 *{"safe::$fun"} = $safe_hole->wrap ($cb);
749} 1043}
750 1044
1045=back
1046
1047=cut
1048
1049#############################################################################
1050
1051=head2 EXTENSION DATABASE SUPPORT
1052
1053Crossfire maintains a very simple database for extension use. It can
1054currently store anything that can be serialised using Storable, which
1055excludes objects.
1056
1057The parameter C<$family> should best start with the name of the extension
1058using it, it should be unique.
1059
1060=over 4
1061
1062=item $hashref = cf::db_get $family
1063
1064Return a hashref for use by the extension C<$family>, which can be
1065modified. After modifications, you have to call C<cf::db_dirty> or
1066C<cf::db_sync>.
1067
1068=item $value = cf::db_get $family => $key
1069
1070Returns a single value from the database
1071
1072=item cf::db_put $family => $hashref
1073
1074Stores the given family hashref into the database. Updates are delayed, if
1075you want the data to be synced to disk immediately, use C<cf::db_sync>.
1076
1077=item cf::db_put $family => $key => $value
1078
1079Stores the given C<$value> in the family hash. Updates are delayed, if you
1080want the data to be synced to disk immediately, use C<cf::db_sync>.
1081
1082=item cf::db_dirty
1083
1084Marks the database as dirty, to be updated at a later time.
1085
1086=item cf::db_sync
1087
1088Immediately write the database to disk I<if it is dirty>.
1089
1090=cut
1091
1092our $DB;
1093
1094{
1095 my $path = cf::localdir . "/database.pst";
1096
1097 sub db_load() {
1098 warn "loading database $path\n";#d# remove later
1099 $DB = stat $path ? Storable::retrieve $path : { };
1100 }
1101
1102 my $pid;
1103
1104 sub db_save() {
1105 warn "saving database $path\n";#d# remove later
1106 waitpid $pid, 0 if $pid;
1107 if (0 == ($pid = fork)) {
1108 $DB->{_meta}{version} = 1;
1109 Storable::nstore $DB, "$path~";
1110 rename "$path~", $path;
1111 cf::_exit 0 if defined $pid;
1112 }
1113 }
1114
1115 my $dirty;
1116
1117 sub db_sync() {
1118 db_save if $dirty;
1119 undef $dirty;
1120 }
1121
1122 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
1123 db_sync;
1124 });
1125
1126 sub db_dirty() {
1127 $dirty = 1;
1128 $idle->start;
1129 }
1130
1131 sub db_get($;$) {
1132 @_ >= 2
1133 ? $DB->{$_[0]}{$_[1]}
1134 : ($DB->{$_[0]} ||= { })
1135 }
1136
1137 sub db_put($$;$) {
1138 if (@_ >= 3) {
1139 $DB->{$_[0]}{$_[1]} = $_[2];
1140 } else {
1141 $DB->{$_[0]} = $_[1];
1142 }
1143 db_dirty;
1144 }
1145
1146 cf::global->attach (
1147 prio => 10000,
1148 on_cleanup => sub {
1149 db_sync;
1150 },
1151 );
1152}
1153
751############################################################################# 1154#############################################################################
752# the server's main() 1155# the server's main()
753 1156
1157sub cfg_load {
1158 open my $fh, "<:utf8", cf::confdir . "/config"
1159 or return;
1160
1161 local $/;
1162 *CFG = YAML::Syck::Load <$fh>;
1163}
1164
754sub main { 1165sub main {
1166 cfg_load;
1167 db_load;
1168 load_extensions;
755 Event::loop; 1169 Event::loop;
756} 1170}
757 1171
758############################################################################# 1172#############################################################################
759# initialisation 1173# initialisation
760 1174
1175sub _perl_reload(&) {
1176 my ($msg) = @_;
1177
1178 $msg->("reloading...");
1179
1180 eval {
1181 # cancel all watchers
1182 for (Event::all_watchers) {
1183 $_->cancel if $_->data & WF_AUTOCANCEL;
1184 }
1185
1186 # unload all extensions
1187 for (@exts) {
1188 $msg->("unloading <$_>");
1189 unload_extension $_;
1190 }
1191
1192 # unload all modules loaded from $LIBDIR
1193 while (my ($k, $v) = each %INC) {
1194 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1195
1196 $msg->("removing <$k>");
1197 delete $INC{$k};
1198
1199 $k =~ s/\.pm$//;
1200 $k =~ s/\//::/g;
1201
1202 if (my $cb = $k->can ("unload_module")) {
1203 $cb->();
1204 }
1205
1206 Symbol::delete_package $k;
1207 }
1208
1209 # sync database to disk
1210 cf::db_sync;
1211
1212 # get rid of safe::, as good as possible
1213 Symbol::delete_package "safe::$_"
1214 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
1215
1216 # remove register_script_function callbacks
1217 # TODO
1218
1219 # unload cf.pm "a bit"
1220 delete $INC{"cf.pm"};
1221
1222 # don't, removes xs symbols, too,
1223 # and global variables created in xs
1224 #Symbol::delete_package __PACKAGE__;
1225
1226 # reload cf.pm
1227 $msg->("reloading cf.pm");
1228 require cf;
1229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1230
1231 # load config and database again
1232 cf::cfg_load;
1233 cf::db_load;
1234
1235 # load extensions
1236 $msg->("load extensions");
1237 cf::load_extensions;
1238
1239 # reattach attachments to objects
1240 $msg->("reattach");
1241 _global_reattach;
1242 };
1243 $msg->($@) if $@;
1244
1245 $msg->("reloaded");
1246};
1247
1248sub perl_reload() {
1249 _perl_reload {
1250 warn $_[0];
1251 print "$_[0]\n";
1252 };
1253}
1254
761register "<global>", __PACKAGE__; 1255register "<global>", __PACKAGE__;
762 1256
1257register_command "perl-reload" => sub {
1258 my ($who, $arg) = @_;
1259
1260 if ($who->flag (FLAG_WIZ)) {
1261 _perl_reload {
1262 warn $_[0];
1263 $who->message ($_[0]);
1264 };
1265 }
1266};
1267
763unshift @INC, $LIBDIR; 1268unshift @INC, $LIBDIR;
764 1269
765load_extensions;
766
767$TICK_WATCHER = Event->timer ( 1270$TICK_WATCHER = Event->timer (
768 prio => 1, 1271 prio => 0,
769 at => $NEXT_TICK || 1, 1272 at => $NEXT_TICK || 1,
1273 data => WF_AUTOCANCEL,
770 cb => sub { 1274 cb => sub {
771 cf::server_tick; # one server iteration 1275 cf::server_tick; # one server iteration
772 1276
773 my $NOW = Event::time; 1277 my $NOW = Event::time;
774 $NEXT_TICK += $TICK; 1278 $NEXT_TICK += $TICK;
775 1279
776 # if we are delayed by four ticks, skip them all 1280 # if we are delayed by four ticks or more, skip them all
777 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1281 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
778 1282
779 $TICK_WATCHER->at ($NEXT_TICK); 1283 $TICK_WATCHER->at ($NEXT_TICK);
780 $TICK_WATCHER->start; 1284 $TICK_WATCHER->start;
781 }, 1285 },
782); 1286);
783 1287
1288IO::AIO::max_poll_time $TICK * 0.2;
1289
1290Event->io (fd => IO::AIO::poll_fileno,
1291 poll => 'r',
1292 prio => 5,
1293 data => WF_AUTOCANCEL,
1294 cb => \&IO::AIO::poll_cb);
1295
7841 12961
785 1297

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines