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.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
83our %CFG; 87our %CFG;
84 88
85our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 90our $RUNTIME;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
94 102
95binmode STDOUT; 103binmode STDOUT;
96binmode STDERR; 104binmode STDERR;
97 105
98# read virtual server time, if available 106# read virtual server time, if available
139 147
140=item $cf::TICK 148=item $cf::TICK
141 149
142The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
143 151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
161
144=item %cf::CFG 162=item %cf::CFG
145 163
146Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 165from wherever your confdir points to.
148 166
149=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
150 168
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
154 178
155=back 179=back
156 180
157=cut 181=cut
158 182
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 204
180# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 206# within the Safe compartment.
182for my $pkg (qw( 207for my $pkg (qw(
183 cf::global cf::attachable 208 cf::global cf::attachable
191} 216}
192 217
193$Event::DIED = sub { 218$Event::DIED = sub {
194 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
195}; 220};
221
222#############################################################################
196 223
197=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
198 225
199=over 4 226=over 4
200 227
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 247 $d
221 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
222} 249}
223 250
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
227 252
228Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
229 254
230=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
231 256
232Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
233 265
234=item cf::lock_wait $string 266=item cf::lock_wait $string
235 267
236Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
237 269
240Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
241a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
242for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
243returned. 275returned.
244 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
245Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
247 282
248=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
249 284
250Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
251 286
252=cut 287=cut
253 288
254our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
255 291
256sub lock_wait($) { 292sub lock_wait($) {
257 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
258 299
259 # wait for lock, if any 300 # wait for lock, if any
260 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
261 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
262 Coro::schedule; 303 Coro::schedule;
268 309
269 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
270 lock_wait $key; 311 lock_wait $key;
271 312
272 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
273 315
274 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
275 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
276 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
277 } 320 }
278} 321}
279 322
291 }; 334 };
292 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
293 $guard 336 $guard
294} 337}
295 338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
393}
394
296=item cf::async { BLOCK } 395=item cf::async { BLOCK }
297 396
298Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 398C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 399thing you are allowed to do is call C<prio> on it.
303 402
304BEGIN { *async = \&Coro::async_pool } 403BEGIN { *async = \&Coro::async_pool }
305 404
306=item cf::sync_job { BLOCK } 405=item cf::sync_job { BLOCK }
307 406
308The design of crossfire+ requires that the main coro ($Coro::main) is 407The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 408is always able to handle events or runnable, as Crossfire TRT is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable.
311 411
312If it must be done, put the blocking parts into C<sync_job>. This will run 412If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 413the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 414server will be frozen during this time, so the block should either finish
315fast or be very important. 415fast or be very important.
318 418
319sub sync_job(&) { 419sub sync_job(&) {
320 my ($job) = @_; 420 my ($job) = @_;
321 421
322 if ($Coro::current == $Coro::main) { 422 if ($Coro::current == $Coro::main) {
423 my $time = Event::time;
424
323 # this is the main coro, too bad, we have to block 425 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 426 # till the operation succeeds, freezing the server :/
325 427
326 # TODO: use suspend/resume instead 428 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 429 # (but this is cancel-safe)
338 440
339 while ($busy) { 441 while ($busy) {
340 Coro::cede or Event::one_event; 442 Coro::cede or Event::one_event;
341 } 443 }
342 444
445 $time = Event::time - $time;
446
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load
451
343 wantarray ? @res : $res[0] 452 wantarray ? @res : $res[0]
344 } else { 453 } else {
345 # we are in another coroutine, how wonderful, everything just works 454 # we are in another coroutine, how wonderful, everything just works
346 455
347 $job->() 456 $job->()
366 $EXT_CORO{$coro+0} = $coro; 475 $EXT_CORO{$coro+0} = $coro;
367 476
368 $coro 477 $coro
369} 478}
370 479
371sub write_runtime { 480=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 481
374 my $runtime = "$LOCALDIR/runtime"; 482Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling.
375 486
376 warn "starting to write runtime...\n";#d# 487=cut
377 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
378 or return;
379 488
380 my $value = $cf::RUNTIME + 90 + 10; 489sub fork_call(&@) {
381 # 10 is the runtime save interval, for a monotonic clock 490 my ($cb, @args) = @_;
382 # 60 allows for the watchdog to kill the server.
383 491
384 (aio_write $fh, 0, (length $value), $value, 0) <= 0 492 # we seemingly have to make a local copy of the whole thing,
385 and return; 493 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious)
386 495
387 # always fsync - this file is important 496 my @res = Coro::Util::fork_eval {
388 aio_fsync $fh 497 reset_signals;
389 and return; 498 &$cb
499 }, @args;
390 500
391 close $fh 501 wantarray ? @res : $res[-1]
392 or return; 502}
393 503
394 aio_rename "$runtime~", $runtime 504=item $value = cf::db_get $family => $key
395 and return;
396 505
397 warn "... done writing runtime.\n";#d# 506Returns a single value from the environment database.
398 507
508=item cf::db_put $family => $key => $value
509
510Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512
513=cut
514
515our $DB;
516
517sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
399 1 531 }
532}
533
534sub db_get($$) {
535 my $key = "$_[0]/$_[1]";
536
537 cf::sync_job {
538 BDB::db_get $DB, undef, $key, my $data;
539
540 $! ? ()
541 : $data
542 }
543}
544
545sub db_put($$$) {
546 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
548}
549
550=item cf::cache $id => [$paths...], $processversion => $process
551
552Generic caching function that returns the value of the resource $id,
553caching and regenerating as required.
554
555This function can block.
556
557=cut
558
559sub cache {
560 my ($id, $src, $processversion, $process) = @_;
561
562 my $meta =
563 join "\x00",
564 $processversion,
565 map {
566 aio_stat $_
567 and Carp::croak "$_: $!";
568
569 ($_, (stat _)[7,9])
570 } @$src;
571
572 my $dbmeta = db_get cache => "$id/meta";
573 if ($dbmeta ne $meta) {
574 # changed, we may need to process
575
576 my @data;
577 my $md5;
578
579 for (0 .. $#$src) {
580 0 <= aio_load $src->[$_], $data[$_]
581 or Carp::croak "$src->[$_]: $!";
582 }
583
584 # if processing is expensive, check
585 # checksum first
586 if (1) {
587 $md5 =
588 join "\x00",
589 $processversion,
590 map {
591 cf::cede_to_tick;
592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
593 } 0.. $#$src;
594
595
596 my $dbmd5 = db_get cache => "$id/md5";
597 if ($dbmd5 eq $md5) {
598 db_put cache => "$id/meta", $meta;
599
600 return db_get cache => "$id/data";
601 }
602 }
603
604 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time;
607
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
609
610 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta;
613
614 return $data;
615 }
616
617 db_get cache => "$id/data"
400} 618}
401 619
402=item cf::datalog type => key => value, ... 620=item cf::datalog type => key => value, ...
403 621
404Log a datalog packet of the given type with the given key-value pairs. 622Log a datalog packet of the given type with the given key-value pairs.
422attach callbacks/event handlers (a collection of which is called an "attachment") 640attach callbacks/event handlers (a collection of which is called an "attachment")
423to it. All such attachable objects support the following methods. 641to it. All such attachable objects support the following methods.
424 642
425In the following description, CLASS can be any of C<global>, C<object> 643In the following description, CLASS can be any of C<global>, C<object>
426C<player>, C<client> or C<map> (i.e. the attachable objects in 644C<player>, C<client> or C<map> (i.e. the attachable objects in
427crossfire+). 645Crossfire TRT).
428 646
429=over 4 647=over 4
430 648
431=item $attachable->attach ($attachment, key => $value...) 649=item $attachable->attach ($attachment, key => $value...)
432 650
595 $registry = $CB_TYPE[$object_type] ||= []; 813 $registry = $CB_TYPE[$object_type] ||= [];
596 814
597 } elsif ($type eq "subtype") { 815 } elsif ($type eq "subtype") {
598 defined $object_type or Carp::croak "subtype specified without type"; 816 defined $object_type or Carp::croak "subtype specified without type";
599 my $object_subtype = shift @arg; 817 my $object_subtype = shift @arg;
600 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 818 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
601 819
602 } elsif ($type eq "package") { 820 } elsif ($type eq "package") {
603 my $pkg = shift @arg; 821 my $pkg = shift @arg;
604 822
605 while (my ($name, $id) = each %cb_id) { 823 while (my ($name, $id) = each %cb_id) {
634 _attach $registry, $klass, @attach; 852 _attach $registry, $klass, @attach;
635 } 853 }
636 854
637 $obj->{$name} = \%arg; 855 $obj->{$name} = \%arg;
638 } else { 856 } else {
639 warn "object uses attachment '$name' that is not available, postponing.\n"; 857 warn "object uses attachment '$name' which is not available, postponing.\n";
640 } 858 }
641 859
642 $obj->{_attachment}{$name} = undef; 860 $obj->{_attachment}{$name} = undef;
643} 861}
644 862
646 if (ref $_[0]) { 864 if (ref $_[0]) {
647 _object_attach @_; 865 _object_attach @_;
648 } else { 866 } else {
649 _attach shift->_attach_registry, @_; 867 _attach shift->_attach_registry, @_;
650 } 868 }
869 _recalc_want;
651}; 870};
652 871
653# all those should be optimised 872# all those should be optimised
654sub cf::attachable::detach { 873sub cf::attachable::detach {
655 my ($obj, $name) = @_; 874 my ($obj, $name) = @_;
658 delete $obj->{_attachment}{$name}; 877 delete $obj->{_attachment}{$name};
659 reattach ($obj); 878 reattach ($obj);
660 } else { 879 } else {
661 Carp::croak "cannot, currently, detach class attachments"; 880 Carp::croak "cannot, currently, detach class attachments";
662 } 881 }
882 _recalc_want;
663}; 883};
664 884
665sub cf::attachable::attached { 885sub cf::attachable::attached {
666 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
667 887
682 "; 902 ";
683 die if $@; 903 die if $@;
684} 904}
685 905
686our $override; 906our $override;
687our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
688 908
689sub override { 909sub override {
690 $override = 1; 910 $override = 1;
691 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
692} 912}
693 913
694sub do_invoke { 914sub do_invoke {
695 my $event = shift; 915 my $event = shift;
696 my $callbacks = shift; 916 my $callbacks = shift;
697 917
698 @invoke_results = (); 918 @INVOKE_RESULTS = ();
699 919
700 local $override; 920 local $override;
701 921
702 for (@$callbacks) { 922 for (@$callbacks) {
703 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
720 940
721Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
722 942
723This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
724removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
725results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
726 946
727=back 947=back
728 948
729=cut 949=cut
730 950
731############################################################################# 951#############################################################################
732# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
733 964
734sub reattach { 965sub reattach {
735 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
736 my ($obj) = @_; 967 my ($obj) = @_;
737 968
781 }, 1012 },
782); 1013);
783 1014
784sub object_freezer_save { 1015sub object_freezer_save {
785 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
786 1019
787 sync_job { 1020 sync_job {
788 if (length $$rdata) { 1021 if (length $$rdata) {
789 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
790 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
814 } 1047 }
815 } else { 1048 } else {
816 aio_unlink $filename; 1049 aio_unlink $filename;
817 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
818 } 1051 }
819 } 1052 };
1053
1054 undef $guard;
820} 1055}
821 1056
822sub object_freezer_as_string { 1057sub object_freezer_as_string {
823 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
824 1059
829 1064
830sub object_thawer_load { 1065sub object_thawer_load {
831 my ($filename) = @_; 1066 my ($filename) = @_;
832 1067
833 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
834 1071
835 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
836 or return; 1073 or return;
837 1074
838 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
839 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
840 or return; 1077 or return;
1078
1079 undef $guard;
841 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
842 } 1081 }
843 1082
844 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
845 $filename, length $data, scalar @{$av || []};#d# 1084 $filename, length $data, scalar @{$av || []};
1085
846 return ($data, $av); 1086 ($data, $av)
847} 1087}
1088
1089=head2 COMMAND CALLBACKS
1090
1091=over 4
1092
1093=cut
848 1094
849############################################################################# 1095#############################################################################
850# command handling &c 1096# command handling &c
851 1097
852=item cf::register_command $name => \&callback($ob,$args); 1098=item cf::register_command $name => \&callback($ob,$args);
865 push @{ $COMMAND{$name} }, [$caller, $cb]; 1111 push @{ $COMMAND{$name} }, [$caller, $cb];
866} 1112}
867 1113
868=item cf::register_extcmd $name => \&callback($pl,$packet); 1114=item cf::register_extcmd $name => \&callback($pl,$packet);
869 1115
870Register a callbackf ro execution when the client sends an extcmd packet. 1116Register a callback for execution when the client sends an (synchronous)
1117extcmd packet. Ext commands will be processed in the order they are
1118received by the server, like other user commands. The first argument is
1119the logged-in player. Ext commands can only be processed after a player
1120has logged in successfully.
871 1121
872If the callback returns something, it is sent back as if reply was being 1122If the callback returns something, it is sent back as if reply was being
873called. 1123called.
874 1124
1125=item cf::register_exticmd $name => \&callback($ns,$packet);
1126
1127Register a callback for execution when the client sends an (asynchronous)
1128exticmd packet. Exti commands are processed by the server as soon as they
1129are received, i.e. out of order w.r.t. other commands. The first argument
1130is a client socket. Exti commands can be received anytime, even before
1131log-in.
1132
1133If the callback returns something, it is sent back as if reply was being
1134called.
1135
875=cut 1136=cut
876 1137
877sub register_extcmd { 1138sub register_extcmd {
878 my ($name, $cb) = @_; 1139 my ($name, $cb) = @_;
879 1140
880 $EXTCMD{$name} = $cb; 1141 $EXTCMD{$name} = $cb;
1142}
1143
1144sub register_exticmd {
1145 my ($name, $cb) = @_;
1146
1147 $EXTICMD{$name} = $cb;
881} 1148}
882 1149
883cf::player->attach ( 1150cf::player->attach (
884 on_command => sub { 1151 on_command => sub {
885 my ($pl, $name, $params) = @_; 1152 my ($pl, $name, $params) = @_;
894 cf::override; 1161 cf::override;
895 }, 1162 },
896 on_extcmd => sub { 1163 on_extcmd => sub {
897 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
898 1165
899 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
900 1167
901 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
902 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
903 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
904 $pl->ext_reply ($msg->{msgid}, %reply);
905 }
906 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
907 } else { 1183 } else {
908 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
909 } 1185 }
910 1186
911 cf::override; 1187 cf::override;
912 }, 1188 },
913); 1189);
914 1190
915sub load_extension {
916 my ($path) = @_;
917
918 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
919 my $base = $1;
920 my $pkg = $1;
921 $pkg =~ s/[^[:word:]]/_/g;
922 $pkg = "ext::$pkg";
923
924 warn "... loading '$path' into '$pkg'\n";
925
926 open my $fh, "<:utf8", $path
927 or die "$path: $!";
928
929 my $source =
930 "package $pkg; use strict; use utf8;\n"
931 . "#line 1 \"$path\"\n{\n"
932 . (do { local $/; <$fh> })
933 . "\n};\n1";
934
935 unless (eval $source) {
936 my $msg = $@ ? "$path: $@\n"
937 : "extension disabled.\n";
938 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
939 warn $@;
940 warn "mandatory extension failed to load, exiting.\n";
941 exit 1;
942 }
943 die $@;
944 }
945
946 push @EXTS, $pkg;
947}
948
949sub load_extensions { 1191sub load_extensions {
1192 cf::sync_job {
1193 my %todo;
1194
950 for my $ext (<$LIBDIR/*.ext>) { 1195 for my $path (<$LIBDIR/*.ext>) {
951 next unless -r $ext; 1196 next unless -r $path;
952 eval { 1197
953 load_extension $ext; 1198 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1199 my $base = $1;
1200 my $pkg = $1;
1201 $pkg =~ s/[^[:word:]]/_/g;
1202 $pkg = "ext::$pkg";
1203
1204 open my $fh, "<:utf8", $path
1205 or die "$path: $!";
1206
1207 my $source = do { local $/; <$fh> };
1208
1209 my %ext = (
1210 path => $path,
1211 base => $base,
1212 pkg => $pkg,
1213 );
1214
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217
1218 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n"
1221 . $source
1222 . "\n};\n1";
1223
1224 $todo{$base} = \%ext;
1225 }
1226
1227 my %done;
1228 while (%todo) {
1229 my $progress;
1230
1231 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip
1234 unless exists $done{$_};
1235 }
1236
1237 warn "... loading '$k' into '$v->{pkg}'\n";
1238
1239 unless (eval $v->{source}) {
1240 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n";
1242
1243 if (exists $v->{meta}{mandatory}) {
1244 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n";
1246 exit 1;
1247 }
1248
1249 warn $msg;
1250 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
954 1 1255 }
955 } or warn "$ext not loaded: $@"; 1256
1257 skip:
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1259 unless $progress;
1260 }
956 } 1261 };
957} 1262}
958 1263
959############################################################################# 1264#############################################################################
960 1265
1266=back
1267
961=head2 CORE EXTENSIONS 1268=head2 CORE EXTENSIONS
962 1269
963Functions and methods that extend core crossfire objects. 1270Functions and methods that extend core crossfire objects.
964 1271
965=cut 1272=cut
969use Coro::AIO; 1276use Coro::AIO;
970 1277
971=head3 cf::player 1278=head3 cf::player
972 1279
973=over 4 1280=over 4
1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
974 1295
975=item cf::player::find $login 1296=item cf::player::find $login
976 1297
977Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
978 1299
1014 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1015 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1016 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1017 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1018 1339
1019 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1020 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1021 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1022 } 1349 }
1023 } 1350 }
1024} 1351}
1025 1352
1035 1362
1036 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1037 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1038 1365
1039 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1040 Coro::cede; 1367 cf::cede_to_tick;
1041} 1368}
1042 1369
1043sub new($) { 1370sub new($) {
1044 my ($login) = @_; 1371 my ($login) = @_;
1045 1372
1049 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1050 1377
1051 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1052 1379
1053 $self 1380 $self
1381}
1382
1383=item $player->send_msg ($channel, $msg, $color, [extra...])
1384
1385=cut
1386
1387sub send_msg {
1388 my $ns = shift->ns
1389 or return;
1390 $ns->send_msg (@_);
1054} 1391}
1055 1392
1056=item $pl->quit_character 1393=item $pl->quit_character
1057 1394
1058Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
1113 or return []; 1450 or return [];
1114 1451
1115 my @logins; 1452 my @logins;
1116 1453
1117 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1118 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1119 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1120 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1121 1463
1122 utf8::decode $login; 1464 utf8::decode $login;
1123 push @logins, $login; 1465 push @logins, $login;
1124 } 1466 }
1125 1467
1152 } 1494 }
1153 1495
1154 \@paths 1496 \@paths
1155} 1497}
1156 1498
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1500
1501Expand crossfire pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549
1157=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1158 1551
1159Sends an ext reply to the player. 1552Sends an ext reply to the player.
1160 1553
1161=cut 1554=cut
1162 1555
1163sub ext_reply($$%) { 1556sub ext_reply($$@) {
1164 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1165 1558
1166 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1167
1168 $self->send ("ext " . cf::to_json \%msg);
1169} 1560}
1170 1561
1171=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1172 1563
1173Sends an ext event to the client. 1564Sends an ext event to the client.
1174 1565
1175=cut 1566=cut
1176 1567
1177sub ext_event($$%) { 1568sub ext_msg($$@) {
1178 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1179 1570
1180 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1181} 1572}
1182 1573
1183=head3 cf::region 1574=head3 cf::region
1184 1575
1185=over 4 1576=over 4
1188 1579
1189package cf::region; 1580package cf::region;
1190 1581
1191=item cf::region::find_by_path $path 1582=item cf::region::find_by_path $path
1192 1583
1193Tries to decuce the probable region for a map knowing only its path. 1584Tries to decuce the likely region for a map knowing only its path.
1194 1585
1195=cut 1586=cut
1196 1587
1197sub find_by_path($) { 1588sub find_by_path($) {
1198 my ($path) = @_; 1589 my ($path) = @_;
1199 1590
1200 my ($match, $specificity); 1591 my ($match, $specificity);
1201 1592
1202 for my $region (list) { 1593 for my $region (list) {
1203 if ($region->match && $path =~ $region->match) { 1594 if ($region->{match} && $path =~ $region->{match}) {
1204 ($match, $specificity) = ($region, $region->specificity) 1595 ($match, $specificity) = ($region, $region->specificity)
1205 if $region->specificity > $specificity; 1596 if $region->specificity > $specificity;
1206 } 1597 }
1207 } 1598 }
1208 1599
1272 my ($self, $merge) = @_; 1663 my ($self, $merge) = @_;
1273 1664
1274 # we have to keep some variables in memory intact 1665 # we have to keep some variables in memory intact
1275 local $self->{path}; 1666 local $self->{path};
1276 local $self->{load_path}; 1667 local $self->{load_path};
1277 local $self->{deny_save};
1278 local $self->{deny_reset};
1279 1668
1280 $self->SUPER::thawer_merge ($merge); 1669 $self->SUPER::thawer_merge ($merge);
1281} 1670}
1282 1671
1283sub normalise { 1672sub normalise {
1330 $self->init; # pass $1 etc. 1719 $self->init; # pass $1 etc.
1331 return $self; 1720 return $self;
1332 } 1721 }
1333 } 1722 }
1334 1723
1335 Carp::carp "unable to resolve path '$path' (base '$base')."; 1724 Carp::cluck "unable to resolve path '$path' (base '$base').";
1336 () 1725 ()
1337} 1726}
1338 1727
1339sub init { 1728sub init {
1340 my ($self) = @_; 1729 my ($self) = @_;
1383 1772
1384 $_->change_map_light ($change) 1773 $_->change_map_light ($change)
1385 for grep $_->outdoor, values %cf::MAP; 1774 for grep $_->outdoor, values %cf::MAP;
1386} 1775}
1387 1776
1777sub decay_objects {
1778 my ($self) = @_;
1779
1780 return if $self->{deny_reset};
1781
1782 $self->do_decay_objects;
1783}
1784
1388sub unlink_save { 1785sub unlink_save {
1389 my ($self) = @_; 1786 my ($self) = @_;
1390 1787
1391 utf8::encode (my $save = $self->save_path); 1788 utf8::encode (my $save = $self->save_path);
1392 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1789 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1395 1792
1396sub load_header_from($) { 1793sub load_header_from($) {
1397 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1398 1795
1399 utf8::encode $path; 1796 utf8::encode $path;
1400 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1401 # or return;
1402
1403 $self->_load_header ($path)
1404 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1405 1805
1406 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1407 1807
1408 1 1808 1
1409} 1809}
1448 $self->load_header_orig 1848 $self->load_header_orig
1449 or return; 1849 or return;
1450 $self->prepare_orig; 1850 $self->prepare_orig;
1451 } 1851 }
1452 1852
1853 $self->{deny_reset} = 1
1854 if $self->no_reset;
1855
1453 $self->default_region (cf::region::find_by_path $self->{path}) 1856 $self->default_region (cf::region::find_by_path $self->{path})
1454 unless $self->default_region; 1857 unless $self->default_region;
1455 1858
1456 1 1859 1
1457} 1860}
1460sub find { 1863sub find {
1461 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1462 1865
1463 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1464 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1465 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1466 1870
1467 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1468 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1469 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1470 or return; 1876 or return;
1471 1877
1472 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1473 1879
1474 $map->load_header 1880 $map->load_header
1475 or return; 1881 or return;
1476 1882
1477 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1478 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1479 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1480 $map->reset; 1888 $map->reset;
1481 undef $guard;
1482 return find $path; 1889 return find $path;
1483 } 1890 }
1484 1891
1485 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1486 } 1893 }
1495 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1496 1903
1497 my $path = $self->{path}; 1904 my $path = $self->{path};
1498 1905
1499 { 1906 {
1500 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1501 1908
1909 return unless $self->valid;
1502 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1503 1911
1504 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1505 1913
1506 $self->alloc; 1914 $self->alloc;
1507 1915
1508 $self->pre_load; 1916 $self->pre_load;
1509 Coro::cede; 1917 cf::cede_to_tick;
1510 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1511 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1512 or return; 1922 or return;
1513 1923
1514 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1515 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1516 1926
1517 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1518 utf8::encode $uniq; 1928 utf8::encode $uniq;
1519 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1520 $self->clear_unique_items; 1931 $self->clear_unique_items;
1521 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1522 } 1935 }
1523 } 1936 }
1524 1937
1525 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1526 # now do the right thing for maps 1941 # now do the right thing for maps
1527 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1528 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1529 unless $self->difficulty; 1944 unless $self->difficulty;
1530 Coro::cede; 1945 cf::cede_to_tick;
1531 1946
1532 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1533 $self->decay_objects; 1948 $self->decay_objects;
1534 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1535 $self->update_buttons; 1950 $self->update_buttons;
1536 Coro::cede; 1951 cf::cede_to_tick;
1537 $self->set_darkness_map; 1952 $self->set_darkness_map;
1538 Coro::cede; 1953 cf::cede_to_tick;
1539 $self->activate; 1954 $self->activate;
1540 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1541 1959
1542 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1543 } 1961 }
1544 1962
1545 $self->post_load; 1963 $self->post_load;
1549 my ($self, $ob) = @_; 1967 my ($self, $ob) = @_;
1550 1968
1551 return find "~" . $ob->name . "/" . $self->{path} 1969 return find "~" . $ob->name . "/" . $self->{path}
1552 if $self->per_player; 1970 if $self->per_player;
1553 1971
1972# return find "?party/" . $ob->name . "/" . $self->{path}
1973# if $self->per_party;
1974
1554 $self 1975 $self
1555} 1976}
1556 1977
1557# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1558sub load_diag { 1979sub load_neighbours {
1559 my ($map) = @_; 1980 my ($map) = @_;
1560 1981
1561 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1562 1983
1563 for (0 .. 3) { 1984 for (0 .. 3) {
1564 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1565 or next; 1986 or next;
1566 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1567 or next; 1988 or next;
1568 $neigh->load; 1989 $neigh->load;
1569 1990
1991 push @neigh,
1570 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1571 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1572 } 1994 }
1573 1995
1574 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1575 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1576 or next; 1999 or next;
1577 $neigh->load; 2000 $neigh->load;
1578 } 2001 }
1579} 2002}
1580 2003
1585} 2008}
1586 2009
1587sub do_load_sync { 2010sub do_load_sync {
1588 my ($map) = @_; 2011 my ($map) = @_;
1589 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1590 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1591} 2017}
1592 2018
1593our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1594our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1595 2021
1596sub find_async { 2022sub find_async {
1597 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1598 2024
1599 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1600 2026
1601 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1602 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1603 } 2029 }
1604 2030
1605 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1606 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1607 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1608 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1609 my $map = find $path 2036 if (my $map = find $k) {
1610 or next;
1611 $map->load; 2037 $map->load if $v;
2038 }
1612 2039
1613 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1614 } 2041 }
1615 } 2042 }
1616 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1617 }; 2044 };
1618 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
1621} 2048}
1622 2049
1623sub save { 2050sub save {
1624 my ($self) = @_; 2051 my ($self) = @_;
1625 2052
1626 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1627 2054
1628 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1629 2056
1630 return unless $self->dirty; 2057 return unless $self->dirty;
1631 2058
1654 my ($self) = @_; 2081 my ($self) = @_;
1655 2082
1656 # save first because save cedes 2083 # save first because save cedes
1657 $self->save; 2084 $self->save;
1658 2085
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2087
1661 return if $self->players; 2088 return if $self->players;
1662 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1663 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1664 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1665 $self->clear; 2096 $self->clear;
1666 $self->in_memory (cf::MAP_SWAPPED);
1667} 2097}
1668 2098
1669sub reset_at { 2099sub reset_at {
1670 my ($self) = @_; 2100 my ($self) = @_;
1671 2101
1672 # TODO: safety, remove and allow resettable per-player maps 2102 # TODO: safety, remove and allow resettable per-player maps
1673 return 1e99 if $self->isa ("ext::map_per_player");#d#
1674 return 1e99 if $self->{deny_reset}; 2103 return 1e99 if $self->{deny_reset};
1675 2104
1676 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2105 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1677 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2106 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1678 2107
1689 my ($self) = @_; 2118 my ($self) = @_;
1690 2119
1691 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2120 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2121
1693 return if $self->players; 2122 return if $self->players;
1694 return if $self->isa ("ext::map_per_player");#d#
1695 2123
1696 warn "resetting map ", $self->path;#d# 2124 warn "resetting map ", $self->path;
1697 2125
1698 $self->in_memory (cf::MAP_SWAPPED); 2126 $self->in_memory (cf::MAP_SWAPPED);
1699 2127
1700 # need to save uniques path 2128 # need to save uniques path
1701 unless ($self->{deny_save}) { 2129 unless ($self->{deny_save}) {
1705 if $uniq; 2133 if $uniq;
1706 } 2134 }
1707 2135
1708 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
1709 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
1710 $self->clear; 2140 $self->clear;
1711
1712 $_->clear_links_to ($self) for values %cf::MAP;
1713 2141
1714 $self->unlink_save; 2142 $self->unlink_save;
1715 $self->destroy; 2143 $self->destroy;
1716} 2144}
1717 2145
1718my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
1719 2147
1720sub nuke { 2148sub nuke {
1721 my ($self) = @_; 2149 my ($self) = @_;
1722 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
1723 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
1724 2155
1725 $self->unlink_save; 2156 $self->unlink_save;
1726 2157
1727 bless $self, "cf::map"; 2158 bless $self, "cf::map";
1728 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
1729 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
1730 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
1731 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1732 2163
1733 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
1734 2166
1735 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2168}
2169
2170=item $maps = cf::map::tmp_maps
2171
2172Returns an arrayref with all map paths of currently instantiated and saved
2173maps. May block.
2174
2175=cut
2176
2177sub tmp_maps() {
2178 [
2179 map {
2180 utf8::decode $_;
2181 /\.map$/
2182 ? normalise $_
2183 : ()
2184 } @{ aio_readdir $TMPDIR or [] }
2185 ]
2186}
2187
2188=item $maps = cf::map::random_maps
2189
2190Returns an arrayref with all map paths of currently instantiated and saved
2191random maps. May block.
2192
2193=cut
2194
2195sub random_maps() {
2196 [
2197 map {
2198 utf8::decode $_;
2199 /\.map$/
2200 ? normalise "?random/$_"
2201 : ()
2202 } @{ aio_readdir $RANDOMDIR or [] }
2203 ]
1736} 2204}
1737 2205
1738=item cf::map::unique_maps 2206=item cf::map::unique_maps
1739 2207
1740Returns an arrayref of paths of all shared maps that have 2208Returns an arrayref of paths of all shared maps that have
1741instantiated unique items. May block. 2209instantiated unique items. May block.
1742 2210
1743=cut 2211=cut
1744 2212
1745sub unique_maps() { 2213sub unique_maps() {
1746 my $files = aio_readdir $UNIQUEDIR 2214 [
1747 or return; 2215 map {
1748
1749 my @paths;
1750
1751 for (@$files) {
1752 utf8::decode $_; 2216 utf8::decode $_;
1753 next if /\.pst$/; 2217 /\.map$/
1754 next unless /^$PATH_SEP/o; 2218 ? normalise $_
1755 2219 : ()
1756 push @paths, cf::map::normalise $_; 2220 } @{ aio_readdir $UNIQUEDIR or [] }
1757 } 2221 ]
1758
1759 \@paths
1760} 2222}
1761 2223
1762package cf; 2224package cf;
1763 2225
1764=back 2226=back
1782 map { $_, inv_recursive_ $_->inv } @_ 2244 map { $_, inv_recursive_ $_->inv } @_
1783} 2245}
1784 2246
1785sub inv_recursive { 2247sub inv_recursive {
1786 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2249}
2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
1787} 2280}
1788 2281
1789package cf; 2282package cf;
1790 2283
1791=back 2284=back
1810 2303
1811 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2304 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1812 2305
1813 if ($self->{record_replies}) { 2306 if ($self->{record_replies}) {
1814 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2307 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2308
1815 } else { 2309 } else {
2310 my $pl = $self->contr;
2311
2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2313 my $dialog = $pl->{npc_dialog};
2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2315
2316 } else {
1816 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
1817 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2319 }
1818 } 2320 }
2321}
2322
2323=item $object->send_msg ($channel, $msg, $color, [extra...])
2324
2325=cut
2326
2327sub cf::object::send_msg {
2328 my $pl = shift->contr
2329 or return;
2330 $pl->send_msg (@_);
1819} 2331}
1820 2332
1821=item $player_object->may ("access") 2333=item $player_object->may ("access")
1822 2334
1823Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
1870 $self->deactivate_recursive; 2382 $self->deactivate_recursive;
1871 2383
1872 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2384 return if UNIVERSAL::isa $self->map, "ext::map_link";
1873 2385
1874 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2386 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1875 if $self->map; 2387 if $self->map && $self->map->{path} ne "{link}";
1876 2388
1877 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2389 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1878} 2390}
1879 2391
1880sub cf::object::player::leave_link { 2392sub cf::object::player::leave_link {
1881 my ($self, $map, $x, $y) = @_; 2393 my ($self, $map, $x, $y) = @_;
2394
2395 return unless $self->contr->active;
1882 2396
1883 my $link_pos = delete $self->{_link_pos}; 2397 my $link_pos = delete $self->{_link_pos};
1884 2398
1885 unless ($map) { 2399 unless ($map) {
1886 # restore original map position 2400 # restore original map position
1900 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
1901 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
1902 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
1903 2417
1904 $map->load; 2418 $map->load;
1905 $map->load_diag; 2419 $map->load_neighbours;
1906 2420
1907 return unless $self->contr->active; 2421 return unless $self->contr->active;
1908 $self->activate_recursive; 2422 $self->activate_recursive;
1909 2423
1910 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1911 $self->enter_map ($map, $x, $y); 2425 $self->enter_map ($map, $x, $y);
1912} 2426}
1913 2427
1914cf::player->attach ( 2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1915 on_logout => sub {
1916 my ($pl) = @_;
1917 2429
1918 # abort map switching before logout 2430Moves the player to the given map-path and coordinates by first freezing
1919 if ($pl->ob->{_link_pos}) { 2431her, loading and preparing them map, calling the provided $check callback
1920 cf::sync_job { 2432that has to return the map if sucecssful, and then unfreezes the player on
1921 $pl->ob->leave_link 2433the new (success) or old (failed) map position. In either case, $done will
1922 }; 2434be called at the end of this process.
1923 }
1924 },
1925 on_login => sub {
1926 my ($pl) = @_;
1927 2435
1928 # try to abort aborted map switching on player login :)
1929 # should happen only on crashes
1930 if ($pl->ob->{_link_pos}) {
1931 $pl->ob->enter_link;
1932 (async {
1933 $pl->ob->reply (undef,
1934 "There was an internal problem at your last logout, "
1935 . "the server will try to bring you to your intended destination in a second.",
1936 cf::NDI_RED);
1937 # we need this sleep as the login has a concurrent enter_exit running
1938 # and this sleep increases chances of the player not ending up in scorn
1939 Coro::Timer::sleep 1;
1940 $pl->ob->leave_link;
1941 })->prio (2);
1942 }
1943 },
1944);
1945
1946=item $player_object->goto ($path, $x, $y)
1947
1948=cut 2436=cut
2437
2438our $GOTOGEN;
1949 2439
1950sub cf::object::player::goto { 2440sub cf::object::player::goto {
1951 my ($self, $path, $x, $y) = @_; 2441 my ($self, $path, $x, $y, $check, $done) = @_;
2442
2443 # do generation counting so two concurrent goto's will be executed in-order
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1952 2445
1953 $self->enter_link; 2446 $self->enter_link;
1954 2447
1955 (async { 2448 (async {
1956 my $map = eval { 2449 my $map = eval {
1957 my $map = cf::map::find $path; 2450 my $map = cf::map::find $path;
2451
2452 if ($map) {
1958 $map = $map->customise_for ($self) if $map; 2453 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map;
2455 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2457 }
2458
1959 $map 2459 $map
2460 };
2461
2462 if ($@) {
2463 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2464 LOG llevError | logBacktrace, Carp::longmess $@;
1960 } or 2465 }
1961 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1962 2466
2467 if ($gen == $self->{_goto_generation}) {
2468 delete $self->{_goto_generation};
1963 $self->leave_link ($map, $x, $y); 2469 $self->leave_link ($map, $x, $y);
2470 }
2471
2472 $done->() if $done;
1964 })->prio (1); 2473 })->prio (1);
1965} 2474}
1966 2475
1967=item $player_object->enter_exit ($exit_object) 2476=item $player_object->enter_exit ($exit_object)
1968 2477
2037 my $hp = $exit->stats->hp; 2546 my $hp = $exit->stats->hp;
2038 my $sp = $exit->stats->sp; 2547 my $sp = $exit->stats->sp;
2039 2548
2040 $self->enter_link; 2549 $self->enter_link;
2041 2550
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2554
2042 (async { 2555 (async {
2043 $self->deactivate_recursive; # just to be sure 2556 $self->deactivate_recursive; # just to be sure
2044 unless (eval { 2557 unless (eval {
2045 $self->goto ($slaying, $hp, $sp); 2558 $self->goto ($slaying, $hp, $sp);
2046 2559
2073 2586
2074 utf8::encode $text; 2587 utf8::encode $text;
2075 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2588 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2076} 2589}
2077 2590
2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2592
2593Send a drawinfo or msg packet to the client, formatting the msg for the
2594client if neccessary. C<$type> should be a string identifying the type of
2595the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet.
2597
2598=cut
2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2615sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_;
2617
2618 $msg = $self->pl->expand_cfpod ($msg);
2619
2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2624
2625 if (ref $channel) {
2626 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2631 }
2632
2633 $channel = $channel->{id};
2634 }
2635
2636 return unless @extra || length $msg;
2637
2638 if ($self->can_msg) {
2639 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF;
2642
2643 $self->send_packet ("msg " . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2645 } else {
2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656
2657 $color &= cf::NDI_COLOR_MASK;
2658
2659 utf8::encode $msg;
2660
2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2664 } else {
2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2666 $self->send_packet ("drawinfo $color $msg")
2667 }
2668 }
2669 }
2670}
2671
2078=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2079 2673
2080Sends an exti event to the client. 2674Sends an ext event to the client.
2081 2675
2082=cut 2676=cut
2083 2677
2084sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2085 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2086 2680
2681 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2087 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2088 $self->send_packet ("ext " . cf::to_json \%msg); 2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2089} 2705}
2090 2706
2091=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2092 2708
2093Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
2094the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2710the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2095C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2711C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2096 2712
2097Queries can fail, so check the return code. Or don't, as queries will become 2713Queries can fail, so check the return code. Or don't, as queries will
2098reliable at some point in the future. 2714become reliable at some point in the future.
2099 2715
2100=cut 2716=cut
2101 2717
2102sub cf::client::query { 2718sub cf::client::query {
2103 my ($self, $flags, $text, $cb) = @_; 2719 my ($self, $flags, $text, $cb) = @_;
2111 utf8::encode $text; 2727 utf8::encode $text;
2112 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2728 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2113 2729
2114 $self->send_packet ($self->{query_queue}[0][0]) 2730 $self->send_packet ($self->{query_queue}[0][0])
2115 if @{ $self->{query_queue} } == 1; 2731 if @{ $self->{query_queue} } == 1;
2732
2733 1
2116} 2734}
2117 2735
2118cf::client->attach ( 2736cf::client->attach (
2737 on_connect => sub {
2738 my ($ns) = @_;
2739
2740 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2741 },
2119 on_reply => sub { 2742 on_reply => sub {
2120 my ($ns, $msg) = @_; 2743 my ($ns, $msg) = @_;
2121 2744
2122 # this weird shuffling is so that direct followup queries 2745 # this weird shuffling is so that direct followup queries
2123 # get handled first 2746 # get handled first
2135 } else { 2758 } else {
2136 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2759 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2137 } 2760 }
2138 } 2761 }
2139 }, 2762 },
2763 on_exticmd => sub {
2764 my ($ns, $buf) = @_;
2765
2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2767
2768 if (ref $msg) {
2769 my ($type, $reply, @payload) =
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773
2774 my @reply;
2775
2776 if (my $cb = $EXTICMD{$type}) {
2777 @reply = $cb->($ns, @payload);
2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2783 } else {
2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2785 }
2786
2787 cf::override;
2788 },
2140); 2789);
2141 2790
2142=item $client->async (\&cb) 2791=item $client->async (\&cb)
2143 2792
2144Create a new coroutine, running the specified callback. The coroutine will 2793Create a new coroutine, running the specified callback. The coroutine will
2185our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2186our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2187 2836
2188$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2189 2838
2190$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2839$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math
2841 grepstart grepwhile mapstart mapwhile
2842 sort time
2843));
2191 2844
2192# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2193 2846
2194=pod 2847=pod
2195 2848
2196The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2197 2850
2198 cf::object contr pay_amount pay_player map 2851 cf::object
2852 contr pay_amount pay_player map x y force_find force_add
2853 insert remove name archname title slaying race decrease_ob_nr
2854
2199 cf::object::player player 2855 cf::object::player
2200 cf::player peaceful 2856 player
2201 cf::map trigger 2857
2858 cf::player
2859 peaceful
2860
2861 cf::map
2862 trigger
2202 2863
2203=cut 2864=cut
2204 2865
2205for ( 2866for (
2206 ["cf::object" => qw(contr pay_amount pay_player map)], 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race
2869 decrease_ob_nr)],
2207 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2208 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2209 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2210) { 2873) {
2211 no strict 'refs'; 2874 no strict 'refs';
2282=back 2945=back
2283 2946
2284=cut 2947=cut
2285 2948
2286############################################################################# 2949#############################################################################
2287
2288=head2 EXTENSION DATABASE SUPPORT
2289
2290Crossfire maintains a very simple database for extension use. It can
2291currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2292convert to/from binary).
2293
2294The parameter C<$family> should best start with the name of the extension
2295using it, it should be unique.
2296
2297=over 4
2298
2299=item $value = cf::db_get $family => $key
2300
2301Returns a single value from the database.
2302
2303=item cf::db_put $family => $key => $value
2304
2305Stores the given C<$value> in the family.
2306
2307=cut
2308
2309our $DB;
2310
2311sub db_init {
2312 unless ($DB) {
2313 $DB = BDB::db_create $DB_ENV;
2314
2315 cf::sync_job {
2316 eval {
2317 $DB->set_flags (BDB::CHKSUM);
2318
2319 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2320 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2321 cf::cleanup "db_open(db): $!" if $!;
2322 };
2323 cf::cleanup "db_open(db): $@" if $@;
2324 };
2325 }
2326}
2327
2328sub db_get($$) {
2329 my $key = "$_[0]/$_[1]";
2330
2331 cf::sync_job {
2332 BDB::db_get $DB, undef, $key, my $data;
2333
2334 $! ? ()
2335 : $data
2336 }
2337}
2338
2339sub db_put($$$) {
2340 BDB::dbreq_pri 4;
2341 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2342}
2343
2344=item cf::cache $id => [$paths...], $processversion => $process
2345
2346Generic caching function that returns the value of the resource $id,
2347caching and regenerating as required.
2348
2349This function can block.
2350
2351=cut
2352
2353sub cache {
2354 my ($id, $src, $processversion, $process) = @_;
2355
2356 my $meta =
2357 join "\x00",
2358 $processversion,
2359 map {
2360 aio_stat $_
2361 and Carp::croak "$_: $!";
2362
2363 ($_, (stat _)[7,9])
2364 } @$src;
2365
2366 my $dbmeta = db_get cache => "$id/meta";
2367 if ($dbmeta ne $meta) {
2368 # changed, we may need to process
2369
2370 my @data;
2371 my $md5;
2372
2373 for (0 .. $#$src) {
2374 0 <= aio_load $src->[$_], $data[$_]
2375 or Carp::croak "$src->[$_]: $!";
2376 }
2377
2378 # if processing is expensive, check
2379 # checksum first
2380 if (1) {
2381 $md5 =
2382 join "\x00",
2383 $processversion,
2384 map {
2385 Coro::cede;
2386 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2387 } 0.. $#$src;
2388
2389
2390 my $dbmd5 = db_get cache => "$id/md5";
2391 if ($dbmd5 eq $md5) {
2392 db_put cache => "$id/meta", $meta;
2393
2394 return db_get cache => "$id/data";
2395 }
2396 }
2397
2398 my $t1 = Time::HiRes::time;
2399 my $data = $process->(\@data);
2400 my $t2 = Time::HiRes::time;
2401
2402 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2403
2404 db_put cache => "$id/data", $data;
2405 db_put cache => "$id/md5" , $md5;
2406 db_put cache => "$id/meta", $meta;
2407
2408 return $data;
2409 }
2410
2411 db_get cache => "$id/data"
2412}
2413
2414=item fork_call { }, $args
2415
2416Executes the given code block with the given arguments in a seperate
2417process, returning the results. Everything must be serialisable with
2418Coro::Storable. May, of course, block. Note that the executed sub may
2419never block itself or use any form of Event handling.
2420
2421=cut
2422
2423sub fork_call(&@) {
2424 my ($cb, @args) = @_;
2425
2426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2427# or die "socketpair: $!";
2428 pipe my $fh1, my $fh2
2429 or die "pipe: $!";
2430
2431 if (my $pid = fork) {
2432 close $fh2;
2433
2434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2435 $res = Coro::Storable::thaw $res;
2436
2437 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2438
2439 die $$res unless "ARRAY" eq ref $res;
2440
2441 return wantarray ? @$res : $res->[-1];
2442 } else {
2443 reset_signals;
2444 local $SIG{__WARN__};
2445 local $SIG{__DIE__};
2446 eval {
2447 close $fh1;
2448
2449 my @res = eval { $cb->(@args) };
2450 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2451 };
2452
2453 warn $@ if $@;
2454 _exit 0;
2455 }
2456}
2457
2458
2459
2460#############################################################################
2461# the server's init and main functions 2950# the server's init and main functions
2462 2951
2463sub load_facedata($) { 2952sub load_facedata($) {
2464 my ($path) = @_; 2953 my ($path) = @_;
2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2465 2960
2466 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2467 2962
2468 my $facedata; 2963 my $facedata;
2469 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2472 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2473 2968
2474 $facedata->{version} == 2 2969 $facedata->{version} == 2
2475 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2476 2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2978
2477 { 2979 {
2478 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2479 2981
2480 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2481 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2482 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap};
2483 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2484 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2485 Coro::cede; 2988
2989 cf::cede_to_tick;
2486 } 2990 }
2487 2991
2488 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
2489 next unless $info->{smooth}; 2993 next unless $info->{smooth};
2490 my $idx = cf::face::find $face 2994 my $idx = cf::face::find $face
2491 or next; 2995 or next;
2492 if (my $smooth = cf::face::find $info->{smooth}) { 2996 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth;
2493 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2494 } else { 2999 } else {
2495 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3000 warn "smooth face '$info->{smooth}' not found for face '$face'";
2496 } 3001 }
2497 Coro::cede; 3002
3003 cf::cede_to_tick;
2498 } 3004 }
2499 } 3005 }
2500 3006
2501 { 3007 {
2502 my $anims = $facedata->{animinfo}; 3008 my $anims = $facedata->{animinfo};
2503 3009
2504 while (my ($anim, $info) = each %$anims) { 3010 while (my ($anim, $info) = each %$anims) {
2505 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3011 cf::anim::set $anim, $info->{frames}, $info->{facings};
2506 Coro::cede; 3012 cf::cede_to_tick;
2507 } 3013 }
2508 3014
2509 cf::anim::invalidate_all; # d'oh 3015 cf::anim::invalidate_all; # d'oh
2510 } 3016 }
2511 3017
3018 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource};
3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028
3029 if ($info->{type} & 1) {
3030 # prepend meta info
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else {
3039 $data = $info->{data};
3040 }
3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick;
3046 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 }
3066
2512 1 3067 1
2513} 3068}
2514 3069
3070register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_;
3072
3073 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v);
3075 }
3076};
3077
2515sub reload_regions { 3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
2516 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2517 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
3085
3086 for (cf::region::list) {
3087 $_->{match} = qr/$_->{match}/
3088 if exists $_->{match};
3089 }
2518} 3090}
2519 3091
2520sub reload_facedata { 3092sub reload_facedata {
2521 load_facedata "$DATADIR/facedata" 3093 load_facedata "$DATADIR/facedata"
2522 or die "unable to load facedata\n"; 3094 or die "unable to load facedata\n";
2523} 3095}
2524 3096
2525sub reload_archetypes { 3097sub reload_archetypes {
2526 load_resource_file "$DATADIR/archetypes" 3098 load_resource_file "$DATADIR/archetypes"
2527 or die "unable to load archetypes\n"; 3099 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
3103 load_resource_file "$DATADIR/archetypes"
3104 or die "unable to load archetypes\n";
2528} 3105}
2529 3106
2530sub reload_treasures { 3107sub reload_treasures {
2531 load_resource_file "$DATADIR/treasures" 3108 load_resource_file "$DATADIR/treasures"
2532 or die "unable to load treasurelists\n"; 3109 or die "unable to load treasurelists\n";
2535sub reload_resources { 3112sub reload_resources {
2536 warn "reloading resource files...\n"; 3113 warn "reloading resource files...\n";
2537 3114
2538 reload_regions; 3115 reload_regions;
2539 reload_facedata; 3116 reload_facedata;
3117 #reload_archetypes;#d#
2540 reload_archetypes; 3118 reload_archetypes;
2541 reload_treasures; 3119 reload_treasures;
2542 3120
2543 warn "finished reloading resource files\n"; 3121 warn "finished reloading resource files\n";
2544} 3122}
2545 3123
2546sub init { 3124sub init {
2547 reload_resources; 3125 reload_resources;
2548} 3126}
2549 3127
2550sub cfg_load { 3128sub reload_config {
2551 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2552 or return; 3130 or return;
2553 3131
2554 local $/; 3132 local $/;
2555 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
2575 (async { 3153 (async {
2576 Event::one_event; 3154 Event::one_event;
2577 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2578 }; 3156 };
2579 3157
2580 cfg_load; 3158 reload_config;
2581 db_init; 3159 db_init;
2582 load_extensions; 3160 load_extensions;
2583 3161
2584 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2585 Event::loop; 3163 Event::loop;
2601 }, 3179 },
2602 ); 3180 );
2603 } 3181 }
2604} 3182}
2605 3183
3184sub write_runtime {
3185 my $runtime = "$LOCALDIR/runtime";
3186
3187 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time.
3189
3190 IO::AIO::aio_utime $runtime, undef, undef;
3191
3192 my $guard = cf::lock_acquire "write_runtime";
3193
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3195 or return;
3196
3197 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server.
3200
3201 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3202 and return;
3203
3204 # always fsync - this file is important
3205 aio_fsync $fh
3206 and return;
3207
3208 # touch it again to show we are up-to-date
3209 aio_utime $fh, undef, undef;
3210
3211 close $fh
3212 or return;
3213
3214 aio_rename "$runtime~", $runtime
3215 and return;
3216
3217 warn "runtime file written.\n";
3218
3219 1
3220}
3221
2606sub emergency_save() { 3222sub emergency_save() {
2607 my $freeze_guard = cf::freeze_mainloop; 3223 my $freeze_guard = cf::freeze_mainloop;
2608 3224
2609 warn "enter emergency perl save\n"; 3225 warn "enter emergency perl save\n";
2610 3226
2685 %EXT_CORO = (); 3301 %EXT_CORO = ();
2686 3302
2687 warn "removing commands"; 3303 warn "removing commands";
2688 %COMMAND = (); 3304 %COMMAND = ();
2689 3305
2690 warn "removing ext commands"; 3306 warn "removing ext/exti commands";
2691 %EXTCMD = (); 3307 %EXTCMD = ();
3308 %EXTICMD = ();
2692 3309
2693 warn "unloading/nuking all extensions"; 3310 warn "unloading/nuking all extensions";
2694 for my $pkg (@EXTS) { 3311 for my $pkg (@EXTS) {
2695 warn "... unloading $pkg"; 3312 warn "... unloading $pkg";
2696 3313
2739 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
2740 require cf; 3357 require cf;
2741 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2742 3359
2743 warn "loading config and database again"; 3360 warn "loading config and database again";
2744 cf::cfg_load; 3361 cf::reload_config;
2745 3362
2746 warn "loading extensions"; 3363 warn "loading extensions";
2747 cf::load_extensions; 3364 cf::load_extensions;
2748 3365
2749 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
2814 my $signal = new Coro::Signal; 3431 my $signal = new Coro::Signal;
2815 push @WAIT_FOR_TICK_BEGIN, $signal; 3432 push @WAIT_FOR_TICK_BEGIN, $signal;
2816 $signal->wait; 3433 $signal->wait;
2817} 3434}
2818 3435
3436 my $min = 1e6;#d#
3437 my $avg = 10;
2819$TICK_WATCHER = Event->timer ( 3438$TICK_WATCHER = Event->timer (
2820 reentrant => 0, 3439 reentrant => 0,
2821 parked => 1, 3440 parked => 1,
2822 prio => 0, 3441 prio => 0,
2823 at => $NEXT_TICK || $TICK, 3442 at => $NEXT_TICK || $TICK,
2827 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2828 unless ++$bug_warning > 10; 3447 unless ++$bug_warning > 10;
2829 return; 3448 return;
2830 } 3449 }
2831 3450
2832 $NOW = Event::time; 3451 $NOW = $tick_start = Event::time;
2833 3452
2834 cf::server_tick; # one server iteration 3453 cf::server_tick; # one server iteration
3454
3455 0 && sync_job {#d#
3456 for(1..10) {
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460
3461 $map->width (50);
3462 $map->height (50);
3463 $map->alloc;
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3465 my $t = Event::time - $t;
3466
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 };
2835 3477
2836 $RUNTIME += $TICK; 3478 $RUNTIME += $TICK;
2837 $NEXT_TICK += $TICK; 3479 $NEXT_TICK += $TICK;
2838 3480
2839 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2845 } 3487 }
2846 3488
2847# my $AFTER = Event::time; 3489# my $AFTER = Event::time;
2848# warn $AFTER - $NOW;#d# 3490# warn $AFTER - $NOW;#d#
2849 3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send;
3494 }
3495 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send;
3497 }
3498
3499 $NOW = Event::time;
3500
2850 # if we are delayed by four ticks or more, skip them all 3501 # if we are delayed by four ticks or more, skip them all
2851 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2852 3503
2853 $TICK_WATCHER->at ($NEXT_TICK); 3504 $TICK_WATCHER->at ($NEXT_TICK);
2854 $TICK_WATCHER->start; 3505 $TICK_WATCHER->start;
2855 3506
2856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3507 $LOAD = ($NOW - $tick_start) / $TICK;
2857 $sig->send; 3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2858 }
2859 while (my $sig = shift @WAIT_FOR_TICK) {
2860 $sig->send;
2861 }
2862 3509
2863 _post_tick; 3510 _post_tick;
3511
3512
2864 }, 3513 },
2865); 3514);
2866 3515
2867{ 3516{
2868 BDB::max_poll_time $TICK * 0.1; 3517 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines