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.268 by root, Tue May 22 10:50:00 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
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.51 ();
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;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 206
194# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 208# within the Safe compartment.
196for my $pkg (qw( 209for my $pkg (qw(
197 cf::global cf::attachable 210 cf::global cf::attachable
205} 218}
206 219
207$Event::DIED = sub { 220$Event::DIED = sub {
208 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
209}; 222};
223
224#############################################################################
210 225
211=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
212 227
213=over 4 228=over 4
214 229
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 249 $d
235 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
236} 251}
237 252
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
241 254
242Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
243 256
244=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
245 258
246Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
247 267
248=item cf::lock_wait $string 268=item cf::lock_wait $string
249 269
250Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
251 271
254Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
257returned. 277returned.
258 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
259Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
261 284
262=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
263 286
264Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
265 288
266=cut 289=cut
267 290
268our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
269 293
270sub lock_wait($) { 294sub lock_wait($) {
271 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
272 301
273 # wait for lock, if any 302 # wait for lock, if any
274 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 305 Coro::schedule;
282 311
283 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
284 lock_wait $key; 313 lock_wait $key;
285 314
286 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
287 317
288 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
291 } 322 }
292} 323}
293 324
305 }; 336 };
306 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
307 $guard 338 $guard
308} 339}
309 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
310=item cf::async { BLOCK } 399=item cf::async { BLOCK }
311 400
312Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
317 406
318BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
319 408
320=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
321 410
322The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 412is always able to handle events or runnable, as Crossfire TRT is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
325 415
326If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
329fast or be very important. 419fast or be very important.
337 my $time = Event::time; 427 my $time = Event::time;
338 428
339 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
341 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
342 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
343 # (but this is cancel-safe) 435 # (but this is cancel-safe)
344 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
345 437
346 my $busy = 1; 438 my $busy = 1;
347 my @res; 439 my @res;
348 440
349 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 443 @res = eval { $job->() };
351 warn $@ if $@; 444 warn $@ if $@;
352 undef $busy; 445 undef $busy;
353 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
354 447
389 $EXT_CORO{$coro+0} = $coro; 482 $EXT_CORO{$coro+0} = $coro;
390 483
391 $coro 484 $coro
392} 485}
393 486
394sub write_runtime { 487=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 488
397 # first touch the runtime file to show we are still running: 489Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 490process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling.
399 493
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 494=cut
401 utime undef, undef, $fh; 495
496sub fork_call(&@) {
497 my ($cb, @args) = @_;
498
499 # we seemingly have to make a local copy of the whole thing,
500 # otherwise perl prematurely frees the stuff :/
501 # TODO: investigate and fix (likely this will be rather laborious)
502
503 my @res = Coro::Util::fork_eval {
504 reset_signals;
505 &$cb
506 }, @args;
507
508 wantarray ? @res : $res[-1]
509}
510
511=item $value = cf::db_get $family => $key
512
513Returns a single value from the environment database.
514
515=item cf::db_put $family => $key => $value
516
517Stores the given C<$value> in the family. It can currently store binary
518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
402 } 538 };
539 cf::cleanup "db_open(db): $@" if $@;
403 540
404 my $guard = cf::lock_acquire "write_runtime"; 541 $db
542}
405 543
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 544our $DB;
407 or return;
408 545
409 my $value = $cf::RUNTIME + 90 + 10; 546sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 547 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 548 $DB ||= db_table "db";
549 };
550}
412 551
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 552sub db_get($$) {
414 and return; 553 my $key = "$_[0]/$_[1]";
415 554
416 # always fsync - this file is important 555 cf::sync_job {
417 aio_fsync $fh 556 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 557
420 # touch it again to show we are up-to-date 558 $! ? ()
421 utime undef, undef, $fh; 559 : $data
422
423 close $fh
424 or return;
425
426 aio_rename "$runtime~", $runtime
427 and return;
428
429 warn "runtime file written.\n";#d#
430
431 1 560 }
561}
562
563sub db_put($$$) {
564 BDB::dbreq_pri 4;
565 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
566}
567
568=item cf::cache $id => [$paths...], $processversion => $process
569
570Generic caching function that returns the value of the resource $id,
571caching and regenerating as required.
572
573This function can block.
574
575=cut
576
577sub cache {
578 my ($id, $src, $processversion, $process) = @_;
579
580 my $meta =
581 join "\x00",
582 $processversion,
583 map {
584 aio_stat $_
585 and Carp::croak "$_: $!";
586
587 ($_, (stat _)[7,9])
588 } @$src;
589
590 my $dbmeta = db_get cache => "$id/meta";
591 if ($dbmeta ne $meta) {
592 # changed, we may need to process
593
594 my @data;
595 my $md5;
596
597 for (0 .. $#$src) {
598 0 <= aio_load $src->[$_], $data[$_]
599 or Carp::croak "$src->[$_]: $!";
600 }
601
602 # if processing is expensive, check
603 # checksum first
604 if (1) {
605 $md5 =
606 join "\x00",
607 $processversion,
608 map {
609 cf::cede_to_tick;
610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
611 } 0.. $#$src;
612
613
614 my $dbmd5 = db_get cache => "$id/md5";
615 if ($dbmd5 eq $md5) {
616 db_put cache => "$id/meta", $meta;
617
618 return db_get cache => "$id/data";
619 }
620 }
621
622 my $t1 = Time::HiRes::time;
623 my $data = $process->(\@data);
624 my $t2 = Time::HiRes::time;
625
626 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
627
628 db_put cache => "$id/data", $data;
629 db_put cache => "$id/md5" , $md5;
630 db_put cache => "$id/meta", $meta;
631
632 return $data;
633 }
634
635 db_get cache => "$id/data"
432} 636}
433 637
434=item cf::datalog type => key => value, ... 638=item cf::datalog type => key => value, ...
435 639
436Log a datalog packet of the given type with the given key-value pairs. 640Log a datalog packet of the given type with the given key-value pairs.
454attach callbacks/event handlers (a collection of which is called an "attachment") 658attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 659to it. All such attachable objects support the following methods.
456 660
457In the following description, CLASS can be any of C<global>, C<object> 661In the following description, CLASS can be any of C<global>, C<object>
458C<player>, C<client> or C<map> (i.e. the attachable objects in 662C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 663Crossfire TRT).
460 664
461=over 4 665=over 4
462 666
463=item $attachable->attach ($attachment, key => $value...) 667=item $attachable->attach ($attachment, key => $value...)
464 668
666 _attach $registry, $klass, @attach; 870 _attach $registry, $klass, @attach;
667 } 871 }
668 872
669 $obj->{$name} = \%arg; 873 $obj->{$name} = \%arg;
670 } else { 874 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 875 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 876 }
673 877
674 $obj->{_attachment}{$name} = undef; 878 $obj->{_attachment}{$name} = undef;
675} 879}
676 880
716 "; 920 ";
717 die if $@; 921 die if $@;
718} 922}
719 923
720our $override; 924our $override;
721our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 925our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
722 926
723sub override { 927sub override {
724 $override = 1; 928 $override = 1;
725 @invoke_results = (); 929 @INVOKE_RESULTS = (@_);
726} 930}
727 931
728sub do_invoke { 932sub do_invoke {
729 my $event = shift; 933 my $event = shift;
730 my $callbacks = shift; 934 my $callbacks = shift;
731 935
732 @invoke_results = (); 936 @INVOKE_RESULTS = ();
733 937
734 local $override; 938 local $override;
735 939
736 for (@$callbacks) { 940 for (@$callbacks) {
737 eval { &{$_->[1]} }; 941 eval { &{$_->[1]} };
754 958
755Generate an object-specific event with the given arguments. 959Generate an object-specific event with the given arguments.
756 960
757This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 961This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
758removed in future versions), and there is no public API to access override 962removed in future versions), and there is no public API to access override
759results (if you must, access C<@cf::invoke_results> directly). 963results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 964
761=back 965=back
762 966
763=cut 967=cut
764 968
765############################################################################# 969#############################################################################
766# object support 970# object support
971#
972
973sub _can_merge {
974 my ($ob1, $ob2) = @_;
975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986}
767 987
768sub reattach { 988sub reattach {
769 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 990 my ($obj) = @_;
771 991
818sub object_freezer_save { 1038sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
820 1040
821 sync_job { 1041 sync_job {
822 if (length $$rdata) { 1042 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
825 1046
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1048 chmod SAVE_MODE, $fh;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1050 aio_fsync $fh if $cf::USE_FSYNC;
830 close $fh; 1051 close $fh;
831 1052
832 if (@$objs) { 1053 if (@$objs) {
833 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
834 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
835 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
836 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
837 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
838 close $fh; 1059 close $fh;
839 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
840 } 1061 }
848 } 1069 }
849 } else { 1070 } else {
850 aio_unlink $filename; 1071 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
852 } 1073 }
853 } 1074 };
854} 1075}
855 1076
856sub object_freezer_as_string { 1077sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
858 1079
870 or return; 1091 or return;
871 1092
872 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
874 or return; 1095 or return;
875 $av = eval { (Storable::thaw $av)->{objs} };
876 }
877 1096
1097 my $st = eval { Coro::Storable::thaw $av }
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1100 }
1101
1102 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1104 $decname, length $data, scalar @{$av || []};
1105
880 return ($data, $av); 1106 ($data, $av)
881} 1107}
1108
1109=head2 COMMAND CALLBACKS
1110
1111=over 4
1112
1113=cut
882 1114
883############################################################################# 1115#############################################################################
884# command handling &c 1116# command handling &c
885 1117
886=item cf::register_command $name => \&callback($ob,$args); 1118=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1131 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1132}
901 1133
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1134=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1135
904Register a callbackf ro execution when the client sends an extcmd packet. 1136Register a callback for execution when the client sends an (synchronous)
1137extcmd packet. Ext commands will be processed in the order they are
1138received by the server, like other user commands. The first argument is
1139the logged-in player. Ext commands can only be processed after a player
1140has logged in successfully.
905 1141
906If the callback returns something, it is sent back as if reply was being 1142If the callback returns something, it is sent back as if reply was being
907called. 1143called.
908 1144
1145=item cf::register_exticmd $name => \&callback($ns,$packet);
1146
1147Register a callback for execution when the client sends an (asynchronous)
1148exticmd packet. Exti commands are processed by the server as soon as they
1149are received, i.e. out of order w.r.t. other commands. The first argument
1150is a client socket. Exti commands can be received anytime, even before
1151log-in.
1152
1153If the callback returns something, it is sent back as if reply was being
1154called.
1155
909=cut 1156=cut
910 1157
911sub register_extcmd { 1158sub register_extcmd {
912 my ($name, $cb) = @_; 1159 my ($name, $cb) = @_;
913 1160
914 $EXTCMD{$name} = $cb; 1161 $EXTCMD{$name} = $cb;
1162}
1163
1164sub register_exticmd {
1165 my ($name, $cb) = @_;
1166
1167 $EXTICMD{$name} = $cb;
915} 1168}
916 1169
917cf::player->attach ( 1170cf::player->attach (
918 on_command => sub { 1171 on_command => sub {
919 my ($pl, $name, $params) = @_; 1172 my ($pl, $name, $params) = @_;
928 cf::override; 1181 cf::override;
929 }, 1182 },
930 on_extcmd => sub { 1183 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1184 my ($pl, $buf) = @_;
932 1185
933 my $msg = eval { from_json $buf }; 1186 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1187
935 if (ref $msg) { 1188 if (ref $msg) {
1189 my ($type, $reply, @payload) =
1190 "ARRAY" eq ref $msg
1191 ? @$msg
1192 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1193
1194 my @reply;
1195
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1196 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1197 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1198 }
1199
1200 $pl->ext_reply ($reply, @reply)
1201 if $reply;
1202
941 } else { 1203 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1204 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1205 }
944 1206
945 cf::override; 1207 cf::override;
946 }, 1208 },
947); 1209);
948 1210
949sub load_extension {
950 my ($path) = @_;
951
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
953 my $base = $1;
954 my $pkg = $1;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 }
977 die $@;
978 }
979
980 push @EXTS, $pkg;
981}
982
983sub load_extensions { 1211sub load_extensions {
1212 cf::sync_job {
1213 my %todo;
1214
984 for my $ext (<$LIBDIR/*.ext>) { 1215 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1216 next unless -r $path;
986 eval { 1217
987 load_extension $ext; 1218 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1219 my $base = $1;
1220 my $pkg = $1;
1221 $pkg =~ s/[^[:word:]]/_/g;
1222 $pkg = "ext::$pkg";
1223
1224 open my $fh, "<:utf8", $path
1225 or die "$path: $!";
1226
1227 my $source = do { local $/; <$fh> };
1228
1229 my %ext = (
1230 path => $path,
1231 base => $base,
1232 pkg => $pkg,
1233 );
1234
1235 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1236 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1237
1238 $ext{source} =
1239 "package $pkg; use strict; use utf8;\n"
1240 . "#line 1 \"$path\"\n{\n"
1241 . $source
1242 . "\n};\n1";
1243
1244 $todo{$base} = \%ext;
1245 }
1246
1247 my %done;
1248 while (%todo) {
1249 my $progress;
1250
1251 while (my ($k, $v) = each %todo) {
1252 for (split /,\s*/, $v->{meta}{depends}) {
1253 goto skip
1254 unless exists $done{$_};
1255 }
1256
1257 warn "... loading '$k' into '$v->{pkg}'\n";
1258
1259 unless (eval $v->{source}) {
1260 my $msg = $@ ? "$v->{path}: $@\n"
1261 : "$v->{base}: extension inactive.\n";
1262
1263 if (exists $v->{meta}{mandatory}) {
1264 warn $msg;
1265 warn "mandatory extension failed to load, exiting.\n";
1266 exit 1;
1267 }
1268
1269 warn $msg;
1270 }
1271
1272 $done{$k} = delete $todo{$k};
1273 push @EXTS, $v->{pkg};
1274 $progress = 1;
988 1 1275 }
989 } or warn "$ext not loaded: $@"; 1276
1277 skip:
1278 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1279 unless $progress;
1280 }
990 } 1281 };
991} 1282}
992 1283
993############################################################################# 1284#############################################################################
994 1285
1286=back
1287
995=head2 CORE EXTENSIONS 1288=head2 CORE EXTENSIONS
996 1289
997Functions and methods that extend core crossfire objects. 1290Functions and methods that extend core crossfire objects.
998 1291
999=cut 1292=cut
1003use Coro::AIO; 1296use Coro::AIO;
1004 1297
1005=head3 cf::player 1298=head3 cf::player
1006 1299
1007=over 4 1300=over 4
1301
1302=item cf::player::num_playing
1303
1304Returns the official number of playing players, as per the Crossfire metaserver rules.
1305
1306=cut
1307
1308sub num_playing {
1309 scalar grep
1310 $_->ob->map
1311 && !$_->hidden
1312 && !$_->ob->flag (cf::FLAG_WIZ),
1313 cf::player::list
1314}
1008 1315
1009=item cf::player::find $login 1316=item cf::player::find $login
1010 1317
1011Returns the given player object, loading it if necessary (might block). 1318Returns the given player object, loading it if necessary (might block).
1012 1319
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1355 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1356 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1357 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1359
1053 my $pl = load_pl path $login 1360 my $f = new_from_file cf::object::thawer path $login
1054 or return; 1361 or return;
1362
1363 my $pl = cf::player::load_pl $f
1364 or return;
1365 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs;
1055 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
1056 } 1368 }
1057 } 1369 }
1058} 1370}
1059 1371
1069 1381
1070 aio_mkdir playerdir $pl, 0770; 1382 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1383 $pl->{last_save} = $cf::RUNTIME;
1072 1384
1073 $pl->save_pl ($path); 1385 $pl->save_pl ($path);
1074 Coro::cede; 1386 cf::cede_to_tick;
1075} 1387}
1076 1388
1077sub new($) { 1389sub new($) {
1078 my ($login) = @_; 1390 my ($login) = @_;
1079 1391
1083 $self->{deny_save} = 1; 1395 $self->{deny_save} = 1;
1084 1396
1085 $cf::PLAYER{$login} = $self; 1397 $cf::PLAYER{$login} = $self;
1086 1398
1087 $self 1399 $self
1400}
1401
1402=item $player->send_msg ($channel, $msg, $color, [extra...])
1403
1404=cut
1405
1406sub send_msg {
1407 my $ns = shift->ns
1408 or return;
1409 $ns->send_msg (@_);
1088} 1410}
1089 1411
1090=item $pl->quit_character 1412=item $pl->quit_character
1091 1413
1092Nukes the player without looking back. If logged in, the connection will 1414Nukes the player without looking back. If logged in, the connection will
1147 or return []; 1469 or return [];
1148 1470
1149 my @logins; 1471 my @logins;
1150 1472
1151 for my $login (@$dirs) { 1473 for my $login (@$dirs) {
1474 my $path = path $login;
1475
1476 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1479 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1480 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 }
1155 1482
1156 utf8::decode $login; 1483 utf8::decode $login;
1157 push @logins, $login; 1484 push @logins, $login;
1158 } 1485 }
1159 1486
1186 } 1513 }
1187 1514
1188 \@paths 1515 \@paths
1189} 1516}
1190 1517
1518=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1519
1520Expand crossfire pod fragments into protocol xml.
1521
1522=cut
1523
1524sub expand_cfpod {
1525 ((my $self), (local $_)) = @_;
1526
1527 # escape & and <
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530
1531 # this is buggy, it needs to properly take care of nested <'s
1532
1533 1 while
1534 # replace B<>, I<>, U<> etc.
1535 s/B<([^\>]*)>/<b>$1<\/b>/
1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1539 # replace G<male|female> tags
1540 || s{G<([^>|]*)\|([^>]*)>}{
1541 $self->gender ? $2 : $1
1542 }ge
1543 # replace H<hint text>
1544 || s{H<([^\>]*)>}
1545 {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "")
1549 [$self->{hintmode}]
1550 }ge;
1551
1552 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g;
1554
1555 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines
1560
1561 $_
1562}
1563
1564sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode}
1567}
1568
1191=item $player->ext_reply ($msgid, %msg) 1569=item $player->ext_reply ($msgid, @msg)
1192 1570
1193Sends an ext reply to the player. 1571Sends an ext reply to the player.
1194 1572
1195=cut 1573=cut
1196 1574
1197sub ext_reply($$%) { 1575sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1576 my ($self, $id, @msg) = @_;
1199 1577
1200 $msg{msgid} = $id; 1578 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1579}
1204 1580
1205=item $player->ext_event ($type, %msg) 1581=item $player->ext_msg ($type, @msg)
1206 1582
1207Sends an ext event to the client. 1583Sends an ext event to the client.
1208 1584
1209=cut 1585=cut
1210 1586
1211sub ext_event($$%) { 1587sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1588 my ($self, $type, @msg) = @_;
1213 1589
1214 $self->ns->ext_event ($type, %msg); 1590 $self->ns->ext_msg ($type, @msg);
1215} 1591}
1216 1592
1217=head3 cf::region 1593=head3 cf::region
1218 1594
1219=over 4 1595=over 4
1222 1598
1223package cf::region; 1599package cf::region;
1224 1600
1225=item cf::region::find_by_path $path 1601=item cf::region::find_by_path $path
1226 1602
1227Tries to decuce the probable region for a map knowing only its path. 1603Tries to decuce the likely region for a map knowing only its path.
1228 1604
1229=cut 1605=cut
1230 1606
1231sub find_by_path($) { 1607sub find_by_path($) {
1232 my ($path) = @_; 1608 my ($path) = @_;
1233 1609
1234 my ($match, $specificity); 1610 my ($match, $specificity);
1235 1611
1236 for my $region (list) { 1612 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1613 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1614 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1615 if $region->specificity > $specificity;
1240 } 1616 }
1241 } 1617 }
1242 1618
1306 my ($self, $merge) = @_; 1682 my ($self, $merge) = @_;
1307 1683
1308 # we have to keep some variables in memory intact 1684 # we have to keep some variables in memory intact
1309 local $self->{path}; 1685 local $self->{path};
1310 local $self->{load_path}; 1686 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1687
1314 $self->SUPER::thawer_merge ($merge); 1688 $self->SUPER::thawer_merge ($merge);
1315} 1689}
1316 1690
1317sub normalise { 1691sub normalise {
1364 $self->init; # pass $1 etc. 1738 $self->init; # pass $1 etc.
1365 return $self; 1739 return $self;
1366 } 1740 }
1367 } 1741 }
1368 1742
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1743 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1744 ()
1371} 1745}
1372 1746
1373sub init { 1747sub init {
1374 my ($self) = @_; 1748 my ($self) = @_;
1417 1791
1418 $_->change_map_light ($change) 1792 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1793 for grep $_->outdoor, values %cf::MAP;
1420} 1794}
1421 1795
1796sub decay_objects {
1797 my ($self) = @_;
1798
1799 return if $self->{deny_reset};
1800
1801 $self->do_decay_objects;
1802}
1803
1422sub unlink_save { 1804sub unlink_save {
1423 my ($self) = @_; 1805 my ($self) = @_;
1424 1806
1425 utf8::encode (my $save = $self->save_path); 1807 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1808 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1429 1811
1430sub load_header_from($) { 1812sub load_header_from($) {
1431 my ($self, $path) = @_; 1813 my ($self, $path) = @_;
1432 1814
1433 utf8::encode $path; 1815 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1816 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 or return; 1817 or return;
1818
1819 $self->_load_header ($f)
1820 or return;
1821
1822 local $MAP_LOADING{$self->{path}} = $self;
1823 $f->resolve_delayed_derefs;
1439 1824
1440 $self->{load_path} = $path; 1825 $self->{load_path} = $path;
1441 1826
1442 1 1827 1
1443} 1828}
1482 $self->load_header_orig 1867 $self->load_header_orig
1483 or return; 1868 or return;
1484 $self->prepare_orig; 1869 $self->prepare_orig;
1485 } 1870 }
1486 1871
1872 $self->{deny_reset} = 1
1873 if $self->no_reset;
1874
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1875 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1876 unless $self->default_region;
1489 1877
1490 1 1878 1
1491} 1879}
1494sub find { 1882sub find {
1495 my ($path, $origin) = @_; 1883 my ($path, $origin) = @_;
1496 1884
1497 $path = normalise $path, $origin && $origin->path; 1885 $path = normalise $path, $origin && $origin->path;
1498 1886
1887 cf::lock_wait "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 1888 cf::lock_wait "map_find:$path";
1500 1889
1501 $cf::MAP{$path} || do { 1890 $cf::MAP{$path} || do {
1502 my $guard = cf::lock_acquire "map_find:$path"; 1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1503 my $map = new_from_path cf::map $path 1894 my $map = new_from_path cf::map $path
1504 or return; 1895 or return;
1505 1896
1506 $map->{last_save} = $cf::RUNTIME; 1897 $map->{last_save} = $cf::RUNTIME;
1507 1898
1508 $map->load_header 1899 $map->load_header
1509 or return; 1900 or return;
1510 1901
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1903 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1904 #$cf::WAIT_FOR_TICK->wait;
1905 undef $guard1;
1906 undef $guard2;
1514 $map->reset; 1907 $map->reset;
1515 undef $guard;
1516 return find $path; 1908 return find $path;
1517 } 1909 }
1518 1910
1519 $cf::MAP{$path} = $map 1911 $cf::MAP{$path} = $map
1520 } 1912 }
1529 local $self->{deny_reset} = 1; # loading can take a long time 1921 local $self->{deny_reset} = 1; # loading can take a long time
1530 1922
1531 my $path = $self->{path}; 1923 my $path = $self->{path};
1532 1924
1533 { 1925 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 1926 my $guard = cf::lock_acquire "map_data:$path";
1535 1927
1928 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 1929 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 1930
1538 $self->in_memory (cf::MAP_LOADING); 1931 $self->in_memory (cf::MAP_LOADING);
1539 1932
1540 $self->alloc; 1933 $self->alloc;
1541 1934
1542 $self->pre_load; 1935 $self->pre_load;
1543 Coro::cede; 1936 cf::cede_to_tick;
1544 1937
1938 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 1940 $self->_load_objects ($f)
1546 or return; 1941 or return;
1547 1942
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original}; 1944 if delete $self->{load_original};
1550 1945
1551 if (my $uniq = $self->uniq_path) { 1946 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 1947 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 1948 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 1950 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 1951 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs;
1953 }
1556 } 1954 }
1557 } 1955 }
1558 1956
1559 Coro::cede; 1957 $f->resolve_delayed_derefs;
1958
1959 cf::cede_to_tick;
1560 # now do the right thing for maps 1960 # now do the right thing for maps
1561 $self->link_multipart_objects; 1961 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 1962 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 1963 unless $self->difficulty;
1564 Coro::cede; 1964 cf::cede_to_tick;
1565 1965
1566 unless ($self->{deny_activate}) { 1966 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 1967 $self->decay_objects;
1568 $self->fix_auto_apply; 1968 $self->fix_auto_apply;
1569 $self->update_buttons; 1969 $self->update_buttons;
1570 Coro::cede; 1970 cf::cede_to_tick;
1571 $self->set_darkness_map; 1971 $self->set_darkness_map;
1572 Coro::cede; 1972 cf::cede_to_tick;
1573 $self->activate; 1973 $self->activate;
1574 } 1974 }
1975
1976 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME);
1575 1978
1576 $self->in_memory (cf::MAP_IN_MEMORY); 1979 $self->in_memory (cf::MAP_IN_MEMORY);
1577 } 1980 }
1578 1981
1579 $self->post_load; 1982 $self->post_load;
1583 my ($self, $ob) = @_; 1986 my ($self, $ob) = @_;
1584 1987
1585 return find "~" . $ob->name . "/" . $self->{path} 1988 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 1989 if $self->per_player;
1587 1990
1991# return find "?party/" . $ob->name . "/" . $self->{path}
1992# if $self->per_party;
1993
1588 $self 1994 $self
1589} 1995}
1590 1996
1591# find and load all maps in the 3x3 area around a map 1997# find and load all maps in the 3x3 area around a map
1592sub load_diag { 1998sub load_neighbours {
1593 my ($map) = @_; 1999 my ($map) = @_;
1594 2000
1595 my @diag; # diagonal neighbours 2001 my @neigh; # diagonal neighbours
1596 2002
1597 for (0 .. 3) { 2003 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 2004 my $neigh = $map->tile_path ($_)
1599 or next; 2005 or next;
1600 $neigh = find $neigh, $map 2006 $neigh = find $neigh, $map
1601 or next; 2007 or next;
1602 $neigh->load; 2008 $neigh->load;
1603 2009
2010 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2011 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2012 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2013 }
1607 2014
1608 for (@diag) { 2015 for (grep defined $_->[0], @neigh) {
2016 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2017 my $neigh = find $path, $origin
1610 or next; 2018 or next;
1611 $neigh->load; 2019 $neigh->load;
1612 } 2020 }
1613} 2021}
1614 2022
1619} 2027}
1620 2028
1621sub do_load_sync { 2029sub do_load_sync {
1622 my ($map) = @_; 2030 my ($map) = @_;
1623 2031
2032 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2033 if $Coro::current == $Coro::main;
2034
1624 cf::sync_job { $map->load }; 2035 cf::sync_job { $map->load };
1625} 2036}
1626 2037
1627our %MAP_PREFETCH; 2038our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2039our $MAP_PREFETCHER = undef;
1629 2040
1630sub find_async { 2041sub find_async {
1631 my ($path, $origin) = @_; 2042 my ($path, $origin, $load) = @_;
1632 2043
1633 $path = normalise $path, $origin && $origin->{path}; 2044 $path = normalise $path, $origin && $origin->{path};
1634 2045
1635 if (my $map = $cf::MAP{$path}) { 2046 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637 } 2048 }
1638 2049
1639 undef $MAP_PREFETCH{$path}; 2050 $MAP_PREFETCH{$path} |= $load;
2051
1640 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
1641 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2057 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2058 $map->load if $v;
2059 }
1646 2060
1647 delete $MAP_PREFETCH{$path}; 2061 delete $MAP_PREFETCH{$k};
1648 } 2062 }
1649 } 2063 }
1650 undef $MAP_PREFETCHER; 2064 undef $MAP_PREFETCHER;
1651 }; 2065 };
1652 $MAP_PREFETCHER->prio (6); 2066 $MAP_PREFETCHER->prio (6);
1655} 2069}
1656 2070
1657sub save { 2071sub save {
1658 my ($self) = @_; 2072 my ($self) = @_;
1659 2073
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 2075
1662 $self->{last_save} = $cf::RUNTIME; 2076 $self->{last_save} = $cf::RUNTIME;
1663 2077
1664 return unless $self->dirty; 2078 return unless $self->dirty;
1665 2079
1671 return if $self->{deny_save}; 2085 return if $self->{deny_save};
1672 2086
1673 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
1674 2088
1675 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
1676 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
1677 }; 2092 };
1678 2093
1679 if ($uniq) { 2094 if ($uniq) {
1680 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1688 my ($self) = @_; 2103 my ($self) = @_;
1689 2104
1690 # save first because save cedes 2105 # save first because save cedes
1691 $self->save; 2106 $self->save;
1692 2107
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2108 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2109
1695 return if $self->players; 2110 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save}; 2112 return if $self->{deny_save};
1698 2113
2114 $self->in_memory (cf::MAP_SWAPPED);
2115
2116 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP;
1699 $self->clear; 2118 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2119}
1702 2120
1703sub reset_at { 2121sub reset_at {
1704 my ($self) = @_; 2122 my ($self) = @_;
1705 2123
1706 # TODO: safety, remove and allow resettable per-player maps 2124 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 2125 return 1e99 if $self->{deny_reset};
1709 2126
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2127 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2128 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 2129
1723 my ($self) = @_; 2140 my ($self) = @_;
1724 2141
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2143
1727 return if $self->players; 2144 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2145
1730 warn "resetting map ", $self->path;#d# 2146 warn "resetting map ", $self->path;
1731 2147
1732 $self->in_memory (cf::MAP_SWAPPED); 2148 $self->in_memory (cf::MAP_SWAPPED);
1733 2149
1734 # need to save uniques path 2150 # need to save uniques path
1735 unless ($self->{deny_save}) { 2151 unless ($self->{deny_save}) {
1739 if $uniq; 2155 if $uniq;
1740 } 2156 }
1741 2157
1742 delete $cf::MAP{$self->path}; 2158 delete $cf::MAP{$self->path};
1743 2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2162 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2163
1748 $self->unlink_save; 2164 $self->unlink_save;
1749 $self->destroy; 2165 $self->destroy;
1750} 2166}
1751 2167
1752my $nuke_counter = "aaaa"; 2168my $nuke_counter = "aaaa";
1753 2169
1754sub nuke { 2170sub nuke {
1755 my ($self) = @_; 2171 my ($self) = @_;
1756 2172
2173 {
2174 my $lock = cf::lock_acquire "map_data:$self->{path}";
2175
1757 delete $cf::MAP{$self->path}; 2176 delete $cf::MAP{$self->path};
1758 2177
1759 $self->unlink_save; 2178 $self->unlink_save;
1760 2179
1761 bless $self, "cf::map"; 2180 bless $self, "cf::map";
1762 delete $self->{deny_reset}; 2181 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2182 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2183 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2185
1767 $cf::MAP{$self->path} = $self; 2186 $cf::MAP{$self->path} = $self;
2187 }
1768 2188
1769 $self->reset; # polite request, might not happen 2189 $self->reset; # polite request, might not happen
2190}
2191
2192=item $maps = cf::map::tmp_maps
2193
2194Returns an arrayref with all map paths of currently instantiated and saved
2195maps. May block.
2196
2197=cut
2198
2199sub tmp_maps() {
2200 [
2201 map {
2202 utf8::decode $_;
2203 /\.map$/
2204 ? normalise $_
2205 : ()
2206 } @{ aio_readdir $TMPDIR or [] }
2207 ]
2208}
2209
2210=item $maps = cf::map::random_maps
2211
2212Returns an arrayref with all map paths of currently instantiated and saved
2213random maps. May block.
2214
2215=cut
2216
2217sub random_maps() {
2218 [
2219 map {
2220 utf8::decode $_;
2221 /\.map$/
2222 ? normalise "?random/$_"
2223 : ()
2224 } @{ aio_readdir $RANDOMDIR or [] }
2225 ]
1770} 2226}
1771 2227
1772=item cf::map::unique_maps 2228=item cf::map::unique_maps
1773 2229
1774Returns an arrayref of paths of all shared maps that have 2230Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2231instantiated unique items. May block.
1776 2232
1777=cut 2233=cut
1778 2234
1779sub unique_maps() { 2235sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2236 [
1781 or return; 2237 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2238 utf8::decode $_;
1787 next if /\.pst$/; 2239 /\.map$/
1788 next unless /^$PATH_SEP/o; 2240 ? normalise $_
1789 2241 : ()
1790 push @paths, cf::map::normalise $_; 2242 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2243 ]
1792
1793 \@paths
1794} 2244}
1795 2245
1796package cf; 2246package cf;
1797 2247
1798=back 2248=back
1816 map { $_, inv_recursive_ $_->inv } @_ 2266 map { $_, inv_recursive_ $_->inv } @_
1817} 2267}
1818 2268
1819sub inv_recursive { 2269sub inv_recursive {
1820 inv_recursive_ inv $_[0] 2270 inv_recursive_ inv $_[0]
2271}
2272
2273=item $ref = $ob->ref
2274
2275creates and returns a persistent reference to an objetc that can be stored as a string.
2276
2277=item $ob = cf::object::deref ($refstring)
2278
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block.
2281
2282=cut
2283
2284sub deref {
2285 my ($ref) = @_;
2286
2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2288 my ($uuid, $name) = ($1, $2);
2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2290 or return;
2291 $pl->ob->uuid eq $uuid
2292 or return;
2293
2294 $pl->ob
2295 } else {
2296 warn "$ref: cannot resolve object reference\n";
2297 undef
2298 }
1821} 2299}
1822 2300
1823package cf; 2301package cf;
1824 2302
1825=back 2303=back
1844 2322
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2323 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2324
1847 if ($self->{record_replies}) { 2325 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2326 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2327
1849 } else { 2328 } else {
2329 my $pl = $self->contr;
2330
2331 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2332 my $dialog = $pl->{npc_dialog};
2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2334
2335 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2336 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2337 $self->message ($msg, $flags);
2338 }
1852 } 2339 }
2340}
2341
2342=item $object->send_msg ($channel, $msg, $color, [extra...])
2343
2344=cut
2345
2346sub cf::object::send_msg {
2347 my $pl = shift->contr
2348 or return;
2349 $pl->send_msg (@_);
1853} 2350}
1854 2351
1855=item $player_object->may ("access") 2352=item $player_object->may ("access")
1856 2353
1857Returns wether the given player is authorized to access resource "access" 2354Returns wether the given player is authorized to access resource "access"
1904 $self->deactivate_recursive; 2401 $self->deactivate_recursive;
1905 2402
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2403 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2404
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2405 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 2406 if $self->map && $self->map->{path} ne "{link}";
1910 2407
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2408 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 2409}
1913 2410
1914sub cf::object::player::leave_link { 2411sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2412 my ($self, $map, $x, $y) = @_;
2413
2414 return unless $self->contr->active;
1916 2415
1917 my $link_pos = delete $self->{_link_pos}; 2416 my $link_pos = delete $self->{_link_pos};
1918 2417
1919 unless ($map) { 2418 unless ($map) {
1920 # restore original map position 2419 # restore original map position
1934 # use -1 or undef as default coordinates, not 0, 0 2433 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2434 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2435 if $x <=0 && $y <= 0;
1937 2436
1938 $map->load; 2437 $map->load;
1939 $map->load_diag; 2438 $map->load_neighbours;
1940 2439
1941 return unless $self->contr->active; 2440 return unless $self->contr->active;
1942 $self->activate_recursive; 2441 $self->activate_recursive;
1943 2442
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2444 $self->enter_map ($map, $x, $y);
1946} 2445}
1947 2446
1948cf::player->attach (
1949 on_logout => sub {
1950 my ($pl) = @_;
1951
1952 # abort map switching before logout
1953 if ($pl->ob->{_link_pos}) {
1954 cf::sync_job {
1955 $pl->ob->leave_link
1956 };
1957 }
1958 },
1959 on_login => sub {
1960 my ($pl) = @_;
1961
1962 # try to abort aborted map switching on player login :)
1963 # should happen only on crashes
1964 if ($pl->ob->{_link_pos}) {
1965 $pl->ob->enter_link;
1966 (async {
1967 $pl->ob->reply (undef,
1968 "There was an internal problem at your last logout, "
1969 . "the server will try to bring you to your intended destination in a second.",
1970 cf::NDI_RED);
1971 # we need this sleep as the login has a concurrent enter_exit running
1972 # and this sleep increases chances of the player not ending up in scorn
1973 Coro::Timer::sleep 1;
1974 $pl->ob->leave_link;
1975 })->prio (2);
1976 }
1977 },
1978);
1979
1980=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2447=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1981 2448
1982Moves the player to the given map-path and coordinates by first freezing 2449Moves the player to the given map-path and coordinates by first freezing
1983her, loading and preparing them map, calling the provided $check callback 2450her, loading and preparing them map, calling the provided $check callback
1984that has to return the map if sucecssful, and then unfreezes the player on 2451that has to return the map if sucecssful, and then unfreezes the player on
1985the new (success) or old (failed) map position. 2452the new (success) or old (failed) map position. In either case, $done will
2453be called at the end of this process.
1986 2454
1987=cut 2455=cut
2456
2457our $GOTOGEN;
1988 2458
1989sub cf::object::player::goto { 2459sub cf::object::player::goto {
1990 my ($self, $path, $x, $y, $check) = @_; 2460 my ($self, $path, $x, $y, $check, $done) = @_;
1991 2461
1992 #d# #TODO# 2462 # do generation counting so two concurrent goto's will be executed in-order
1993 if ($check && !ref $check) { 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1994 warn Carp::longmess "goto called with non-ref check argument";#d#
1995 undef $check;
1996 }
1997 2464
1998 $self->enter_link; 2465 $self->enter_link;
1999 2466
2000 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
2001 my $map = eval { 2489 my $map = eval {
2002 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
2003 2491
2004 if ($map) { 2492 if ($map) {
2005 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
2006 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
2007 } else { 2495 } else {
2008 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2009 } 2497 }
2010 2498
2011 $map 2499 $map
2012 }; 2500 };
2013 2501
2014 if ($@) { 2502 if ($@) {
2015 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); 2503 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2016 LOG llevError | logBacktrace, Carp::longmess $@; 2504 LOG llevError | logBacktrace, Carp::longmess $@;
2017 } 2505 }
2018 2506
2507 if ($gen == $self->{_goto_generation}) {
2508 delete $self->{_goto_generation};
2019 $self->leave_link ($map, $x, $y); 2509 $self->leave_link ($map, $x, $y);
2510 }
2511
2512 $done->() if $done;
2020 })->prio (1); 2513 })->prio (1);
2021} 2514}
2022 2515
2023=item $player_object->enter_exit ($exit_object) 2516=item $player_object->enter_exit ($exit_object)
2024 2517
2093 my $hp = $exit->stats->hp; 2586 my $hp = $exit->stats->hp;
2094 my $sp = $exit->stats->sp; 2587 my $sp = $exit->stats->sp;
2095 2588
2096 $self->enter_link; 2589 $self->enter_link;
2097 2590
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2098 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2099 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2100 unless (eval { 2599 unless (eval {
2101 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2102 2601
2103 1; 2602 1;
2129 2628
2130 utf8::encode $text; 2629 utf8::encode $text;
2131 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2630 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2132} 2631}
2133 2632
2633=item $client->send_msg ($channel, $msg, $color, [extra...])
2634
2635Send a drawinfo or msg packet to the client, formatting the msg for the
2636client if neccessary. C<$type> should be a string identifying the type of
2637the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet.
2639
2640=cut
2641
2642our %CHANNEL = (
2643 "c/identify" => {
2644 id => "infobox",
2645 title => "Identify",
2646 reply => undef,
2647 tooltip => "Items recently identified",
2648 },
2649 "c/examine" => {
2650 id => "infobox",
2651 title => "Examine",
2652 reply => undef,
2653 tooltip => "Signs and other items you examined",
2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2661);
2662
2663sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_;
2665
2666 $msg = $self->pl->expand_cfpod ($msg);
2667
2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2669
2670 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2679 } elsif (ref $channel) {
2680 # send meta info to client, if not yet sent
2681 unless (exists $self->{channel}{$channel->{id}}) {
2682 $self->{channel}{$channel->{id}} = $channel;
2683 $self->ext_msg (channel_info => $channel)
2684 if $self->can_msg;
2685 }
2686
2687 $channel = $channel->{id};
2688 }
2689
2690 return unless @extra || length $msg;
2691
2692 if ($self->can_msg) {
2693 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF;
2696
2697 $self->send_packet ("msg " . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2699 } else {
2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710
2711 $color &= cf::NDI_COLOR_MASK;
2712
2713 utf8::encode $msg;
2714
2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2718 } else {
2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2720 $self->send_packet ("drawinfo $color $msg")
2721 }
2722 }
2723 }
2724}
2725
2134=item $client->ext_event ($type, %msg) 2726=item $client->ext_msg ($type, @msg)
2135 2727
2136Sends an exti event to the client. 2728Sends an ext event to the client.
2137 2729
2138=cut 2730=cut
2139 2731
2140sub cf::client::ext_event($$%) { 2732sub cf::client::ext_msg($$@) {
2141 my ($self, $type, %msg) = @_; 2733 my ($self, $type, @msg) = @_;
2142 2734
2735 if ($self->extcmd == 2) {
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove
2143 $msg{msgtype} = "event_$type"; 2738 push @msg, msgtype => "event_$type";
2144 $self->send_packet ("ext " . cf::to_json \%msg); 2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 }
2741}
2742
2743=item $client->ext_reply ($msgid, @msg)
2744
2745Sends an ext reply to the client.
2746
2747=cut
2748
2749sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_;
2751
2752 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 }
2145} 2759}
2146 2760
2147=item $success = $client->query ($flags, "text", \&cb) 2761=item $success = $client->query ($flags, "text", \&cb)
2148 2762
2149Queues a query to the client, calling the given callback with 2763Queues a query to the client, calling the given callback with
2150the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2764the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2151C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2765C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2152 2766
2153Queries can fail, so check the return code. Or don't, as queries will become 2767Queries can fail, so check the return code. Or don't, as queries will
2154reliable at some point in the future. 2768become reliable at some point in the future.
2155 2769
2156=cut 2770=cut
2157 2771
2158sub cf::client::query { 2772sub cf::client::query {
2159 my ($self, $flags, $text, $cb) = @_; 2773 my ($self, $flags, $text, $cb) = @_;
2167 utf8::encode $text; 2781 utf8::encode $text;
2168 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2782 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2169 2783
2170 $self->send_packet ($self->{query_queue}[0][0]) 2784 $self->send_packet ($self->{query_queue}[0][0])
2171 if @{ $self->{query_queue} } == 1; 2785 if @{ $self->{query_queue} } == 1;
2786
2787 1
2172} 2788}
2173 2789
2174cf::client->attach ( 2790cf::client->attach (
2791 on_connect => sub {
2792 my ($ns) = @_;
2793
2794 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2795 },
2175 on_reply => sub { 2796 on_reply => sub {
2176 my ($ns, $msg) = @_; 2797 my ($ns, $msg) = @_;
2177 2798
2178 # this weird shuffling is so that direct followup queries 2799 # this weird shuffling is so that direct followup queries
2179 # get handled first 2800 # get handled first
2191 } else { 2812 } else {
2192 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2813 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2193 } 2814 }
2194 } 2815 }
2195 }, 2816 },
2817 on_exticmd => sub {
2818 my ($ns, $buf) = @_;
2819
2820 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2821
2822 if (ref $msg) {
2823 my ($type, $reply, @payload) =
2824 "ARRAY" eq ref $msg
2825 ? @$msg
2826 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2827
2828 my @reply;
2829
2830 if (my $cb = $EXTICMD{$type}) {
2831 @reply = $cb->($ns, @payload);
2832 }
2833
2834 $ns->ext_reply ($reply, @reply)
2835 if $reply;
2836
2837 } else {
2838 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2839 }
2840
2841 cf::override;
2842 },
2196); 2843);
2197 2844
2198=item $client->async (\&cb) 2845=item $client->async (\&cb)
2199 2846
2200Create a new coroutine, running the specified callback. The coroutine will 2847Create a new coroutine, running the specified callback. The coroutine will
2241our $safe = new Safe "safe"; 2888our $safe = new Safe "safe";
2242our $safe_hole = new Safe::Hole; 2889our $safe_hole = new Safe::Hole;
2243 2890
2244$SIG{FPE} = 'IGNORE'; 2891$SIG{FPE} = 'IGNORE';
2245 2892
2246$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2893$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math
2895 grepstart grepwhile mapstart mapwhile
2896 sort time
2897));
2247 2898
2248# here we export the classes and methods available to script code 2899# here we export the classes and methods available to script code
2249 2900
2250=pod 2901=pod
2251 2902
2252The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2253 2904
2254 cf::object contr pay_amount pay_player map 2905 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr
2908
2255 cf::object::player player 2909 cf::object::player
2256 cf::player peaceful 2910 player
2257 cf::map trigger 2911
2912 cf::player
2913 peaceful
2914
2915 cf::map
2916 trigger
2258 2917
2259=cut 2918=cut
2260 2919
2261for ( 2920for (
2262 ["cf::object" => qw(contr pay_amount pay_player map)], 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race
2923 decrease_ob_nr destroy)],
2263 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2264 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2265 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2266) { 2927) {
2267 no strict 'refs'; 2928 no strict 'refs';
2338=back 2999=back
2339 3000
2340=cut 3001=cut
2341 3002
2342############################################################################# 3003#############################################################################
2343
2344=head2 EXTENSION DATABASE SUPPORT
2345
2346Crossfire maintains a very simple database for extension use. It can
2347currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2348convert to/from binary).
2349
2350The parameter C<$family> should best start with the name of the extension
2351using it, it should be unique.
2352
2353=over 4
2354
2355=item $value = cf::db_get $family => $key
2356
2357Returns a single value from the database.
2358
2359=item cf::db_put $family => $key => $value
2360
2361Stores the given C<$value> in the family.
2362
2363=cut
2364
2365our $DB;
2366
2367sub db_init {
2368 unless ($DB) {
2369 $DB = BDB::db_create $DB_ENV;
2370
2371 cf::sync_job {
2372 eval {
2373 $DB->set_flags (BDB::CHKSUM);
2374
2375 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2376 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2377 cf::cleanup "db_open(db): $!" if $!;
2378 };
2379 cf::cleanup "db_open(db): $@" if $@;
2380 };
2381 }
2382}
2383
2384sub db_get($$) {
2385 my $key = "$_[0]/$_[1]";
2386
2387 cf::sync_job {
2388 BDB::db_get $DB, undef, $key, my $data;
2389
2390 $! ? ()
2391 : $data
2392 }
2393}
2394
2395sub db_put($$$) {
2396 BDB::dbreq_pri 4;
2397 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2398}
2399
2400=item cf::cache $id => [$paths...], $processversion => $process
2401
2402Generic caching function that returns the value of the resource $id,
2403caching and regenerating as required.
2404
2405This function can block.
2406
2407=cut
2408
2409sub cache {
2410 my ($id, $src, $processversion, $process) = @_;
2411
2412 my $meta =
2413 join "\x00",
2414 $processversion,
2415 map {
2416 aio_stat $_
2417 and Carp::croak "$_: $!";
2418
2419 ($_, (stat _)[7,9])
2420 } @$src;
2421
2422 my $dbmeta = db_get cache => "$id/meta";
2423 if ($dbmeta ne $meta) {
2424 # changed, we may need to process
2425
2426 my @data;
2427 my $md5;
2428
2429 for (0 .. $#$src) {
2430 0 <= aio_load $src->[$_], $data[$_]
2431 or Carp::croak "$src->[$_]: $!";
2432 }
2433
2434 # if processing is expensive, check
2435 # checksum first
2436 if (1) {
2437 $md5 =
2438 join "\x00",
2439 $processversion,
2440 map {
2441 Coro::cede;
2442 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2443 } 0.. $#$src;
2444
2445
2446 my $dbmd5 = db_get cache => "$id/md5";
2447 if ($dbmd5 eq $md5) {
2448 db_put cache => "$id/meta", $meta;
2449
2450 return db_get cache => "$id/data";
2451 }
2452 }
2453
2454 my $t1 = Time::HiRes::time;
2455 my $data = $process->(\@data);
2456 my $t2 = Time::HiRes::time;
2457
2458 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2459
2460 db_put cache => "$id/data", $data;
2461 db_put cache => "$id/md5" , $md5;
2462 db_put cache => "$id/meta", $meta;
2463
2464 return $data;
2465 }
2466
2467 db_get cache => "$id/data"
2468}
2469
2470=item fork_call { }, $args
2471
2472Executes the given code block with the given arguments in a seperate
2473process, returning the results. Everything must be serialisable with
2474Coro::Storable. May, of course, block. Note that the executed sub may
2475never block itself or use any form of Event handling.
2476
2477=cut
2478
2479sub fork_call(&@) {
2480 my ($cb, @args) = @_;
2481
2482# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2483# or die "socketpair: $!";
2484 pipe my $fh1, my $fh2
2485 or die "pipe: $!";
2486
2487 if (my $pid = fork) {
2488 close $fh2;
2489
2490 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2491 $res = Coro::Storable::thaw $res;
2492
2493 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2494
2495 die $$res unless "ARRAY" eq ref $res;
2496
2497 return wantarray ? @$res : $res->[-1];
2498 } else {
2499 reset_signals;
2500 local $SIG{__WARN__};
2501 local $SIG{__DIE__};
2502 eval {
2503 close $fh1;
2504
2505 my @res = eval { $cb->(@args) };
2506 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2507 };
2508
2509 warn $@ if $@;
2510 _exit 0;
2511 }
2512}
2513
2514
2515
2516#############################################################################
2517# the server's init and main functions 3004# the server's init and main functions
2518 3005
2519sub load_facedata($) { 3006sub load_facedata($) {
2520 my ($path) = @_; 3007 my ($path) = @_;
3008
3009 # HACK to clear player env face cache, we need some signal framework
3010 # for this (global event?)
3011 %ext::player_env::MUSIC_FACE_CACHE = ();
3012
3013 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2521 3014
2522 warn "loading facedata from $path\n"; 3015 warn "loading facedata from $path\n";
2523 3016
2524 my $facedata; 3017 my $facedata;
2525 0 < aio_load $path, $facedata 3018 0 < aio_load $path, $facedata
2528 $facedata = Coro::Storable::thaw $facedata; 3021 $facedata = Coro::Storable::thaw $facedata;
2529 3022
2530 $facedata->{version} == 2 3023 $facedata->{version} == 2
2531 or cf::cleanup "$path: version mismatch, cannot proceed."; 3024 or cf::cleanup "$path: version mismatch, cannot proceed.";
2532 3025
3026 # patch in the exptable
3027 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3030 };
3031 cf::cede_to_tick;
3032
2533 { 3033 {
2534 my $faces = $facedata->{faceinfo}; 3034 my $faces = $facedata->{faceinfo};
2535 3035
2536 while (my ($face, $info) = each %$faces) { 3036 while (my ($face, $info) = each %$faces) {
2537 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3037 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2538 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3038 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap};
2539 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2540 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2541 Coro::cede; 3042
3043 cf::cede_to_tick;
2542 } 3044 }
2543 3045
2544 while (my ($face, $info) = each %$faces) { 3046 while (my ($face, $info) = each %$faces) {
2545 next unless $info->{smooth}; 3047 next unless $info->{smooth};
2546 my $idx = cf::face::find $face 3048 my $idx = cf::face::find $face
2547 or next; 3049 or next;
2548 if (my $smooth = cf::face::find $info->{smooth}) { 3050 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth;
2549 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2550 } else { 3053 } else {
2551 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3054 warn "smooth face '$info->{smooth}' not found for face '$face'";
2552 } 3055 }
2553 Coro::cede; 3056
3057 cf::cede_to_tick;
2554 } 3058 }
2555 } 3059 }
2556 3060
2557 { 3061 {
2558 my $anims = $facedata->{animinfo}; 3062 my $anims = $facedata->{animinfo};
2559 3063
2560 while (my ($anim, $info) = each %$anims) { 3064 while (my ($anim, $info) = each %$anims) {
2561 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3065 cf::anim::set $anim, $info->{frames}, $info->{facings};
2562 Coro::cede; 3066 cf::cede_to_tick;
2563 } 3067 }
2564 3068
2565 cf::anim::invalidate_all; # d'oh 3069 cf::anim::invalidate_all; # d'oh
2566 } 3070 }
2567 3071
3072 {
3073 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource};
3076
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
3082
3083 if ($info->{type} & 1) {
3084 # prepend meta info
3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
3092 } else {
3093 $data = $info->{data};
3094 }
3095
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick;
3100 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 }
3120
2568 1 3121 1
2569} 3122}
2570 3123
3124register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_;
3126
3127 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v);
3129 }
3130};
3131
2571sub reload_regions { 3132sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = ();
3136
2572 load_resource_file "$MAPDIR/regions" 3137 load_resource_file "$MAPDIR/regions"
2573 or die "unable to load regions file\n"; 3138 or die "unable to load regions file\n";
3139
3140 for (cf::region::list) {
3141 $_->{match} = qr/$_->{match}/
3142 if exists $_->{match};
3143 }
2574} 3144}
2575 3145
2576sub reload_facedata { 3146sub reload_facedata {
2577 load_facedata "$DATADIR/facedata" 3147 load_facedata "$DATADIR/facedata"
2578 or die "unable to load facedata\n"; 3148 or die "unable to load facedata\n";
2579} 3149}
2580 3150
2581sub reload_archetypes { 3151sub reload_archetypes {
2582 load_resource_file "$DATADIR/archetypes" 3152 load_resource_file "$DATADIR/archetypes"
2583 or die "unable to load archetypes\n"; 3153 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
3157 load_resource_file "$DATADIR/archetypes"
3158 or die "unable to load archetypes\n";
2584} 3159}
2585 3160
2586sub reload_treasures { 3161sub reload_treasures {
2587 load_resource_file "$DATADIR/treasures" 3162 load_resource_file "$DATADIR/treasures"
2588 or die "unable to load treasurelists\n"; 3163 or die "unable to load treasurelists\n";
2591sub reload_resources { 3166sub reload_resources {
2592 warn "reloading resource files...\n"; 3167 warn "reloading resource files...\n";
2593 3168
2594 reload_regions; 3169 reload_regions;
2595 reload_facedata; 3170 reload_facedata;
3171 #reload_archetypes;#d#
2596 reload_archetypes; 3172 reload_archetypes;
2597 reload_treasures; 3173 reload_treasures;
2598 3174
2599 warn "finished reloading resource files\n"; 3175 warn "finished reloading resource files\n";
2600} 3176}
2601 3177
2602sub init { 3178sub init {
2603 reload_resources; 3179 reload_resources;
2604} 3180}
2605 3181
2606sub cfg_load { 3182sub reload_config {
2607 open my $fh, "<:utf8", "$CONFDIR/config" 3183 open my $fh, "<:utf8", "$CONFDIR/config"
2608 or return; 3184 or return;
2609 3185
2610 local $/; 3186 local $/;
2611 *CFG = YAML::Syck::Load <$fh>; 3187 *CFG = YAML::Syck::Load <$fh>;
2627sub main { 3203sub main {
2628 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
2629 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
2630 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2631 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
2632 Event::one_event; 3209 Event::one_event;
2633 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
2634 }; 3211 };
2635 3212
2636 cfg_load; 3213 reload_config;
2637 db_init; 3214 db_init;
2638 load_extensions; 3215 load_extensions;
2639 3216
2640 $TICK_WATCHER->start; 3217 $TICK_WATCHER->start;
2641 Event::loop; 3218 Event::loop;
2657 }, 3234 },
2658 ); 3235 );
2659 } 3236 }
2660} 3237}
2661 3238
3239sub write_runtime {
3240 my $runtime = "$LOCALDIR/runtime";
3241
3242 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time.
3244
3245 IO::AIO::aio_utime $runtime, undef, undef;
3246
3247 my $guard = cf::lock_acquire "write_runtime";
3248
3249 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3250 or return;
3251
3252 my $value = $cf::RUNTIME + 90 + 10;
3253 # 10 is the runtime save interval, for a monotonic clock
3254 # 60 allows for the watchdog to kill the server.
3255
3256 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3257 and return;
3258
3259 # always fsync - this file is important
3260 aio_fsync $fh
3261 and return;
3262
3263 # touch it again to show we are up-to-date
3264 aio_utime $fh, undef, undef;
3265
3266 close $fh
3267 or return;
3268
3269 aio_rename "$runtime~", $runtime
3270 and return;
3271
3272 warn "runtime file written.\n";
3273
3274 1
3275}
3276
2662sub emergency_save() { 3277sub emergency_save() {
2663 my $freeze_guard = cf::freeze_mainloop; 3278 my $freeze_guard = cf::freeze_mainloop;
2664 3279
2665 warn "enter emergency perl save\n"; 3280 warn "enter emergency perl save\n";
2666 3281
2670 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
2671 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
2672 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
2673 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
2674 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2675 $pl->save; 3291 $pl->save;
2676 } 3292 }
2677 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
2678 3294
2679 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
2741 %EXT_CORO = (); 3357 %EXT_CORO = ();
2742 3358
2743 warn "removing commands"; 3359 warn "removing commands";
2744 %COMMAND = (); 3360 %COMMAND = ();
2745 3361
2746 warn "removing ext commands"; 3362 warn "removing ext/exti commands";
2747 %EXTCMD = (); 3363 %EXTCMD = ();
3364 %EXTICMD = ();
2748 3365
2749 warn "unloading/nuking all extensions"; 3366 warn "unloading/nuking all extensions";
2750 for my $pkg (@EXTS) { 3367 for my $pkg (@EXTS) {
2751 warn "... unloading $pkg"; 3368 warn "... unloading $pkg";
2752 3369
2795 warn "reloading cf.pm"; 3412 warn "reloading cf.pm";
2796 require cf; 3413 require cf;
2797 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2798 3415
2799 warn "loading config and database again"; 3416 warn "loading config and database again";
2800 cf::cfg_load; 3417 cf::reload_config;
2801 3418
2802 warn "loading extensions"; 3419 warn "loading extensions";
2803 cf::load_extensions; 3420 cf::load_extensions;
2804 3421
2805 warn "reattaching attachments to objects/players"; 3422 warn "reattaching attachments to objects/players";
2841register_command "reload" => sub { 3458register_command "reload" => sub {
2842 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
2843 3460
2844 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
2845 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
2846 async { reload_perl }; 3465 reload_perl;
3466 };
2847 } 3467 }
2848}; 3468};
2849 3469
2850unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
2851 3471
2870 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
2871 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
2872 $signal->wait; 3492 $signal->wait;
2873} 3493}
2874 3494
2875 my $min = 1e6;#d#
2876 my $avg = 10;
2877$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
2878 reentrant => 0, 3496 reentrant => 0,
2879 parked => 1, 3497 parked => 1,
2880 prio => 0, 3498 prio => 0,
2881 at => $NEXT_TICK || $TICK, 3499 at => $NEXT_TICK || $TICK,
2889 3507
2890 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
2891 3509
2892 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
2893 3511
2894 0 && sync_job {#d#
2895 for(1..10) {
2896 my $t = Event::time;
2897 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2898 or die;
2899
2900 $map->width (50);
2901 $map->height (50);
2902 $map->alloc;
2903 $map->_load_objects ("/tmp/x.map", 1);
2904 my $t = Event::time - $t;
2905
2906 #next unless $t < 0.0013;#d#
2907 if ($t < $min) {
2908 $min = $t;
2909 }
2910 $avg = $avg * 0.99 + $t * 0.01;
2911 }
2912 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2913 exit 0;
2914 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2915 };
2916
2917 $RUNTIME += $TICK; 3512 $RUNTIME += $TICK;
2918 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
2919 3514
2920 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2921 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
2922 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
2923 write_runtime 3519 write_runtime
2924 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
2925 }; 3521 };
2926 } 3522 }
2927 3523
2928# my $AFTER = Event::time;
2929# warn $AFTER - $NOW;#d#
2930
2931 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2932 $sig->send; 3525 $sig->send;
2933 } 3526 }
2934 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
2935 $sig->send; 3528 $sig->send;
2945 3538
2946 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
2947 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2948 3541
2949 _post_tick; 3542 _post_tick;
2950
2951
2952 }, 3543 },
2953); 3544);
2954 3545
2955{ 3546{
3547 BDB::min_parallel 8;
2956 BDB::max_poll_time $TICK * 0.1; 3548 BDB::max_poll_time $TICK * 0.1;
2957 $BDB_POLL_WATCHER = Event->io ( 3549 $BDB_POLL_WATCHER = Event->io (
2958 reentrant => 0, 3550 reentrant => 0,
2959 fd => BDB::poll_fileno, 3551 fd => BDB::poll_fileno,
2960 poll => 'r', 3552 poll => 'r',
2961 prio => 0, 3553 prio => 0,
2962 data => WF_AUTOCANCEL, 3554 data => WF_AUTOCANCEL,
2963 cb => \&BDB::poll_cb, 3555 cb => \&BDB::poll_cb,
2964 ); 3556 );
2965 BDB::min_parallel 8;
2966 3557
2967 BDB::set_sync_prepare { 3558 BDB::set_sync_prepare {
2968 my $status; 3559 my $status;
2969 my $current = $Coro::current; 3560 my $current = $Coro::current;
2970 ( 3561 (
2979 ) 3570 )
2980 }; 3571 };
2981 3572
2982 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
2983 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2984 3579
2985 cf::sync_job { 3580 cf::sync_job {
2986 eval { 3581 eval {
2987 BDB::db_env_open 3582 BDB::db_env_open
2988 $DB_ENV, 3583 $DB_ENV,
2990 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2991 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2992 0666; 3587 0666;
2993 3588
2994 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2995
2996 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2997 $DB_ENV->set_lk_detect;
2998 }; 3590 };
2999 3591
3000 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
3001 }; 3593 };
3002 } 3594 }
3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 );
3616 $BDB_TRICKLE_WATCHER = Event->timer (
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 );
3003} 3626}
3004 3627
3005{ 3628{
3006 IO::AIO::min_parallel 8; 3629 IO::AIO::min_parallel 8;
3007 3630
3010 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
3011 reentrant => 0, 3634 reentrant => 0,
3012 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
3013 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
3014 poll => 'r', 3637 poll => 'r',
3015 prio => 6, 3638 prio => 0,
3016 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
3017 ); 3640 );
3018} 3641}
3019 3642
3020my $_log_backtrace; 3643my $_log_backtrace;
3026 3649
3027 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
3028 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
3029 ++$_log_backtrace; 3652 ++$_log_backtrace;
3030 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3031 my @bt = fork_call { 3656 my @bt = fork_call {
3032 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3033 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3034 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3035 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines