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.271 by root, Fri Jun 1 06:04:08 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 IO::AIO::aio_utime $runtime, undef, undef; 498=cut
401 499
402 my $guard = cf::lock_acquire "write_runtime"; 500sub fork_call(&@) {
501 my ($cb, @args) = @_;
403 502
404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 503 # we seemingly have to make a local copy of the whole thing,
405 or return; 504 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious)
406 506
407 my $value = $cf::RUNTIME + 90 + 10; 507 my @res = Coro::Util::fork_eval {
408 # 10 is the runtime save interval, for a monotonic clock 508 reset_signals;
409 # 60 allows for the watchdog to kill the server. 509 &$cb
510 }, @args;
410 511
411 (aio_write $fh, 0, (length $value), $value, 0) <= 0 512 wantarray ? @res : $res[-1]
412 and return; 513}
413 514
414 # always fsync - this file is important 515=item $value = cf::db_get $family => $key
415 aio_fsync $fh
416 and return;
417 516
418 # touch it again to show we are up-to-date 517Returns a single value from the environment database.
419 aio_utime $fh, undef, undef;
420 518
421 close $fh 519=item cf::db_put $family => $key => $value
422 or return;
423 520
424 aio_rename "$runtime~", $runtime 521Stores the given C<$value> in the family. It can currently store binary
425 and return; 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
426 523
427 warn "runtime file written.\n";#d# 524=item $db = cf::db_table "name"
428 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 $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
547
548our $DB;
549
550sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db";
553 };
554}
555
556sub db_get($$) {
557 my $key = "$_[0]/$_[1]";
558
559 cf::sync_job {
560 BDB::db_get $DB, undef, $key, my $data;
561
562 $! ? ()
563 : $data
429 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"
430} 640}
431 641
432=item cf::datalog type => key => value, ... 642=item cf::datalog type => key => value, ...
433 643
434Log 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.
452attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
453to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
454 664
455In 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>
456C<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
457crossfire+). 667Crossfire TRT).
458 668
459=over 4 669=over 4
460 670
461=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
462 672
664 _attach $registry, $klass, @attach; 874 _attach $registry, $klass, @attach;
665 } 875 }
666 876
667 $obj->{$name} = \%arg; 877 $obj->{$name} = \%arg;
668 } else { 878 } else {
669 warn "object uses attachment '$name' that is not available, postponing.\n"; 879 warn "object uses attachment '$name' which is not available, postponing.\n";
670 } 880 }
671 881
672 $obj->{_attachment}{$name} = undef; 882 $obj->{_attachment}{$name} = undef;
673} 883}
674 884
714 "; 924 ";
715 die if $@; 925 die if $@;
716} 926}
717 927
718our $override; 928our $override;
719our @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?
720 930
721sub override { 931sub override {
722 $override = 1; 932 $override = 1;
723 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
724} 934}
725 935
726sub do_invoke { 936sub do_invoke {
727 my $event = shift; 937 my $event = shift;
728 my $callbacks = shift; 938 my $callbacks = shift;
729 939
730 @invoke_results = (); 940 @INVOKE_RESULTS = ();
731 941
732 local $override; 942 local $override;
733 943
734 for (@$callbacks) { 944 for (@$callbacks) {
735 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
752 962
753Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
754 964
755This 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
756removed 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
757results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 968
759=back 969=back
760 970
761=cut 971=cut
762 972
763############################################################################# 973#############################################################################
764# 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}
765 1017
766sub reattach { 1018sub reattach {
767 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 1020 my ($obj) = @_;
769 1021
816sub object_freezer_save { 1068sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
818 1070
819 sync_job { 1071 sync_job {
820 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
823 1076
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
828 close $fh; 1081 close $fh;
829 1082
830 if (@$objs) { 1083 if (@$objs) {
831 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) {
832 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
833 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
834 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
835 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
836 close $fh; 1089 close $fh;
837 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
838 } 1091 }
846 } 1099 }
847 } else { 1100 } else {
848 aio_unlink $filename; 1101 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
850 } 1103 }
851 } 1104 };
852} 1105}
853 1106
854sub object_freezer_as_string { 1107sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
856 1109
868 or return; 1121 or return;
869 1122
870 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
872 or return; 1125 or return;
873 $av = eval { (Storable::thaw $av)->{objs} };
874 }
875 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);
876 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1134 $decname, length $data, scalar @{$av || []};
1135
878 return ($data, $av); 1136 ($data, $av)
879} 1137}
1138
1139=head2 COMMAND CALLBACKS
1140
1141=over 4
1142
1143=cut
880 1144
881############################################################################# 1145#############################################################################
882# command handling &c 1146# command handling &c
883 1147
884=item cf::register_command $name => \&callback($ob,$args); 1148=item cf::register_command $name => \&callback($ob,$args);
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1161 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1162}
899 1163
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1164=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1165
902Register 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.
903 1171
904If 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
905called. 1173called.
906 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
907=cut 1186=cut
908 1187
909sub register_extcmd { 1188sub register_extcmd {
910 my ($name, $cb) = @_; 1189 my ($name, $cb) = @_;
911 1190
912 $EXTCMD{$name} = $cb; 1191 $EXTCMD{$name} = $cb;
1192}
1193
1194sub register_exticmd {
1195 my ($name, $cb) = @_;
1196
1197 $EXTICMD{$name} = $cb;
913} 1198}
914 1199
915cf::player->attach ( 1200cf::player->attach (
916 on_command => sub { 1201 on_command => sub {
917 my ($pl, $name, $params) = @_; 1202 my ($pl, $name, $params) = @_;
926 cf::override; 1211 cf::override;
927 }, 1212 },
928 on_extcmd => sub { 1213 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1214 my ($pl, $buf) = @_;
930 1215
931 my $msg = eval { from_json $buf }; 1216 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1217
933 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
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1226 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1227 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1228 }
1229
1230 $pl->ext_reply ($reply, @reply)
1231 if $reply;
1232
939 } else { 1233 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1234 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1235 }
942 1236
943 cf::override; 1237 cf::override;
944 }, 1238 },
945); 1239);
946 1240
947sub load_extension {
948 my ($path) = @_;
949
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1;
952 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 }
975 die $@;
976 }
977
978 push @EXTS, $pkg;
979}
980
981sub load_extensions { 1241sub load_extensions {
1242 cf::sync_job {
1243 my %todo;
1244
982 for my $ext (<$LIBDIR/*.ext>) { 1245 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1246 next unless -r $path;
984 eval { 1247
985 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;
986 1 1305 }
987 } or warn "$ext not loaded: $@"; 1306
1307 skip:
1308 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1309 unless $progress;
1310 }
988 } 1311 };
989} 1312}
990 1313
991############################################################################# 1314#############################################################################
992 1315
1316=back
1317
993=head2 CORE EXTENSIONS 1318=head2 CORE EXTENSIONS
994 1319
995Functions and methods that extend core crossfire objects. 1320Functions and methods that extend core crossfire objects.
996 1321
997=cut 1322=cut
1001use Coro::AIO; 1326use Coro::AIO;
1002 1327
1003=head3 cf::player 1328=head3 cf::player
1004 1329
1005=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}
1006 1345
1007=item cf::player::find $login 1346=item cf::player::find $login
1008 1347
1009Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1010 1349
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1389
1051 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1052 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;
1053 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1054 } 1398 }
1055 } 1399 }
1056} 1400}
1057 1401
1067 1411
1068 aio_mkdir playerdir $pl, 0770; 1412 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1413 $pl->{last_save} = $cf::RUNTIME;
1070 1414
1071 $pl->save_pl ($path); 1415 $pl->save_pl ($path);
1072 Coro::cede; 1416 cf::cede_to_tick;
1073} 1417}
1074 1418
1075sub new($) { 1419sub new($) {
1076 my ($login) = @_; 1420 my ($login) = @_;
1077 1421
1081 $self->{deny_save} = 1; 1425 $self->{deny_save} = 1;
1082 1426
1083 $cf::PLAYER{$login} = $self; 1427 $cf::PLAYER{$login} = $self;
1084 1428
1085 $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 (@_);
1086} 1440}
1087 1441
1088=item $pl->quit_character 1442=item $pl->quit_character
1089 1443
1090Nukes the player without looking back. If logged in, the connection will 1444Nukes the player without looking back. If logged in, the connection will
1145 or return []; 1499 or return [];
1146 1500
1147 my @logins; 1501 my @logins;
1148 1502
1149 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") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1153 1512
1154 utf8::decode $login; 1513 utf8::decode $login;
1155 push @logins, $login; 1514 push @logins, $login;
1156 } 1515 }
1157 1516
1184 } 1543 }
1185 1544
1186 \@paths 1545 \@paths
1187} 1546}
1188 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
1189=item $player->ext_reply ($msgid, %msg) 1599=item $player->ext_reply ($msgid, @msg)
1190 1600
1191Sends an ext reply to the player. 1601Sends an ext reply to the player.
1192 1602
1193=cut 1603=cut
1194 1604
1195sub ext_reply($$%) { 1605sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1606 my ($self, $id, @msg) = @_;
1197 1607
1198 $msg{msgid} = $id; 1608 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1609}
1202 1610
1203=item $player->ext_event ($type, %msg) 1611=item $player->ext_msg ($type, @msg)
1204 1612
1205Sends an ext event to the client. 1613Sends an ext event to the client.
1206 1614
1207=cut 1615=cut
1208 1616
1209sub ext_event($$%) { 1617sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1618 my ($self, $type, @msg) = @_;
1211 1619
1212 $self->ns->ext_event ($type, %msg); 1620 $self->ns->ext_msg ($type, @msg);
1213} 1621}
1214 1622
1215=head3 cf::region 1623=head3 cf::region
1216 1624
1217=over 4 1625=over 4
1220 1628
1221package cf::region; 1629package cf::region;
1222 1630
1223=item cf::region::find_by_path $path 1631=item cf::region::find_by_path $path
1224 1632
1225Tries 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.
1226 1634
1227=cut 1635=cut
1228 1636
1229sub find_by_path($) { 1637sub find_by_path($) {
1230 my ($path) = @_; 1638 my ($path) = @_;
1231 1639
1232 my ($match, $specificity); 1640 my ($match, $specificity);
1233 1641
1234 for my $region (list) { 1642 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1643 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1644 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1645 if $region->specificity > $specificity;
1238 } 1646 }
1239 } 1647 }
1240 1648
1304 my ($self, $merge) = @_; 1712 my ($self, $merge) = @_;
1305 1713
1306 # we have to keep some variables in memory intact 1714 # we have to keep some variables in memory intact
1307 local $self->{path}; 1715 local $self->{path};
1308 local $self->{load_path}; 1716 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1717
1312 $self->SUPER::thawer_merge ($merge); 1718 $self->SUPER::thawer_merge ($merge);
1313} 1719}
1314 1720
1315sub normalise { 1721sub normalise {
1362 $self->init; # pass $1 etc. 1768 $self->init; # pass $1 etc.
1363 return $self; 1769 return $self;
1364 } 1770 }
1365 } 1771 }
1366 1772
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1773 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1774 ()
1369} 1775}
1370 1776
1371sub init { 1777sub init {
1372 my ($self) = @_; 1778 my ($self) = @_;
1415 1821
1416 $_->change_map_light ($change) 1822 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1823 for grep $_->outdoor, values %cf::MAP;
1418} 1824}
1419 1825
1826sub decay_objects {
1827 my ($self) = @_;
1828
1829 return if $self->{deny_reset};
1830
1831 $self->do_decay_objects;
1832}
1833
1420sub unlink_save { 1834sub unlink_save {
1421 my ($self) = @_; 1835 my ($self) = @_;
1422 1836
1423 utf8::encode (my $save = $self->save_path); 1837 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1838 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1427 1841
1428sub load_header_from($) { 1842sub load_header_from($) {
1429 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1430 1844
1431 utf8::encode $path; 1845 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 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;
1437 1854
1438 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1439 1856
1440 1 1857 1
1441} 1858}
1480 $self->load_header_orig 1897 $self->load_header_orig
1481 or return; 1898 or return;
1482 $self->prepare_orig; 1899 $self->prepare_orig;
1483 } 1900 }
1484 1901
1902 $self->{deny_reset} = 1
1903 if $self->no_reset;
1904
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1905 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1906 unless $self->default_region;
1487 1907
1488 1 1908 1
1489} 1909}
1492sub find { 1912sub find {
1493 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1494 1914
1495 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1496 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1497 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1498 1919
1499 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1500 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
1501 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1502 or return; 1925 or return;
1503 1926
1504 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1505 1928
1506 $map->load_header 1929 $map->load_header
1507 or return; 1930 or return;
1508 1931
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1512 $map->reset; 1937 $map->reset;
1513 undef $guard;
1514 return find $path; 1938 return find $path;
1515 } 1939 }
1516 1940
1517 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1518 } 1942 }
1527 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1528 1952
1529 my $path = $self->{path}; 1953 my $path = $self->{path};
1530 1954
1531 { 1955 {
1532 my $guard = cf::lock_acquire "map_load:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1533 1957
1958 return unless $self->valid;
1534 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1535 1960
1536 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1537 1962
1538 $self->alloc; 1963 $self->alloc;
1539 1964
1540 $self->pre_load; 1965 $self->pre_load;
1541 Coro::cede; 1966 cf::cede_to_tick;
1542 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1544 or return; 1971 or return;
1545 1972
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1548 1975
1549 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 1977 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 1980 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1554 } 1984 }
1555 } 1985 }
1556 1986
1557 Coro::cede; 1987 $f->resolve_delayed_derefs;
1988
1989 cf::cede_to_tick;
1558 # now do the right thing for maps 1990 # now do the right thing for maps
1559 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 1993 unless $self->difficulty;
1562 Coro::cede; 1994 cf::cede_to_tick;
1563 1995
1564 unless ($self->{deny_activate}) { 1996 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 1997 $self->decay_objects;
1566 $self->fix_auto_apply; 1998 $self->fix_auto_apply;
1567 $self->update_buttons; 1999 $self->update_buttons;
1568 Coro::cede; 2000 cf::cede_to_tick;
1569 $self->set_darkness_map; 2001 $self->set_darkness_map;
1570 Coro::cede; 2002 cf::cede_to_tick;
1571 $self->activate; 2003 $self->activate;
1572 } 2004 }
2005
2006 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME);
1573 2008
1574 $self->in_memory (cf::MAP_IN_MEMORY); 2009 $self->in_memory (cf::MAP_IN_MEMORY);
1575 } 2010 }
1576 2011
1577 $self->post_load; 2012 $self->post_load;
1581 my ($self, $ob) = @_; 2016 my ($self, $ob) = @_;
1582 2017
1583 return find "~" . $ob->name . "/" . $self->{path} 2018 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 2019 if $self->per_player;
1585 2020
2021# return find "?party/" . $ob->name . "/" . $self->{path}
2022# if $self->per_party;
2023
1586 $self 2024 $self
1587} 2025}
1588 2026
1589# 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
1590sub load_diag { 2028sub load_neighbours {
1591 my ($map) = @_; 2029 my ($map) = @_;
1592 2030
1593 my @diag; # diagonal neighbours 2031 my @neigh; # diagonal neighbours
1594 2032
1595 for (0 .. 3) { 2033 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 2034 my $neigh = $map->tile_path ($_)
1597 or next; 2035 or next;
1598 $neigh = find $neigh, $map 2036 $neigh = find $neigh, $map
1599 or next; 2037 or next;
1600 $neigh->load; 2038 $neigh->load;
1601 2039
2040 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2041 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2042 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 2043 }
1605 2044
1606 for (@diag) { 2045 for (grep defined $_->[0], @neigh) {
2046 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 2047 my $neigh = find $path, $origin
1608 or next; 2048 or next;
1609 $neigh->load; 2049 $neigh->load;
1610 } 2050 }
1611} 2051}
1612 2052
1617} 2057}
1618 2058
1619sub do_load_sync { 2059sub do_load_sync {
1620 my ($map) = @_; 2060 my ($map) = @_;
1621 2061
2062 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2063 if $Coro::current == $Coro::main;
2064
1622 cf::sync_job { $map->load }; 2065 cf::sync_job { $map->load };
1623} 2066}
1624 2067
1625our %MAP_PREFETCH; 2068our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 2069our $MAP_PREFETCHER = undef;
1627 2070
1628sub find_async { 2071sub find_async {
1629 my ($path, $origin) = @_; 2072 my ($path, $origin, $load) = @_;
1630 2073
1631 $path = normalise $path, $origin && $origin->{path}; 2074 $path = normalise $path, $origin && $origin->{path};
1632 2075
1633 if (my $map = $cf::MAP{$path}) { 2076 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1635 } 2078 }
1636 2079
1637 undef $MAP_PREFETCH{$path}; 2080 $MAP_PREFETCH{$path} |= $load;
2081
1638 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1639 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2087 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2088 $map->load if $v;
2089 }
1644 2090
1645 delete $MAP_PREFETCH{$path}; 2091 delete $MAP_PREFETCH{$k};
1646 } 2092 }
1647 } 2093 }
1648 undef $MAP_PREFETCHER; 2094 undef $MAP_PREFETCHER;
1649 }; 2095 };
1650 $MAP_PREFETCHER->prio (6); 2096 $MAP_PREFETCHER->prio (6);
1653} 2099}
1654 2100
1655sub save { 2101sub save {
1656 my ($self) = @_; 2102 my ($self) = @_;
1657 2103
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2105
1660 $self->{last_save} = $cf::RUNTIME; 2106 $self->{last_save} = $cf::RUNTIME;
1661 2107
1662 return unless $self->dirty; 2108 return unless $self->dirty;
1663 2109
1669 return if $self->{deny_save}; 2115 return if $self->{deny_save};
1670 2116
1671 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
1672 2118
1673 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
1674 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
1675 }; 2122 };
1676 2123
1677 if ($uniq) { 2124 if ($uniq) {
1678 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1686 my ($self) = @_; 2133 my ($self) = @_;
1687 2134
1688 # save first because save cedes 2135 # save first because save cedes
1689 $self->save; 2136 $self->save;
1690 2137
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2139
1693 return if $self->players; 2140 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
1695 return if $self->{deny_save}; 2142 return if $self->{deny_save};
1696 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
1697 $self->clear; 2148 $self->clear;
1698 $self->in_memory (cf::MAP_SWAPPED);
1699} 2149}
1700 2150
1701sub reset_at { 2151sub reset_at {
1702 my ($self) = @_; 2152 my ($self) = @_;
1703 2153
1704 # TODO: safety, remove and allow resettable per-player maps 2154 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 2155 return 1e99 if $self->{deny_reset};
1707 2156
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2157 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 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;
1710 2159
1721 my ($self) = @_; 2170 my ($self) = @_;
1722 2171
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2173
1725 return if $self->players; 2174 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2175
1728 warn "resetting map ", $self->path;#d# 2176 warn "resetting map ", $self->path;
1729 2177
1730 $self->in_memory (cf::MAP_SWAPPED); 2178 $self->in_memory (cf::MAP_SWAPPED);
1731 2179
1732 # need to save uniques path 2180 # need to save uniques path
1733 unless ($self->{deny_save}) { 2181 unless ($self->{deny_save}) {
1737 if $uniq; 2185 if $uniq;
1738 } 2186 }
1739 2187
1740 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
1741 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
1742 $self->clear; 2192 $self->clear;
1743
1744 $_->clear_links_to ($self) for values %cf::MAP;
1745 2193
1746 $self->unlink_save; 2194 $self->unlink_save;
1747 $self->destroy; 2195 $self->destroy;
1748} 2196}
1749 2197
1750my $nuke_counter = "aaaa"; 2198my $nuke_counter = "aaaa";
1751 2199
1752sub nuke { 2200sub nuke {
1753 my ($self) = @_; 2201 my ($self) = @_;
1754 2202
2203 {
2204 my $lock = cf::lock_acquire "map_data:$self->{path}";
2205
1755 delete $cf::MAP{$self->path}; 2206 delete $cf::MAP{$self->path};
1756 2207
1757 $self->unlink_save; 2208 $self->unlink_save;
1758 2209
1759 bless $self, "cf::map"; 2210 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2211 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2212 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2213 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2215
1765 $cf::MAP{$self->path} = $self; 2216 $cf::MAP{$self->path} = $self;
2217 }
1766 2218
1767 $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 ]
1768} 2256}
1769 2257
1770=item cf::map::unique_maps 2258=item cf::map::unique_maps
1771 2259
1772Returns an arrayref of paths of all shared maps that have 2260Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2261instantiated unique items. May block.
1774 2262
1775=cut 2263=cut
1776 2264
1777sub unique_maps() { 2265sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2266 [
1779 or return; 2267 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2268 utf8::decode $_;
1785 next if /\.pst$/; 2269 /\.map$/
1786 next unless /^$PATH_SEP/o; 2270 ? normalise $_
1787 2271 : ()
1788 push @paths, cf::map::normalise $_; 2272 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2273 ]
1790
1791 \@paths
1792} 2274}
1793 2275
1794package cf; 2276package cf;
1795 2277
1796=back 2278=back
1814 map { $_, inv_recursive_ $_->inv } @_ 2296 map { $_, inv_recursive_ $_->inv } @_
1815} 2297}
1816 2298
1817sub inv_recursive { 2299sub inv_recursive {
1818 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 }
1819} 2329}
1820 2330
1821package cf; 2331package cf;
1822 2332
1823=back 2333=back
1842 2352
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2353 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2354
1845 if ($self->{record_replies}) { 2355 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2356 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2357
1847 } 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 {
1848 $msg = $npc->name . " says: $msg" if $npc; 2366 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2367 $self->message ($msg, $flags);
2368 }
1850 } 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 (@_);
1851} 2380}
1852 2381
1853=item $player_object->may ("access") 2382=item $player_object->may ("access")
1854 2383
1855Returns wether the given player is authorized to access resource "access" 2384Returns wether the given player is authorized to access resource "access"
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
1948=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2477=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949 2478
1950Moves 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
1951her, loading and preparing them map, calling the provided $check callback 2480her, loading and preparing them map, calling the provided $check callback
1952that 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
1953the 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.
1954 2484
1955=cut 2485=cut
1956 2486
1957our $GOTOGEN; 2487our $GOTOGEN;
1958 2488
1959sub cf::object::player::goto { 2489sub cf::object::player::goto {
1960 my ($self, $path, $x, $y, $check) = @_; 2490 my ($self, $path, $x, $y, $check, $done) = @_;
1961 2491
1962 # do generation counting so two concurrent goto's will be executed in-order 2492 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1964 2494
1965 $self->enter_link; 2495 $self->enter_link;
1966 2496
1967 (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
1968 my $map = eval { 2519 my $map = eval {
1969 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
1970 2521
1971 if ($map) { 2522 if ($map) {
1972 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
1974 } else { 2525 } else {
1975 $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);
1976 } 2527 }
1977 2528
1978 $map 2529 $map
1979 }; 2530 };
1980 2531
1985 2536
1986 if ($gen == $self->{_goto_generation}) { 2537 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation}; 2538 delete $self->{_goto_generation};
1988 $self->leave_link ($map, $x, $y); 2539 $self->leave_link ($map, $x, $y);
1989 } 2540 }
2541
2542 $done->() if $done;
1990 })->prio (1); 2543 })->prio (1);
1991} 2544}
1992 2545
1993=item $player_object->enter_exit ($exit_object) 2546=item $player_object->enter_exit ($exit_object)
1994 2547
2063 my $hp = $exit->stats->hp; 2616 my $hp = $exit->stats->hp;
2064 my $sp = $exit->stats->sp; 2617 my $sp = $exit->stats->sp;
2065 2618
2066 $self->enter_link; 2619 $self->enter_link;
2067 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
2068 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2069 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2070 unless (eval { 2629 unless (eval {
2071 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2072 2631
2073 1; 2632 1;
2099 2658
2100 utf8::encode $text; 2659 utf8::encode $text;
2101 $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);
2102} 2661}
2103 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
2104=item $client->ext_event ($type, %msg) 2756=item $client->ext_msg ($type, @msg)
2105 2757
2106Sends an exti event to the client. 2758Sends an ext event to the client.
2107 2759
2108=cut 2760=cut
2109 2761
2110sub cf::client::ext_event($$%) { 2762sub cf::client::ext_msg($$@) {
2111 my ($self, $type, %msg) = @_; 2763 my ($self, $type, @msg) = @_;
2112 2764
2765 if ($self->extcmd == 2) {
2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2767 } elsif ($self->extcmd == 1) { # TODO: remove
2113 $msg{msgtype} = "event_$type"; 2768 push @msg, msgtype => "event_$type";
2114 $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 }
2115} 2789}
2116 2790
2117=item $success = $client->query ($flags, "text", \&cb) 2791=item $success = $client->query ($flags, "text", \&cb)
2118 2792
2119Queues a query to the client, calling the given callback with 2793Queues a query to the client, calling the given callback with
2120the 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>,
2121C<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>.
2122 2796
2123Queries 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
2124reliable at some point in the future. 2798become reliable at some point in the future.
2125 2799
2126=cut 2800=cut
2127 2801
2128sub cf::client::query { 2802sub cf::client::query {
2129 my ($self, $flags, $text, $cb) = @_; 2803 my ($self, $flags, $text, $cb) = @_;
2137 utf8::encode $text; 2811 utf8::encode $text;
2138 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2812 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2139 2813
2140 $self->send_packet ($self->{query_queue}[0][0]) 2814 $self->send_packet ($self->{query_queue}[0][0])
2141 if @{ $self->{query_queue} } == 1; 2815 if @{ $self->{query_queue} } == 1;
2816
2817 1
2142} 2818}
2143 2819
2144cf::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 },
2145 on_reply => sub { 2826 on_reply => sub {
2146 my ($ns, $msg) = @_; 2827 my ($ns, $msg) = @_;
2147 2828
2148 # this weird shuffling is so that direct followup queries 2829 # this weird shuffling is so that direct followup queries
2149 # get handled first 2830 # get handled first
2161 } else { 2842 } else {
2162 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2843 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2163 } 2844 }
2164 } 2845 }
2165 }, 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 },
2166); 2873);
2167 2874
2168=item $client->async (\&cb) 2875=item $client->async (\&cb)
2169 2876
2170Create a new coroutine, running the specified callback. The coroutine will 2877Create a new coroutine, running the specified callback. The coroutine will
2211our $safe = new Safe "safe"; 2918our $safe = new Safe "safe";
2212our $safe_hole = new Safe::Hole; 2919our $safe_hole = new Safe::Hole;
2213 2920
2214$SIG{FPE} = 'IGNORE'; 2921$SIG{FPE} = 'IGNORE';
2215 2922
2216$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));
2217 2928
2218# here we export the classes and methods available to script code 2929# here we export the classes and methods available to script code
2219 2930
2220=pod 2931=pod
2221 2932
2222The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2223 2934
2224 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
2225 cf::object::player player 2939 cf::object::player
2226 cf::player peaceful 2940 player
2227 cf::map trigger 2941
2942 cf::player
2943 peaceful
2944
2945 cf::map
2946 trigger
2228 2947
2229=cut 2948=cut
2230 2949
2231for ( 2950for (
2232 ["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)],
2233 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2234 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2235 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2236) { 2957) {
2237 no strict 'refs'; 2958 no strict 'refs';
2308=back 3029=back
2309 3030
2310=cut 3031=cut
2311 3032
2312############################################################################# 3033#############################################################################
2313
2314=head2 EXTENSION DATABASE SUPPORT
2315
2316Crossfire maintains a very simple database for extension use. It can
2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2318convert to/from binary).
2319
2320The parameter C<$family> should best start with the name of the extension
2321using it, it should be unique.
2322
2323=over 4
2324
2325=item $value = cf::db_get $family => $key
2326
2327Returns a single value from the database.
2328
2329=item cf::db_put $family => $key => $value
2330
2331Stores the given C<$value> in the family.
2332
2333=cut
2334
2335our $DB;
2336
2337sub db_init {
2338 unless ($DB) {
2339 $DB = BDB::db_create $DB_ENV;
2340
2341 cf::sync_job {
2342 eval {
2343 $DB->set_flags (BDB::CHKSUM);
2344
2345 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2347 cf::cleanup "db_open(db): $!" if $!;
2348 };
2349 cf::cleanup "db_open(db): $@" if $@;
2350 };
2351 }
2352}
2353
2354sub db_get($$) {
2355 my $key = "$_[0]/$_[1]";
2356
2357 cf::sync_job {
2358 BDB::db_get $DB, undef, $key, my $data;
2359
2360 $! ? ()
2361 : $data
2362 }
2363}
2364
2365sub db_put($$$) {
2366 BDB::dbreq_pri 4;
2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368}
2369
2370=item cf::cache $id => [$paths...], $processversion => $process
2371
2372Generic caching function that returns the value of the resource $id,
2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2402 }
2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2482}
2483
2484#############################################################################
2485# the server's init and main functions 3034# the server's init and main functions
2486 3035
2487sub load_facedata($) { 3036sub load_facedata($) {
2488 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;
2489 3044
2490 warn "loading facedata from $path\n"; 3045 warn "loading facedata from $path\n";
2491 3046
2492 my $facedata; 3047 my $facedata;
2493 0 < aio_load $path, $facedata 3048 0 < aio_load $path, $facedata
2496 $facedata = Coro::Storable::thaw $facedata; 3051 $facedata = Coro::Storable::thaw $facedata;
2497 3052
2498 $facedata->{version} == 2 3053 $facedata->{version} == 2
2499 or cf::cleanup "$path: version mismatch, cannot proceed."; 3054 or cf::cleanup "$path: version mismatch, cannot proceed.";
2500 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
2501 { 3063 {
2502 my $faces = $facedata->{faceinfo}; 3064 my $faces = $facedata->{faceinfo};
2503 3065
2504 while (my ($face, $info) = each %$faces) { 3066 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3067 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3068 cf::face::set_visibility $idx, $info->{visibility};
3069 cf::face::set_magicmap $idx, $info->{magicmap};
2507 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2508 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2509 Coro::cede; 3072
3073 cf::cede_to_tick;
2510 } 3074 }
2511 3075
2512 while (my ($face, $info) = each %$faces) { 3076 while (my ($face, $info) = each %$faces) {
2513 next unless $info->{smooth}; 3077 next unless $info->{smooth};
2514 my $idx = cf::face::find $face 3078 my $idx = cf::face::find $face
2515 or next; 3079 or next;
2516 if (my $smooth = cf::face::find $info->{smooth}) { 3080 if (my $smooth = cf::face::find $info->{smooth}) {
3081 cf::face::set_smooth $idx, $smooth;
2517 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3082 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2518 } else { 3083 } else {
2519 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3084 warn "smooth face '$info->{smooth}' not found for face '$face'";
2520 } 3085 }
2521 Coro::cede; 3086
3087 cf::cede_to_tick;
2522 } 3088 }
2523 } 3089 }
2524 3090
2525 { 3091 {
2526 my $anims = $facedata->{animinfo}; 3092 my $anims = $facedata->{animinfo};
2527 3093
2528 while (my ($anim, $info) = each %$anims) { 3094 while (my ($anim, $info) = each %$anims) {
2529 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3095 cf::anim::set $anim, $info->{frames}, $info->{facings};
2530 Coro::cede; 3096 cf::cede_to_tick;
2531 } 3097 }
2532 3098
2533 cf::anim::invalidate_all; # d'oh 3099 cf::anim::invalidate_all; # d'oh
2534 } 3100 }
2535 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
2536 1 3151 1
2537} 3152}
2538 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
2539sub 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
2540 load_resource_file "$MAPDIR/regions" 3167 load_resource_file "$MAPDIR/regions"
2541 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 }
2542} 3174}
2543 3175
2544sub reload_facedata { 3176sub reload_facedata {
2545 load_facedata "$DATADIR/facedata" 3177 load_facedata "$DATADIR/facedata"
2546 or die "unable to load facedata\n"; 3178 or die "unable to load facedata\n";
2547} 3179}
2548 3180
2549sub reload_archetypes { 3181sub reload_archetypes {
2550 load_resource_file "$DATADIR/archetypes" 3182 load_resource_file "$DATADIR/archetypes"
2551 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";
2552} 3189}
2553 3190
2554sub reload_treasures { 3191sub reload_treasures {
2555 load_resource_file "$DATADIR/treasures" 3192 load_resource_file "$DATADIR/treasures"
2556 or die "unable to load treasurelists\n"; 3193 or die "unable to load treasurelists\n";
2559sub reload_resources { 3196sub reload_resources {
2560 warn "reloading resource files...\n"; 3197 warn "reloading resource files...\n";
2561 3198
2562 reload_regions; 3199 reload_regions;
2563 reload_facedata; 3200 reload_facedata;
3201 #reload_archetypes;#d#
2564 reload_archetypes; 3202 reload_archetypes;
2565 reload_treasures; 3203 reload_treasures;
2566 3204
2567 warn "finished reloading resource files\n"; 3205 warn "finished reloading resource files\n";
2568} 3206}
2569 3207
2570sub init { 3208sub init {
2571 reload_resources; 3209 reload_resources;
2572} 3210}
2573 3211
2574sub cfg_load { 3212sub reload_config {
2575 open my $fh, "<:utf8", "$CONFDIR/config" 3213 open my $fh, "<:utf8", "$CONFDIR/config"
2576 or return; 3214 or return;
2577 3215
2578 local $/; 3216 local $/;
2579 *CFG = YAML::Syck::Load <$fh>; 3217 *CFG = YAML::Syck::Load <$fh>;
2595sub main { 3233sub main {
2596 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
2597 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
2598 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#
2599 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
2600 Event::one_event; 3239 Event::one_event;
2601 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
2602 }; 3241 };
2603 3242
2604 cfg_load; 3243 reload_config;
2605 db_init; 3244 db_init;
2606 load_extensions; 3245 load_extensions;
2607 3246
2608 $TICK_WATCHER->start; 3247 $TICK_WATCHER->start;
2609 Event::loop; 3248 Event::loop;
2625 }, 3264 },
2626 ); 3265 );
2627 } 3266 }
2628} 3267}
2629 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
2630sub emergency_save() { 3307sub emergency_save() {
2631 my $freeze_guard = cf::freeze_mainloop; 3308 my $freeze_guard = cf::freeze_mainloop;
2632 3309
2633 warn "enter emergency perl save\n"; 3310 warn "enter emergency perl save\n";
2634 3311
2638 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
2639 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
2640 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
2641 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
2642 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2643 $pl->save; 3321 $pl->save;
2644 } 3322 }
2645 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
2646 3324
2647 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
2695 3373
2696 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
2697 for (;;) { 3375 for (;;) {
2698 BDB::flush; 3376 BDB::flush;
2699 IO::AIO::flush; 3377 IO::AIO::flush;
2700 Coro::cede; 3378 Coro::cede_notself;
2701 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
2702 warn "iterate..."; 3380 warn "iterate...";
2703 } 3381 }
2704 3382
2705 ++$RELOAD; 3383 ++$RELOAD;
2709 %EXT_CORO = (); 3387 %EXT_CORO = ();
2710 3388
2711 warn "removing commands"; 3389 warn "removing commands";
2712 %COMMAND = (); 3390 %COMMAND = ();
2713 3391
2714 warn "removing ext commands"; 3392 warn "removing ext/exti commands";
2715 %EXTCMD = (); 3393 %EXTCMD = ();
3394 %EXTICMD = ();
2716 3395
2717 warn "unloading/nuking all extensions"; 3396 warn "unloading/nuking all extensions";
2718 for my $pkg (@EXTS) { 3397 for my $pkg (@EXTS) {
2719 warn "... unloading $pkg"; 3398 warn "... unloading $pkg";
2720 3399
2763 warn "reloading cf.pm"; 3442 warn "reloading cf.pm";
2764 require cf; 3443 require cf;
2765 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2766 3445
2767 warn "loading config and database again"; 3446 warn "loading config and database again";
2768 cf::cfg_load; 3447 cf::reload_config;
2769 3448
2770 warn "loading extensions"; 3449 warn "loading extensions";
2771 cf::load_extensions; 3450 cf::load_extensions;
2772 3451
2773 warn "reattaching attachments to objects/players"; 3452 warn "reattaching attachments to objects/players";
2809register_command "reload" => sub { 3488register_command "reload" => sub {
2810 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
2811 3490
2812 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
2813 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
2814 async { reload_perl }; 3495 reload_perl;
3496 };
2815 } 3497 }
2816}; 3498};
2817 3499
2818unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
2819 3501
2838 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
2839 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
2840 $signal->wait; 3522 $signal->wait;
2841} 3523}
2842 3524
2843 my $min = 1e6;#d#
2844 my $avg = 10;
2845$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
2846 reentrant => 0, 3526 reentrant => 0,
2847 parked => 1, 3527 parked => 1,
2848 prio => 0, 3528 prio => 0,
2849 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
2857 3537
2858 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
2859 3539
2860 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
2861 3541
2862 0 && sync_job {#d#
2863 for(1..10) {
2864 my $t = Event::time;
2865 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2866 or die;
2867
2868 $map->width (50);
2869 $map->height (50);
2870 $map->alloc;
2871 $map->_load_objects ("/tmp/x.map", 1);
2872 my $t = Event::time - $t;
2873
2874 #next unless $t < 0.0013;#d#
2875 if ($t < $min) {
2876 $min = $t;
2877 }
2878 $avg = $avg * 0.99 + $t * 0.01;
2879 }
2880 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2881 exit 0;
2882 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2883 };
2884
2885 $RUNTIME += $TICK; 3542 $RUNTIME += $TICK;
2886 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
2887 3544
2888 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2889 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
2890 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
2891 write_runtime 3549 write_runtime
2892 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
2893 }; 3551 };
2894 } 3552 }
2895 3553
2896# my $AFTER = Event::time;
2897# warn $AFTER - $NOW;#d#
2898
2899 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2900 $sig->send; 3555 $sig->send;
2901 } 3556 }
2902 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
2903 $sig->send; 3558 $sig->send;
2913 3568
2914 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2916 3571
2917 _post_tick; 3572 _post_tick;
2918
2919
2920 }, 3573 },
2921); 3574);
2922 3575
2923{ 3576{
3577 BDB::min_parallel 8;
2924 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
2925 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
2926 reentrant => 0, 3580 reentrant => 0,
2927 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
2928 poll => 'r', 3582 poll => 'r',
2929 prio => 0, 3583 prio => 0,
2930 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
2931 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
2932 ); 3586 );
2933 BDB::min_parallel 8;
2934 3587
2935 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
2936 my $status; 3589 my $status;
2937 my $current = $Coro::current; 3590 my $current = $Coro::current;
2938 ( 3591 (
2947 ) 3600 )
2948 }; 3601 };
2949 3602
2950 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
2951 $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);
2952 3609
2953 cf::sync_job { 3610 cf::sync_job {
2954 eval { 3611 eval {
2955 BDB::db_env_open 3612 BDB::db_env_open
2956 $DB_ENV, 3613 $DB_ENV,
2958 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
2959 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2960 0666; 3617 0666;
2961 3618
2962 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2963
2964 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2965 $DB_ENV->set_lk_detect;
2966 }; 3620 };
2967 3621
2968 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
2969 }; 3623 };
2970 } 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 );
2971} 3656}
2972 3657
2973{ 3658{
2974 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
2975 3660
2978 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
2979 reentrant => 0, 3664 reentrant => 0,
2980 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
2981 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
2982 poll => 'r', 3667 poll => 'r',
2983 prio => 6, 3668 prio => 0,
2984 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
2985 ); 3670 );
2986} 3671}
2987 3672
2988my $_log_backtrace; 3673my $_log_backtrace;
2994 3679
2995 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
2996 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
2997 ++$_log_backtrace; 3682 ++$_log_backtrace;
2998 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
2999 my @bt = fork_call { 3686 my @bt = fork_call {
3000 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3001 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3002 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 |"
3003 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines