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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines