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.269 by root, Tue May 22 21:35:26 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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
355 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
356 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
357 } 454 }
358 455
359 $time = Event::time - $time; 456 $time = Event::time - $time;
360 457
361 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
389 $EXT_CORO{$coro+0} = $coro; 486 $EXT_CORO{$coro+0} = $coro;
390 487
391 $coro 488 $coro
392} 489}
393 490
394sub write_runtime { 491=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 492
397 # first touch the runtime file to show we are still running: 493Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 494process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling.
399 497
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 498=cut
401 utime undef, undef, $fh; 499
500sub fork_call(&@) {
501 my ($cb, @args) = @_;
502
503 # we seemingly have to make a local copy of the whole thing,
504 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious)
506
507 my @res = Coro::Util::fork_eval {
508 reset_signals;
509 &$cb
510 }, @args;
511
512 wantarray ? @res : $res[-1]
513}
514
515=item $value = cf::db_get $family => $key
516
517Returns a single value from the environment database.
518
519=item cf::db_put $family => $key => $value
520
521Stores the given C<$value> in the family. It can currently store binary
522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
402 } 542 };
543 cf::cleanup "db_open(db): $@" if $@;
403 544
404 my $guard = cf::lock_acquire "write_runtime"; 545 $db
546}
405 547
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 548our $DB;
407 or return;
408 549
409 my $value = $cf::RUNTIME + 90 + 10; 550sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 551 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 552 $DB ||= db_table "db";
553 };
554}
412 555
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 556sub db_get($$) {
414 and return; 557 my $key = "$_[0]/$_[1]";
415 558
416 # always fsync - this file is important 559 cf::sync_job {
417 aio_fsync $fh 560 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 561
420 # touch it again to show we are up-to-date 562 $! ? ()
421 utime undef, undef, $fh; 563 : $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 564 }
565}
566
567sub db_put($$$) {
568 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
570}
571
572=item cf::cache $id => [$paths...], $processversion => $process
573
574Generic caching function that returns the value of the resource $id,
575caching and regenerating as required.
576
577This function can block.
578
579=cut
580
581sub cache {
582 my ($id, $src, $processversion, $process) = @_;
583
584 my $meta =
585 join "\x00",
586 $processversion,
587 map {
588 aio_stat $_
589 and Carp::croak "$_: $!";
590
591 ($_, (stat _)[7,9])
592 } @$src;
593
594 my $dbmeta = db_get cache => "$id/meta";
595 if ($dbmeta ne $meta) {
596 # changed, we may need to process
597
598 my @data;
599 my $md5;
600
601 for (0 .. $#$src) {
602 0 <= aio_load $src->[$_], $data[$_]
603 or Carp::croak "$src->[$_]: $!";
604 }
605
606 # if processing is expensive, check
607 # checksum first
608 if (1) {
609 $md5 =
610 join "\x00",
611 $processversion,
612 map {
613 cf::cede_to_tick;
614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
615 } 0.. $#$src;
616
617
618 my $dbmd5 = db_get cache => "$id/md5";
619 if ($dbmd5 eq $md5) {
620 db_put cache => "$id/meta", $meta;
621
622 return db_get cache => "$id/data";
623 }
624 }
625
626 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time;
629
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
631
632 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta;
635
636 return $data;
637 }
638
639 db_get cache => "$id/data"
432} 640}
433 641
434=item cf::datalog type => key => value, ... 642=item cf::datalog type => key => value, ...
435 643
436Log a datalog packet of the given type with the given key-value pairs. 644Log 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") 662attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
456 664
457In the following description, CLASS can be any of C<global>, C<object> 665In 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 666C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 667Crossfire TRT).
460 668
461=over 4 669=over 4
462 670
463=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
464 672
666 _attach $registry, $klass, @attach; 874 _attach $registry, $klass, @attach;
667 } 875 }
668 876
669 $obj->{$name} = \%arg; 877 $obj->{$name} = \%arg;
670 } else { 878 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 879 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 880 }
673 881
674 $obj->{_attachment}{$name} = undef; 882 $obj->{_attachment}{$name} = undef;
675} 883}
676 884
716 "; 924 ";
717 die if $@; 925 die if $@;
718} 926}
719 927
720our $override; 928our $override;
721our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 929our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
722 930
723sub override { 931sub override {
724 $override = 1; 932 $override = 1;
725 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
726} 934}
727 935
728sub do_invoke { 936sub do_invoke {
729 my $event = shift; 937 my $event = shift;
730 my $callbacks = shift; 938 my $callbacks = shift;
731 939
732 @invoke_results = (); 940 @INVOKE_RESULTS = ();
733 941
734 local $override; 942 local $override;
735 943
736 for (@$callbacks) { 944 for (@$callbacks) {
737 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
754 962
755Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
756 964
757This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 965This 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 966removed in future versions), and there is no public API to access override
759results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 968
761=back 969=back
762 970
763=cut 971=cut
764 972
765############################################################################# 973#############################################################################
766# object support 974# object support
975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
767 1017
768sub reattach { 1018sub reattach {
769 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 1020 my ($obj) = @_;
771 1021
818sub object_freezer_save { 1068sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
820 1070
821 sync_job { 1071 sync_job {
822 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
825 1076
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
830 close $fh; 1081 close $fh;
831 1082
832 if (@$objs) { 1083 if (@$objs) {
833 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
834 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
835 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
836 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
837 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
838 close $fh; 1089 close $fh;
839 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
840 } 1091 }
848 } 1099 }
849 } else { 1100 } else {
850 aio_unlink $filename; 1101 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
852 } 1103 }
853 } 1104 };
854} 1105}
855 1106
856sub object_freezer_as_string { 1107sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
858 1109
870 or return; 1121 or return;
871 1122
872 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
874 or return; 1125 or return;
875 $av = eval { (Storable::thaw $av)->{objs} };
876 }
877 1126
1127 my $st = eval { Coro::Storable::thaw $av }
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1130 }
1131
1132 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1134 $decname, length $data, scalar @{$av || []};
1135
880 return ($data, $av); 1136 ($data, $av)
881} 1137}
1138
1139=head2 COMMAND CALLBACKS
1140
1141=over 4
1142
1143=cut
882 1144
883############################################################################# 1145#############################################################################
884# command handling &c 1146# command handling &c
885 1147
886=item cf::register_command $name => \&callback($ob,$args); 1148=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1161 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1162}
901 1163
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1164=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1165
904Register a callbackf ro execution when the client sends an extcmd packet. 1166Register a callback for execution when the client sends an (synchronous)
1167extcmd packet. Ext commands will be processed in the order they are
1168received by the server, like other user commands. The first argument is
1169the logged-in player. Ext commands can only be processed after a player
1170has logged in successfully.
905 1171
906If the callback returns something, it is sent back as if reply was being 1172If the callback returns something, it is sent back as if reply was being
907called. 1173called.
908 1174
1175=item cf::register_exticmd $name => \&callback($ns,$packet);
1176
1177Register a callback for execution when the client sends an (asynchronous)
1178exticmd packet. Exti commands are processed by the server as soon as they
1179are received, i.e. out of order w.r.t. other commands. The first argument
1180is a client socket. Exti commands can be received anytime, even before
1181log-in.
1182
1183If the callback returns something, it is sent back as if reply was being
1184called.
1185
909=cut 1186=cut
910 1187
911sub register_extcmd { 1188sub register_extcmd {
912 my ($name, $cb) = @_; 1189 my ($name, $cb) = @_;
913 1190
914 $EXTCMD{$name} = $cb; 1191 $EXTCMD{$name} = $cb;
1192}
1193
1194sub register_exticmd {
1195 my ($name, $cb) = @_;
1196
1197 $EXTICMD{$name} = $cb;
915} 1198}
916 1199
917cf::player->attach ( 1200cf::player->attach (
918 on_command => sub { 1201 on_command => sub {
919 my ($pl, $name, $params) = @_; 1202 my ($pl, $name, $params) = @_;
928 cf::override; 1211 cf::override;
929 }, 1212 },
930 on_extcmd => sub { 1213 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1214 my ($pl, $buf) = @_;
932 1215
933 my $msg = eval { from_json $buf }; 1216 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1217
935 if (ref $msg) { 1218 if (ref $msg) {
1219 my ($type, $reply, @payload) =
1220 "ARRAY" eq ref $msg
1221 ? @$msg
1222 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1223
1224 my @reply;
1225
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1226 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1227 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1228 }
1229
1230 $pl->ext_reply ($reply, @reply)
1231 if $reply;
1232
941 } else { 1233 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1234 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1235 }
944 1236
945 cf::override; 1237 cf::override;
946 }, 1238 },
947); 1239);
948 1240
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 { 1241sub load_extensions {
1242 cf::sync_job {
1243 my %todo;
1244
984 for my $ext (<$LIBDIR/*.ext>) { 1245 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1246 next unless -r $path;
986 eval { 1247
987 load_extension $ext; 1248 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1249 my $base = $1;
1250 my $pkg = $1;
1251 $pkg =~ s/[^[:word:]]/_/g;
1252 $pkg = "ext::$pkg";
1253
1254 open my $fh, "<:utf8", $path
1255 or die "$path: $!";
1256
1257 my $source = do { local $/; <$fh> };
1258
1259 my %ext = (
1260 path => $path,
1261 base => $base,
1262 pkg => $pkg,
1263 );
1264
1265 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1266 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1267
1268 $ext{source} =
1269 "package $pkg; use strict; use utf8;\n"
1270 . "#line 1 \"$path\"\n{\n"
1271 . $source
1272 . "\n};\n1";
1273
1274 $todo{$base} = \%ext;
1275 }
1276
1277 my %done;
1278 while (%todo) {
1279 my $progress;
1280
1281 while (my ($k, $v) = each %todo) {
1282 for (split /,\s*/, $v->{meta}{depends}) {
1283 goto skip
1284 unless exists $done{$_};
1285 }
1286
1287 warn "... loading '$k' into '$v->{pkg}'\n";
1288
1289 unless (eval $v->{source}) {
1290 my $msg = $@ ? "$v->{path}: $@\n"
1291 : "$v->{base}: extension inactive.\n";
1292
1293 if (exists $v->{meta}{mandatory}) {
1294 warn $msg;
1295 warn "mandatory extension failed to load, exiting.\n";
1296 exit 1;
1297 }
1298
1299 warn $msg;
1300 }
1301
1302 $done{$k} = delete $todo{$k};
1303 push @EXTS, $v->{pkg};
1304 $progress = 1;
988 1 1305 }
989 } or warn "$ext not loaded: $@"; 1306
1307 skip:
1308 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1309 unless $progress;
1310 }
990 } 1311 };
991} 1312}
992 1313
993############################################################################# 1314#############################################################################
994 1315
1316=back
1317
995=head2 CORE EXTENSIONS 1318=head2 CORE EXTENSIONS
996 1319
997Functions and methods that extend core crossfire objects. 1320Functions and methods that extend core crossfire objects.
998 1321
999=cut 1322=cut
1003use Coro::AIO; 1326use Coro::AIO;
1004 1327
1005=head3 cf::player 1328=head3 cf::player
1006 1329
1007=over 4 1330=over 4
1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1008 1345
1009=item cf::player::find $login 1346=item cf::player::find $login
1010 1347
1011Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1012 1349
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1389
1053 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1054 or return; 1391 or return;
1392
1393 my $pl = cf::player::load_pl $f
1394 or return;
1395 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs;
1055 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1056 } 1398 }
1057 } 1399 }
1058} 1400}
1059 1401
1069 1411
1070 aio_mkdir playerdir $pl, 0770; 1412 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1413 $pl->{last_save} = $cf::RUNTIME;
1072 1414
1073 $pl->save_pl ($path); 1415 $pl->save_pl ($path);
1074 Coro::cede; 1416 cf::cede_to_tick;
1075} 1417}
1076 1418
1077sub new($) { 1419sub new($) {
1078 my ($login) = @_; 1420 my ($login) = @_;
1079 1421
1083 $self->{deny_save} = 1; 1425 $self->{deny_save} = 1;
1084 1426
1085 $cf::PLAYER{$login} = $self; 1427 $cf::PLAYER{$login} = $self;
1086 1428
1087 $self 1429 $self
1430}
1431
1432=item $player->send_msg ($channel, $msg, $color, [extra...])
1433
1434=cut
1435
1436sub send_msg {
1437 my $ns = shift->ns
1438 or return;
1439 $ns->send_msg (@_);
1088} 1440}
1089 1441
1090=item $pl->quit_character 1442=item $pl->quit_character
1091 1443
1092Nukes the player without looking back. If logged in, the connection will 1444Nukes the player without looking back. If logged in, the connection will
1147 or return []; 1499 or return [];
1148 1500
1149 my @logins; 1501 my @logins;
1150 1502
1151 for my $login (@$dirs) { 1503 for my $login (@$dirs) {
1504 my $path = path $login;
1505
1506 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1155 1512
1156 utf8::decode $login; 1513 utf8::decode $login;
1157 push @logins, $login; 1514 push @logins, $login;
1158 } 1515 }
1159 1516
1186 } 1543 }
1187 1544
1188 \@paths 1545 \@paths
1189} 1546}
1190 1547
1548=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1549
1550Expand crossfire pod fragments into protocol xml.
1551
1552=cut
1553
1554sub expand_cfpod {
1555 ((my $self), (local $_)) = @_;
1556
1557 # escape & and <
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560
1561 # this is buggy, it needs to properly take care of nested <'s
1562
1563 1 while
1564 # replace B<>, I<>, U<> etc.
1565 s/B<([^\>]*)>/<b>$1<\/b>/
1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1569 # replace G<male|female> tags
1570 || s{G<([^>|]*)\|([^>]*)>}{
1571 $self->gender ? $2 : $1
1572 }ge
1573 # replace H<hint text>
1574 || s{H<([^\>]*)>}
1575 {
1576 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "")
1579 [$self->{hintmode}]
1580 }ge;
1581
1582 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g;
1584
1585 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines
1590
1591 $_
1592}
1593
1594sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode}
1597}
1598
1191=item $player->ext_reply ($msgid, %msg) 1599=item $player->ext_reply ($msgid, @msg)
1192 1600
1193Sends an ext reply to the player. 1601Sends an ext reply to the player.
1194 1602
1195=cut 1603=cut
1196 1604
1197sub ext_reply($$%) { 1605sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1606 my ($self, $id, @msg) = @_;
1199 1607
1200 $msg{msgid} = $id; 1608 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1609}
1204 1610
1205=item $player->ext_event ($type, %msg) 1611=item $player->ext_msg ($type, @msg)
1206 1612
1207Sends an ext event to the client. 1613Sends an ext event to the client.
1208 1614
1209=cut 1615=cut
1210 1616
1211sub ext_event($$%) { 1617sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1618 my ($self, $type, @msg) = @_;
1213 1619
1214 $self->ns->ext_event ($type, %msg); 1620 $self->ns->ext_msg ($type, @msg);
1215} 1621}
1216 1622
1217=head3 cf::region 1623=head3 cf::region
1218 1624
1219=over 4 1625=over 4
1222 1628
1223package cf::region; 1629package cf::region;
1224 1630
1225=item cf::region::find_by_path $path 1631=item cf::region::find_by_path $path
1226 1632
1227Tries to decuce the probable region for a map knowing only its path. 1633Tries to decuce the likely region for a map knowing only its path.
1228 1634
1229=cut 1635=cut
1230 1636
1231sub find_by_path($) { 1637sub find_by_path($) {
1232 my ($path) = @_; 1638 my ($path) = @_;
1233 1639
1234 my ($match, $specificity); 1640 my ($match, $specificity);
1235 1641
1236 for my $region (list) { 1642 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1643 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1644 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1645 if $region->specificity > $specificity;
1240 } 1646 }
1241 } 1647 }
1242 1648
1306 my ($self, $merge) = @_; 1712 my ($self, $merge) = @_;
1307 1713
1308 # we have to keep some variables in memory intact 1714 # we have to keep some variables in memory intact
1309 local $self->{path}; 1715 local $self->{path};
1310 local $self->{load_path}; 1716 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1717
1314 $self->SUPER::thawer_merge ($merge); 1718 $self->SUPER::thawer_merge ($merge);
1315} 1719}
1316 1720
1317sub normalise { 1721sub normalise {
1364 $self->init; # pass $1 etc. 1768 $self->init; # pass $1 etc.
1365 return $self; 1769 return $self;
1366 } 1770 }
1367 } 1771 }
1368 1772
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1773 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1774 ()
1371} 1775}
1372 1776
1373sub init { 1777sub init {
1374 my ($self) = @_; 1778 my ($self) = @_;
1417 1821
1418 $_->change_map_light ($change) 1822 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1823 for grep $_->outdoor, values %cf::MAP;
1420} 1824}
1421 1825
1826sub decay_objects {
1827 my ($self) = @_;
1828
1829 return if $self->{deny_reset};
1830
1831 $self->do_decay_objects;
1832}
1833
1422sub unlink_save { 1834sub unlink_save {
1423 my ($self) = @_; 1835 my ($self) = @_;
1424 1836
1425 utf8::encode (my $save = $self->save_path); 1837 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1838 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1429 1841
1430sub load_header_from($) { 1842sub load_header_from($) {
1431 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1432 1844
1433 utf8::encode $path; 1845 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 or return; 1847 or return;
1848
1849 $self->_load_header ($f)
1850 or return;
1851
1852 local $MAP_LOADING{$self->{path}} = $self;
1853 $f->resolve_delayed_derefs;
1439 1854
1440 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1441 1856
1442 1 1857 1
1443} 1858}
1482 $self->load_header_orig 1897 $self->load_header_orig
1483 or return; 1898 or return;
1484 $self->prepare_orig; 1899 $self->prepare_orig;
1485 } 1900 }
1486 1901
1902 $self->{deny_reset} = 1
1903 if $self->no_reset;
1904
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1905 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1906 unless $self->default_region;
1489 1907
1490 1 1908 1
1491} 1909}
1494sub find { 1912sub find {
1495 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1496 1914
1497 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1498 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1500 1919
1501 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1502 my $guard = cf::lock_acquire "map_find:$path"; 1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1503 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1504 or return; 1925 or return;
1505 1926
1506 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1507 1928
1508 $map->load_header 1929 $map->load_header
1509 or return; 1930 or return;
1510 1931
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1514 $map->reset; 1937 $map->reset;
1515 undef $guard;
1516 return find $path; 1938 return find $path;
1517 } 1939 }
1518 1940
1519 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1520 } 1942 }
1529 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1530 1952
1531 my $path = $self->{path}; 1953 my $path = $self->{path};
1532 1954
1533 { 1955 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1535 1957
1958 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 1960
1538 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1539 1962
1540 $self->alloc; 1963 $self->alloc;
1541 1964
1542 $self->pre_load; 1965 $self->pre_load;
1543 Coro::cede; 1966 cf::cede_to_tick;
1544 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1546 or return; 1971 or return;
1547 1972
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1550 1975
1551 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 1977 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 1980 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1556 } 1984 }
1557 } 1985 }
1558 1986
1559 Coro::cede; 1987 $f->resolve_delayed_derefs;
1988
1989 cf::cede_to_tick;
1560 # now do the right thing for maps 1990 # now do the right thing for maps
1561 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 1993 unless $self->difficulty;
1564 Coro::cede; 1994 cf::cede_to_tick;
1565 1995
1566 unless ($self->{deny_activate}) { 1996 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 1997 $self->decay_objects;
1568 $self->fix_auto_apply; 1998 $self->fix_auto_apply;
1569 $self->update_buttons; 1999 $self->update_buttons;
1570 Coro::cede; 2000 cf::cede_to_tick;
1571 $self->set_darkness_map; 2001 $self->set_darkness_map;
1572 Coro::cede; 2002 cf::cede_to_tick;
1573 $self->activate; 2003 $self->activate;
1574 } 2004 }
2005
2006 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME);
1575 2008
1576 $self->in_memory (cf::MAP_IN_MEMORY); 2009 $self->in_memory (cf::MAP_IN_MEMORY);
1577 } 2010 }
1578 2011
1579 $self->post_load; 2012 $self->post_load;
1583 my ($self, $ob) = @_; 2016 my ($self, $ob) = @_;
1584 2017
1585 return find "~" . $ob->name . "/" . $self->{path} 2018 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 2019 if $self->per_player;
1587 2020
2021# return find "?party/" . $ob->name . "/" . $self->{path}
2022# if $self->per_party;
2023
1588 $self 2024 $self
1589} 2025}
1590 2026
1591# find and load all maps in the 3x3 area around a map 2027# find and load all maps in the 3x3 area around a map
1592sub load_diag { 2028sub load_neighbours {
1593 my ($map) = @_; 2029 my ($map) = @_;
1594 2030
1595 my @diag; # diagonal neighbours 2031 my @neigh; # diagonal neighbours
1596 2032
1597 for (0 .. 3) { 2033 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 2034 my $neigh = $map->tile_path ($_)
1599 or next; 2035 or next;
1600 $neigh = find $neigh, $map 2036 $neigh = find $neigh, $map
1601 or next; 2037 or next;
1602 $neigh->load; 2038 $neigh->load;
1603 2039
2040 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2041 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2042 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2043 }
1607 2044
1608 for (@diag) { 2045 for (grep defined $_->[0], @neigh) {
2046 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2047 my $neigh = find $path, $origin
1610 or next; 2048 or next;
1611 $neigh->load; 2049 $neigh->load;
1612 } 2050 }
1613} 2051}
1614 2052
1619} 2057}
1620 2058
1621sub do_load_sync { 2059sub do_load_sync {
1622 my ($map) = @_; 2060 my ($map) = @_;
1623 2061
2062 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2063 if $Coro::current == $Coro::main;
2064
1624 cf::sync_job { $map->load }; 2065 cf::sync_job { $map->load };
1625} 2066}
1626 2067
1627our %MAP_PREFETCH; 2068our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2069our $MAP_PREFETCHER = undef;
1629 2070
1630sub find_async { 2071sub find_async {
1631 my ($path, $origin) = @_; 2072 my ($path, $origin, $load) = @_;
1632 2073
1633 $path = normalise $path, $origin && $origin->{path}; 2074 $path = normalise $path, $origin && $origin->{path};
1634 2075
1635 if (my $map = $cf::MAP{$path}) { 2076 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637 } 2078 }
1638 2079
1639 undef $MAP_PREFETCH{$path}; 2080 $MAP_PREFETCH{$path} |= $load;
2081
1640 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1641 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2087 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2088 $map->load if $v;
2089 }
1646 2090
1647 delete $MAP_PREFETCH{$path}; 2091 delete $MAP_PREFETCH{$k};
1648 } 2092 }
1649 } 2093 }
1650 undef $MAP_PREFETCHER; 2094 undef $MAP_PREFETCHER;
1651 }; 2095 };
1652 $MAP_PREFETCHER->prio (6); 2096 $MAP_PREFETCHER->prio (6);
1655} 2099}
1656 2100
1657sub save { 2101sub save {
1658 my ($self) = @_; 2102 my ($self) = @_;
1659 2103
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 2105
1662 $self->{last_save} = $cf::RUNTIME; 2106 $self->{last_save} = $cf::RUNTIME;
1663 2107
1664 return unless $self->dirty; 2108 return unless $self->dirty;
1665 2109
1671 return if $self->{deny_save}; 2115 return if $self->{deny_save};
1672 2116
1673 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
1674 2118
1675 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
1676 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
1677 }; 2122 };
1678 2123
1679 if ($uniq) { 2124 if ($uniq) {
1680 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1688 my ($self) = @_; 2133 my ($self) = @_;
1689 2134
1690 # save first because save cedes 2135 # save first because save cedes
1691 $self->save; 2136 $self->save;
1692 2137
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2139
1695 return if $self->players; 2140 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save}; 2142 return if $self->{deny_save};
1698 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
1699 $self->clear; 2148 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2149}
1702 2150
1703sub reset_at { 2151sub reset_at {
1704 my ($self) = @_; 2152 my ($self) = @_;
1705 2153
1706 # TODO: safety, remove and allow resettable per-player maps 2154 # 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}; 2155 return 1e99 if $self->{deny_reset};
1709 2156
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2157 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2158 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 2159
1723 my ($self) = @_; 2170 my ($self) = @_;
1724 2171
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2173
1727 return if $self->players; 2174 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2175
1730 warn "resetting map ", $self->path;#d# 2176 warn "resetting map ", $self->path;
1731 2177
1732 $self->in_memory (cf::MAP_SWAPPED); 2178 $self->in_memory (cf::MAP_SWAPPED);
1733 2179
1734 # need to save uniques path 2180 # need to save uniques path
1735 unless ($self->{deny_save}) { 2181 unless ($self->{deny_save}) {
1739 if $uniq; 2185 if $uniq;
1740 } 2186 }
1741 2187
1742 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
1743 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2192 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2193
1748 $self->unlink_save; 2194 $self->unlink_save;
1749 $self->destroy; 2195 $self->destroy;
1750} 2196}
1751 2197
1752my $nuke_counter = "aaaa"; 2198my $nuke_counter = "aaaa";
1753 2199
1754sub nuke { 2200sub nuke {
1755 my ($self) = @_; 2201 my ($self) = @_;
1756 2202
2203 {
2204 my $lock = cf::lock_acquire "map_data:$self->{path}";
2205
1757 delete $cf::MAP{$self->path}; 2206 delete $cf::MAP{$self->path};
1758 2207
1759 $self->unlink_save; 2208 $self->unlink_save;
1760 2209
1761 bless $self, "cf::map"; 2210 bless $self, "cf::map";
1762 delete $self->{deny_reset}; 2211 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2212 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2213 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2215
1767 $cf::MAP{$self->path} = $self; 2216 $cf::MAP{$self->path} = $self;
2217 }
1768 2218
1769 $self->reset; # polite request, might not happen 2219 $self->reset; # polite request, might not happen
2220}
2221
2222=item $maps = cf::map::tmp_maps
2223
2224Returns an arrayref with all map paths of currently instantiated and saved
2225maps. May block.
2226
2227=cut
2228
2229sub tmp_maps() {
2230 [
2231 map {
2232 utf8::decode $_;
2233 /\.map$/
2234 ? normalise $_
2235 : ()
2236 } @{ aio_readdir $TMPDIR or [] }
2237 ]
2238}
2239
2240=item $maps = cf::map::random_maps
2241
2242Returns an arrayref with all map paths of currently instantiated and saved
2243random maps. May block.
2244
2245=cut
2246
2247sub random_maps() {
2248 [
2249 map {
2250 utf8::decode $_;
2251 /\.map$/
2252 ? normalise "?random/$_"
2253 : ()
2254 } @{ aio_readdir $RANDOMDIR or [] }
2255 ]
1770} 2256}
1771 2257
1772=item cf::map::unique_maps 2258=item cf::map::unique_maps
1773 2259
1774Returns an arrayref of paths of all shared maps that have 2260Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2261instantiated unique items. May block.
1776 2262
1777=cut 2263=cut
1778 2264
1779sub unique_maps() { 2265sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2266 [
1781 or return; 2267 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2268 utf8::decode $_;
1787 next if /\.pst$/; 2269 /\.map$/
1788 next unless /^$PATH_SEP/o; 2270 ? normalise $_
1789 2271 : ()
1790 push @paths, cf::map::normalise $_; 2272 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2273 ]
1792
1793 \@paths
1794} 2274}
1795 2275
1796package cf; 2276package cf;
1797 2277
1798=back 2278=back
1816 map { $_, inv_recursive_ $_->inv } @_ 2296 map { $_, inv_recursive_ $_->inv } @_
1817} 2297}
1818 2298
1819sub inv_recursive { 2299sub inv_recursive {
1820 inv_recursive_ inv $_[0] 2300 inv_recursive_ inv $_[0]
2301}
2302
2303=item $ref = $ob->ref
2304
2305creates and returns a persistent reference to an objetc that can be stored as a string.
2306
2307=item $ob = cf::object::deref ($refstring)
2308
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block.
2311
2312=cut
2313
2314sub deref {
2315 my ($ref) = @_;
2316
2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2318 my ($uuid, $name) = ($1, $2);
2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2320 or return;
2321 $pl->ob->uuid eq $uuid
2322 or return;
2323
2324 $pl->ob
2325 } else {
2326 warn "$ref: cannot resolve object reference\n";
2327 undef
2328 }
1821} 2329}
1822 2330
1823package cf; 2331package cf;
1824 2332
1825=back 2333=back
1844 2352
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2353 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2354
1847 if ($self->{record_replies}) { 2355 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2356 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2357
1849 } else { 2358 } else {
2359 my $pl = $self->contr;
2360
2361 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2362 my $dialog = $pl->{npc_dialog};
2363 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2364
2365 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2366 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2367 $self->message ($msg, $flags);
2368 }
1852 } 2369 }
2370}
2371
2372=item $object->send_msg ($channel, $msg, $color, [extra...])
2373
2374=cut
2375
2376sub cf::object::send_msg {
2377 my $pl = shift->contr
2378 or return;
2379 $pl->send_msg (@_);
1853} 2380}
1854 2381
1855=item $player_object->may ("access") 2382=item $player_object->may ("access")
1856 2383
1857Returns wether the given player is authorized to access resource "access" 2384Returns wether the given player is authorized to access resource "access"
1904 $self->deactivate_recursive; 2431 $self->deactivate_recursive;
1905 2432
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2433 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2434
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2435 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 2436 if $self->map && $self->map->{path} ne "{link}";
1910 2437
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2438 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 2439}
1913 2440
1914sub cf::object::player::leave_link { 2441sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2442 my ($self, $map, $x, $y) = @_;
2443
2444 return unless $self->contr->active;
1916 2445
1917 my $link_pos = delete $self->{_link_pos}; 2446 my $link_pos = delete $self->{_link_pos};
1918 2447
1919 unless ($map) { 2448 unless ($map) {
1920 # restore original map position 2449 # restore original map position
1934 # use -1 or undef as default coordinates, not 0, 0 2463 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2464 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2465 if $x <=0 && $y <= 0;
1937 2466
1938 $map->load; 2467 $map->load;
1939 $map->load_diag; 2468 $map->load_neighbours;
1940 2469
1941 return unless $self->contr->active; 2470 return unless $self->contr->active;
1942 $self->activate_recursive; 2471 $self->activate_recursive;
1943 2472
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2473 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2474 $self->enter_map ($map, $x, $y);
1946} 2475}
1947 2476
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)]) 2477=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1981 2478
1982Moves the player to the given map-path and coordinates by first freezing 2479Moves the player to the given map-path and coordinates by first freezing
1983her, loading and preparing them map, calling the provided $check callback 2480her, loading and preparing them map, calling the provided $check callback
1984that has to return the map if sucecssful, and then unfreezes the player on 2481that has to return the map if sucecssful, and then unfreezes the player on
1985the new (success) or old (failed) map position. 2482the new (success) or old (failed) map position. In either case, $done will
2483be called at the end of this process.
1986 2484
1987=cut 2485=cut
2486
2487our $GOTOGEN;
1988 2488
1989sub cf::object::player::goto { 2489sub cf::object::player::goto {
1990 my ($self, $path, $x, $y, $check) = @_; 2490 my ($self, $path, $x, $y, $check, $done) = @_;
2491
2492 # do generation counting so two concurrent goto's will be executed in-order
2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1991 2494
1992 $self->enter_link; 2495 $self->enter_link;
1993 2496
1994 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
1995 my $map = eval { 2519 my $map = eval {
1996 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
1997 2521
1998 if ($map) { 2522 if ($map) {
1999 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2000 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2001 } else { 2525 } else {
2002 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2003 } 2527 }
2004 2528
2005 $map 2529 $map
2006 }; 2530 };
2007 2531
2008 if ($@) { 2532 if ($@) {
2009 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); 2533 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2010 LOG llevError | logBacktrace, Carp::longmess $@; 2534 LOG llevError | logBacktrace, Carp::longmess $@;
2011 } 2535 }
2012 2536
2537 if ($gen == $self->{_goto_generation}) {
2538 delete $self->{_goto_generation};
2013 $self->leave_link ($map, $x, $y); 2539 $self->leave_link ($map, $x, $y);
2540 }
2541
2542 $done->() if $done;
2014 })->prio (1); 2543 })->prio (1);
2015} 2544}
2016 2545
2017=item $player_object->enter_exit ($exit_object) 2546=item $player_object->enter_exit ($exit_object)
2018 2547
2087 my $hp = $exit->stats->hp; 2616 my $hp = $exit->stats->hp;
2088 my $sp = $exit->stats->sp; 2617 my $sp = $exit->stats->sp;
2089 2618
2090 $self->enter_link; 2619 $self->enter_link;
2091 2620
2621 # if exit is damned, update players death & WoR home-position
2622 $self->contr->savebed ($slaying, $hp, $sp)
2623 if $exit->flag (FLAG_DAMNED);
2624
2092 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2093 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2094 unless (eval { 2629 unless (eval {
2095 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2096 2631
2097 1; 2632 1;
2123 2658
2124 utf8::encode $text; 2659 utf8::encode $text;
2125 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2660 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2126} 2661}
2127 2662
2663=item $client->send_msg ($channel, $msg, $color, [extra...])
2664
2665Send a drawinfo or msg packet to the client, formatting the msg for the
2666client if neccessary. C<$type> should be a string identifying the type of
2667the message, with C<log> being the default. If C<$color> is negative, suppress
2668the message unless the client supports the msg packet.
2669
2670=cut
2671
2672our %CHANNEL = (
2673 "c/identify" => {
2674 id => "infobox",
2675 title => "Identify",
2676 reply => undef,
2677 tooltip => "Items recently identified",
2678 },
2679 "c/examine" => {
2680 id => "infobox",
2681 title => "Examine",
2682 reply => undef,
2683 tooltip => "Signs and other items you examined",
2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2691);
2692
2693sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_;
2695
2696 $msg = $self->pl->expand_cfpod ($msg);
2697
2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2699
2700 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2709 } elsif (ref $channel) {
2710 # send meta info to client, if not yet sent
2711 unless (exists $self->{channel}{$channel->{id}}) {
2712 $self->{channel}{$channel->{id}} = $channel;
2713 $self->ext_msg (channel_info => $channel)
2714 if $self->can_msg;
2715 }
2716
2717 $channel = $channel->{id};
2718 }
2719
2720 return unless @extra || length $msg;
2721
2722 if ($self->can_msg) {
2723 # default colour, mask it out
2724 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2725 if $color & cf::NDI_DEF;
2726
2727 $self->send_packet ("msg " . $self->{json_coder}->encode (
2728 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2729 } else {
2730 if ($color >= 0) {
2731 # replace some tags by gcfclient-compatible ones
2732 for ($msg) {
2733 1 while
2734 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2735 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2736 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2737 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2738 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2739 }
2740
2741 $color &= cf::NDI_COLOR_MASK;
2742
2743 utf8::encode $msg;
2744
2745 if (0 && $msg =~ /\[/) {
2746 # COMMAND/INFO
2747 $self->send_packet ("drawextinfo $color 10 8 $msg")
2748 } else {
2749 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2750 $self->send_packet ("drawinfo $color $msg")
2751 }
2752 }
2753 }
2754}
2755
2128=item $client->ext_event ($type, %msg) 2756=item $client->ext_msg ($type, @msg)
2129 2757
2130Sends an exti event to the client. 2758Sends an ext event to the client.
2131 2759
2132=cut 2760=cut
2133 2761
2134sub cf::client::ext_event($$%) { 2762sub cf::client::ext_msg($$@) {
2135 my ($self, $type, %msg) = @_; 2763 my ($self, $type, @msg) = @_;
2136 2764
2765 if ($self->extcmd == 2) {
2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2767 } elsif ($self->extcmd == 1) { # TODO: remove
2137 $msg{msgtype} = "event_$type"; 2768 push @msg, msgtype => "event_$type";
2138 $self->send_packet ("ext " . cf::to_json \%msg); 2769 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2770 }
2771}
2772
2773=item $client->ext_reply ($msgid, @msg)
2774
2775Sends an ext reply to the client.
2776
2777=cut
2778
2779sub cf::client::ext_reply($$@) {
2780 my ($self, $id, @msg) = @_;
2781
2782 if ($self->extcmd == 2) {
2783 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2784 } elsif ($self->extcmd == 1) {
2785 #TODO: version 1, remove
2786 unshift @msg, msgtype => "reply", msgid => $id;
2787 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2788 }
2139} 2789}
2140 2790
2141=item $success = $client->query ($flags, "text", \&cb) 2791=item $success = $client->query ($flags, "text", \&cb)
2142 2792
2143Queues a query to the client, calling the given callback with 2793Queues a query to the client, calling the given callback with
2144the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2794the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2145C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2795C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2146 2796
2147Queries can fail, so check the return code. Or don't, as queries will become 2797Queries can fail, so check the return code. Or don't, as queries will
2148reliable at some point in the future. 2798become reliable at some point in the future.
2149 2799
2150=cut 2800=cut
2151 2801
2152sub cf::client::query { 2802sub cf::client::query {
2153 my ($self, $flags, $text, $cb) = @_; 2803 my ($self, $flags, $text, $cb) = @_;
2161 utf8::encode $text; 2811 utf8::encode $text;
2162 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2812 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2163 2813
2164 $self->send_packet ($self->{query_queue}[0][0]) 2814 $self->send_packet ($self->{query_queue}[0][0])
2165 if @{ $self->{query_queue} } == 1; 2815 if @{ $self->{query_queue} } == 1;
2816
2817 1
2166} 2818}
2167 2819
2168cf::client->attach ( 2820cf::client->attach (
2821 on_connect => sub {
2822 my ($ns) = @_;
2823
2824 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2825 },
2169 on_reply => sub { 2826 on_reply => sub {
2170 my ($ns, $msg) = @_; 2827 my ($ns, $msg) = @_;
2171 2828
2172 # this weird shuffling is so that direct followup queries 2829 # this weird shuffling is so that direct followup queries
2173 # get handled first 2830 # get handled first
2185 } else { 2842 } else {
2186 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2843 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2187 } 2844 }
2188 } 2845 }
2189 }, 2846 },
2847 on_exticmd => sub {
2848 my ($ns, $buf) = @_;
2849
2850 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2851
2852 if (ref $msg) {
2853 my ($type, $reply, @payload) =
2854 "ARRAY" eq ref $msg
2855 ? @$msg
2856 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2857
2858 my @reply;
2859
2860 if (my $cb = $EXTICMD{$type}) {
2861 @reply = $cb->($ns, @payload);
2862 }
2863
2864 $ns->ext_reply ($reply, @reply)
2865 if $reply;
2866
2867 } else {
2868 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2869 }
2870
2871 cf::override;
2872 },
2190); 2873);
2191 2874
2192=item $client->async (\&cb) 2875=item $client->async (\&cb)
2193 2876
2194Create a new coroutine, running the specified callback. The coroutine will 2877Create a new coroutine, running the specified callback. The coroutine will
2235our $safe = new Safe "safe"; 2918our $safe = new Safe "safe";
2236our $safe_hole = new Safe::Hole; 2919our $safe_hole = new Safe::Hole;
2237 2920
2238$SIG{FPE} = 'IGNORE'; 2921$SIG{FPE} = 'IGNORE';
2239 2922
2240$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2923$safe->permit_only (Opcode::opset qw(
2924 :base_core :base_mem :base_orig :base_math
2925 grepstart grepwhile mapstart mapwhile
2926 sort time
2927));
2241 2928
2242# here we export the classes and methods available to script code 2929# here we export the classes and methods available to script code
2243 2930
2244=pod 2931=pod
2245 2932
2246The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2247 2934
2248 cf::object contr pay_amount pay_player map 2935 cf::object
2936 contr pay_amount pay_player map x y force_find force_add destroy
2937 insert remove name archname title slaying race decrease_ob_nr
2938
2249 cf::object::player player 2939 cf::object::player
2250 cf::player peaceful 2940 player
2251 cf::map trigger 2941
2942 cf::player
2943 peaceful
2944
2945 cf::map
2946 trigger
2252 2947
2253=cut 2948=cut
2254 2949
2255for ( 2950for (
2256 ["cf::object" => qw(contr pay_amount pay_player map)], 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2952 insert remove inv name archname title slaying race
2953 decrease_ob_nr destroy)],
2257 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2258 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2259 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2260) { 2957) {
2261 no strict 'refs'; 2958 no strict 'refs';
2332=back 3029=back
2333 3030
2334=cut 3031=cut
2335 3032
2336############################################################################# 3033#############################################################################
2337
2338=head2 EXTENSION DATABASE SUPPORT
2339
2340Crossfire maintains a very simple database for extension use. It can
2341currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2342convert to/from binary).
2343
2344The parameter C<$family> should best start with the name of the extension
2345using it, it should be unique.
2346
2347=over 4
2348
2349=item $value = cf::db_get $family => $key
2350
2351Returns a single value from the database.
2352
2353=item cf::db_put $family => $key => $value
2354
2355Stores the given C<$value> in the family.
2356
2357=cut
2358
2359our $DB;
2360
2361sub db_init {
2362 unless ($DB) {
2363 $DB = BDB::db_create $DB_ENV;
2364
2365 cf::sync_job {
2366 eval {
2367 $DB->set_flags (BDB::CHKSUM);
2368
2369 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2370 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2371 cf::cleanup "db_open(db): $!" if $!;
2372 };
2373 cf::cleanup "db_open(db): $@" if $@;
2374 };
2375 }
2376}
2377
2378sub db_get($$) {
2379 my $key = "$_[0]/$_[1]";
2380
2381 cf::sync_job {
2382 BDB::db_get $DB, undef, $key, my $data;
2383
2384 $! ? ()
2385 : $data
2386 }
2387}
2388
2389sub db_put($$$) {
2390 BDB::dbreq_pri 4;
2391 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2392}
2393
2394=item cf::cache $id => [$paths...], $processversion => $process
2395
2396Generic caching function that returns the value of the resource $id,
2397caching and regenerating as required.
2398
2399This function can block.
2400
2401=cut
2402
2403sub cache {
2404 my ($id, $src, $processversion, $process) = @_;
2405
2406 my $meta =
2407 join "\x00",
2408 $processversion,
2409 map {
2410 aio_stat $_
2411 and Carp::croak "$_: $!";
2412
2413 ($_, (stat _)[7,9])
2414 } @$src;
2415
2416 my $dbmeta = db_get cache => "$id/meta";
2417 if ($dbmeta ne $meta) {
2418 # changed, we may need to process
2419
2420 my @data;
2421 my $md5;
2422
2423 for (0 .. $#$src) {
2424 0 <= aio_load $src->[$_], $data[$_]
2425 or Carp::croak "$src->[$_]: $!";
2426 }
2427
2428 # if processing is expensive, check
2429 # checksum first
2430 if (1) {
2431 $md5 =
2432 join "\x00",
2433 $processversion,
2434 map {
2435 Coro::cede;
2436 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2437 } 0.. $#$src;
2438
2439
2440 my $dbmd5 = db_get cache => "$id/md5";
2441 if ($dbmd5 eq $md5) {
2442 db_put cache => "$id/meta", $meta;
2443
2444 return db_get cache => "$id/data";
2445 }
2446 }
2447
2448 my $t1 = Time::HiRes::time;
2449 my $data = $process->(\@data);
2450 my $t2 = Time::HiRes::time;
2451
2452 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2453
2454 db_put cache => "$id/data", $data;
2455 db_put cache => "$id/md5" , $md5;
2456 db_put cache => "$id/meta", $meta;
2457
2458 return $data;
2459 }
2460
2461 db_get cache => "$id/data"
2462}
2463
2464=item fork_call { }, $args
2465
2466Executes the given code block with the given arguments in a seperate
2467process, returning the results. Everything must be serialisable with
2468Coro::Storable. May, of course, block. Note that the executed sub may
2469never block itself or use any form of Event handling.
2470
2471=cut
2472
2473sub fork_call(&@) {
2474 my ($cb, @args) = @_;
2475
2476# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2477# or die "socketpair: $!";
2478 pipe my $fh1, my $fh2
2479 or die "pipe: $!";
2480
2481 if (my $pid = fork) {
2482 close $fh2;
2483
2484 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2485 $res = Coro::Storable::thaw $res;
2486
2487 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2488
2489 die $$res unless "ARRAY" eq ref $res;
2490
2491 return wantarray ? @$res : $res->[-1];
2492 } else {
2493 reset_signals;
2494 local $SIG{__WARN__};
2495 local $SIG{__DIE__};
2496 eval {
2497 close $fh1;
2498
2499 my @res = eval { $cb->(@args) };
2500 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2501 };
2502
2503 warn $@ if $@;
2504 _exit 0;
2505 }
2506}
2507
2508
2509
2510#############################################################################
2511# the server's init and main functions 3034# the server's init and main functions
2512 3035
2513sub load_facedata($) { 3036sub load_facedata($) {
2514 my ($path) = @_; 3037 my ($path) = @_;
3038
3039 # HACK to clear player env face cache, we need some signal framework
3040 # for this (global event?)
3041 %ext::player_env::MUSIC_FACE_CACHE = ();
3042
3043 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2515 3044
2516 warn "loading facedata from $path\n"; 3045 warn "loading facedata from $path\n";
2517 3046
2518 my $facedata; 3047 my $facedata;
2519 0 < aio_load $path, $facedata 3048 0 < aio_load $path, $facedata
2522 $facedata = Coro::Storable::thaw $facedata; 3051 $facedata = Coro::Storable::thaw $facedata;
2523 3052
2524 $facedata->{version} == 2 3053 $facedata->{version} == 2
2525 or cf::cleanup "$path: version mismatch, cannot proceed."; 3054 or cf::cleanup "$path: version mismatch, cannot proceed.";
2526 3055
3056 # patch in the exptable
3057 $facedata->{resource}{"res/exp_table"} = {
3058 type => FT_RSRC,
3059 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3060 };
3061 cf::cede_to_tick;
3062
2527 { 3063 {
2528 my $faces = $facedata->{faceinfo}; 3064 my $faces = $facedata->{faceinfo};
2529 3065
2530 while (my ($face, $info) = each %$faces) { 3066 while (my ($face, $info) = each %$faces) {
2531 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3067 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2532 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3068 cf::face::set_visibility $idx, $info->{visibility};
3069 cf::face::set_magicmap $idx, $info->{magicmap};
2533 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2534 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2535 Coro::cede; 3072
3073 cf::cede_to_tick;
2536 } 3074 }
2537 3075
2538 while (my ($face, $info) = each %$faces) { 3076 while (my ($face, $info) = each %$faces) {
2539 next unless $info->{smooth}; 3077 next unless $info->{smooth};
2540 my $idx = cf::face::find $face 3078 my $idx = cf::face::find $face
2541 or next; 3079 or next;
2542 if (my $smooth = cf::face::find $info->{smooth}) { 3080 if (my $smooth = cf::face::find $info->{smooth}) {
3081 cf::face::set_smooth $idx, $smooth;
2543 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3082 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2544 } else { 3083 } else {
2545 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3084 warn "smooth face '$info->{smooth}' not found for face '$face'";
2546 } 3085 }
2547 Coro::cede; 3086
3087 cf::cede_to_tick;
2548 } 3088 }
2549 } 3089 }
2550 3090
2551 { 3091 {
2552 my $anims = $facedata->{animinfo}; 3092 my $anims = $facedata->{animinfo};
2553 3093
2554 while (my ($anim, $info) = each %$anims) { 3094 while (my ($anim, $info) = each %$anims) {
2555 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3095 cf::anim::set $anim, $info->{frames}, $info->{facings};
2556 Coro::cede; 3096 cf::cede_to_tick;
2557 } 3097 }
2558 3098
2559 cf::anim::invalidate_all; # d'oh 3099 cf::anim::invalidate_all; # d'oh
2560 } 3100 }
2561 3101
3102 {
3103 # TODO: for gcfclient pleasure, we should give resources
3104 # that gcfclient doesn't grok a >10000 face index.
3105 my $res = $facedata->{resource};
3106
3107 my $soundconf = delete $res->{"res/sound.conf"};
3108
3109 while (my ($name, $info) = each %$res) {
3110 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data;
3112
3113 if ($info->{type} & 1) {
3114 # prepend meta info
3115
3116 my $meta = $enc->encode ({
3117 name => $name,
3118 %{ $info->{meta} || {} },
3119 });
3120
3121 $data = pack "(w/a*)*", $meta, $info->{data};
3122 } else {
3123 $data = $info->{data};
3124 }
3125
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
3129 cf::cede_to_tick;
3130 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
3149 }
3150
2562 1 3151 1
2563} 3152}
2564 3153
3154register_exticmd fx_want => sub {
3155 my ($ns, $want) = @_;
3156
3157 while (my ($k, $v) = each %$want) {
3158 $ns->fx_want ($k, $v);
3159 }
3160};
3161
2565sub reload_regions { 3162sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
2566 load_resource_file "$MAPDIR/regions" 3167 load_resource_file "$MAPDIR/regions"
2567 or die "unable to load regions file\n"; 3168 or die "unable to load regions file\n";
3169
3170 for (cf::region::list) {
3171 $_->{match} = qr/$_->{match}/
3172 if exists $_->{match};
3173 }
2568} 3174}
2569 3175
2570sub reload_facedata { 3176sub reload_facedata {
2571 load_facedata "$DATADIR/facedata" 3177 load_facedata "$DATADIR/facedata"
2572 or die "unable to load facedata\n"; 3178 or die "unable to load facedata\n";
2573} 3179}
2574 3180
2575sub reload_archetypes { 3181sub reload_archetypes {
2576 load_resource_file "$DATADIR/archetypes" 3182 load_resource_file "$DATADIR/archetypes"
2577 or die "unable to load archetypes\n"; 3183 or die "unable to load archetypes\n";
3184 #d# NEED to laod twice to resolve forward references
3185 # this really needs to be done in an extra post-pass
3186 # (which needs to be synchronous, so solve it differently)
3187 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n";
2578} 3189}
2579 3190
2580sub reload_treasures { 3191sub reload_treasures {
2581 load_resource_file "$DATADIR/treasures" 3192 load_resource_file "$DATADIR/treasures"
2582 or die "unable to load treasurelists\n"; 3193 or die "unable to load treasurelists\n";
2585sub reload_resources { 3196sub reload_resources {
2586 warn "reloading resource files...\n"; 3197 warn "reloading resource files...\n";
2587 3198
2588 reload_regions; 3199 reload_regions;
2589 reload_facedata; 3200 reload_facedata;
3201 #reload_archetypes;#d#
2590 reload_archetypes; 3202 reload_archetypes;
2591 reload_treasures; 3203 reload_treasures;
2592 3204
2593 warn "finished reloading resource files\n"; 3205 warn "finished reloading resource files\n";
2594} 3206}
2595 3207
2596sub init { 3208sub init {
2597 reload_resources; 3209 reload_resources;
2598} 3210}
2599 3211
2600sub cfg_load { 3212sub reload_config {
2601 open my $fh, "<:utf8", "$CONFDIR/config" 3213 open my $fh, "<:utf8", "$CONFDIR/config"
2602 or return; 3214 or return;
2603 3215
2604 local $/; 3216 local $/;
2605 *CFG = YAML::Syck::Load <$fh>; 3217 *CFG = YAML::Syck::Load <$fh>;
2621sub main { 3233sub main {
2622 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
2623 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
2624 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2625 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
2626 Event::one_event; 3239 Event::one_event;
2627 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
2628 }; 3241 };
2629 3242
2630 cfg_load; 3243 reload_config;
2631 db_init; 3244 db_init;
2632 load_extensions; 3245 load_extensions;
2633 3246
2634 $TICK_WATCHER->start; 3247 $TICK_WATCHER->start;
2635 Event::loop; 3248 Event::loop;
2651 }, 3264 },
2652 ); 3265 );
2653 } 3266 }
2654} 3267}
2655 3268
3269sub write_runtime {
3270 my $runtime = "$LOCALDIR/runtime";
3271
3272 # first touch the runtime file to show we are still running:
3273 # the fsync below can take a very very long time.
3274
3275 IO::AIO::aio_utime $runtime, undef, undef;
3276
3277 my $guard = cf::lock_acquire "write_runtime";
3278
3279 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3280 or return;
3281
3282 my $value = $cf::RUNTIME + 90 + 10;
3283 # 10 is the runtime save interval, for a monotonic clock
3284 # 60 allows for the watchdog to kill the server.
3285
3286 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3287 and return;
3288
3289 # always fsync - this file is important
3290 aio_fsync $fh
3291 and return;
3292
3293 # touch it again to show we are up-to-date
3294 aio_utime $fh, undef, undef;
3295
3296 close $fh
3297 or return;
3298
3299 aio_rename "$runtime~", $runtime
3300 and return;
3301
3302 warn "runtime file written.\n";
3303
3304 1
3305}
3306
2656sub emergency_save() { 3307sub emergency_save() {
2657 my $freeze_guard = cf::freeze_mainloop; 3308 my $freeze_guard = cf::freeze_mainloop;
2658 3309
2659 warn "enter emergency perl save\n"; 3310 warn "enter emergency perl save\n";
2660 3311
2664 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
2665 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
2666 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
2667 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
2668 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2669 $pl->save; 3321 $pl->save;
2670 } 3322 }
2671 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
2672 3324
2673 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
2721 3373
2722 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
2723 for (;;) { 3375 for (;;) {
2724 BDB::flush; 3376 BDB::flush;
2725 IO::AIO::flush; 3377 IO::AIO::flush;
2726 Coro::cede; 3378 Coro::cede_notself;
2727 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
2728 warn "iterate..."; 3380 warn "iterate...";
2729 } 3381 }
2730 3382
2731 ++$RELOAD; 3383 ++$RELOAD;
2735 %EXT_CORO = (); 3387 %EXT_CORO = ();
2736 3388
2737 warn "removing commands"; 3389 warn "removing commands";
2738 %COMMAND = (); 3390 %COMMAND = ();
2739 3391
2740 warn "removing ext commands"; 3392 warn "removing ext/exti commands";
2741 %EXTCMD = (); 3393 %EXTCMD = ();
3394 %EXTICMD = ();
2742 3395
2743 warn "unloading/nuking all extensions"; 3396 warn "unloading/nuking all extensions";
2744 for my $pkg (@EXTS) { 3397 for my $pkg (@EXTS) {
2745 warn "... unloading $pkg"; 3398 warn "... unloading $pkg";
2746 3399
2789 warn "reloading cf.pm"; 3442 warn "reloading cf.pm";
2790 require cf; 3443 require cf;
2791 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2792 3445
2793 warn "loading config and database again"; 3446 warn "loading config and database again";
2794 cf::cfg_load; 3447 cf::reload_config;
2795 3448
2796 warn "loading extensions"; 3449 warn "loading extensions";
2797 cf::load_extensions; 3450 cf::load_extensions;
2798 3451
2799 warn "reattaching attachments to objects/players"; 3452 warn "reattaching attachments to objects/players";
2835register_command "reload" => sub { 3488register_command "reload" => sub {
2836 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
2837 3490
2838 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
2839 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
2840 async { reload_perl }; 3495 reload_perl;
3496 };
2841 } 3497 }
2842}; 3498};
2843 3499
2844unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
2845 3501
2864 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
2865 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
2866 $signal->wait; 3522 $signal->wait;
2867} 3523}
2868 3524
2869 my $min = 1e6;#d#
2870 my $avg = 10;
2871$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
2872 reentrant => 0, 3526 reentrant => 0,
2873 parked => 1, 3527 parked => 1,
2874 prio => 0, 3528 prio => 0,
2875 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
2883 3537
2884 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
2885 3539
2886 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
2887 3541
2888 0 && sync_job {#d#
2889 for(1..10) {
2890 my $t = Event::time;
2891 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2892 or die;
2893
2894 $map->width (50);
2895 $map->height (50);
2896 $map->alloc;
2897 $map->_load_objects ("/tmp/x.map", 1);
2898 my $t = Event::time - $t;
2899
2900 #next unless $t < 0.0013;#d#
2901 if ($t < $min) {
2902 $min = $t;
2903 }
2904 $avg = $avg * 0.99 + $t * 0.01;
2905 }
2906 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2907 exit 0;
2908 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2909 };
2910
2911 $RUNTIME += $TICK; 3542 $RUNTIME += $TICK;
2912 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
2913 3544
2914 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2915 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
2916 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
2917 write_runtime 3549 write_runtime
2918 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
2919 }; 3551 };
2920 } 3552 }
2921 3553
2922# my $AFTER = Event::time;
2923# warn $AFTER - $NOW;#d#
2924
2925 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2926 $sig->send; 3555 $sig->send;
2927 } 3556 }
2928 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
2929 $sig->send; 3558 $sig->send;
2939 3568
2940 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
2941 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2942 3571
2943 _post_tick; 3572 _post_tick;
2944
2945
2946 }, 3573 },
2947); 3574);
2948 3575
2949{ 3576{
3577 BDB::min_parallel 8;
2950 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
2951 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
2952 reentrant => 0, 3580 reentrant => 0,
2953 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
2954 poll => 'r', 3582 poll => 'r',
2955 prio => 0, 3583 prio => 0,
2956 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
2957 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
2958 ); 3586 );
2959 BDB::min_parallel 8;
2960 3587
2961 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
2962 my $status; 3589 my $status;
2963 my $current = $Coro::current; 3590 my $current = $Coro::current;
2964 ( 3591 (
2973 ) 3600 )
2974 }; 3601 };
2975 3602
2976 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
2977 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2978 3609
2979 cf::sync_job { 3610 cf::sync_job {
2980 eval { 3611 eval {
2981 BDB::db_env_open 3612 BDB::db_env_open
2982 $DB_ENV, 3613 $DB_ENV,
2984 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2985 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2986 0666; 3617 0666;
2987 3618
2988 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2989
2990 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2991 $DB_ENV->set_lk_detect;
2992 }; 3620 };
2993 3621
2994 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
2995 }; 3623 };
2996 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
2997} 3656}
2998 3657
2999{ 3658{
3000 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3001 3660
3004 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3005 reentrant => 0, 3664 reentrant => 0,
3006 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3007 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3008 poll => 'r', 3667 poll => 'r',
3009 prio => 6, 3668 prio => 0,
3010 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3011 ); 3670 );
3012} 3671}
3013 3672
3014my $_log_backtrace; 3673my $_log_backtrace;
3020 3679
3021 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3022 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3023 ++$_log_backtrace; 3682 ++$_log_backtrace;
3024 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3025 my @bt = fork_call { 3686 my @bt = fork_call {
3026 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3027 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3028 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3029 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines