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.273 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.400 by root, Mon Dec 17 06:36:34 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use 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.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
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::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML::Syck ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 43
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
44 46
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 48
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 76our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 79our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
79 81
80our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 86our $DB_ENV;
82 87
83our %CFG; 88our %CFG;
84 89
85our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 91our $RUNTIME;
92our $NOW;
87 93
88our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
91 97
92# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 100
155 161
156The raw value load value from the last tick. 162The raw value load value from the last tick.
157 163
158=item %cf::CFG 164=item %cf::CFG
159 165
160Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 167from wherever your confdir points to.
162 168
163=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
164 170
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These 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 172returns 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. 173per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 174
175=item @cf::INVOKE_RESULTS
176
177This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call.
180
169=back 181=back
170 182
171=cut 183=cut
172 184
173BEGIN { 185BEGIN {
177 $msg .= "\n" 189 $msg .= "\n"
178 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
179 191
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 193
182 utf8::encode $msg;
183 LOG llevError, $msg; 194 LOG llevError, $msg;
184 }; 195 };
185} 196}
186 197
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
203)) { 214)) {
204 no strict 'refs'; 215 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 217}
207 218
208$Event::DIED = sub { 219$EV::DIED = sub {
209 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
210}; 221};
222
223#############################################################################
211 224
212=head2 UTILITY FUNCTIONS 225=head2 UTILITY FUNCTIONS
213 226
214=over 4 227=over 4
215 228
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 248 $d
236 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
237} 250}
238 251
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
242 253
243Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
244 255
245=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
246 257
247Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
259
260=cut
261
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263
264sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) }
248 266
249=item cf::lock_wait $string 267=item cf::lock_wait $string
250 268
251Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
252 270
255Wait until the given lock is available and then acquires it and returns 273Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
258returned. 276returned.
259 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
260Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
262 283
263=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
264 285
265Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
266 287
267=cut 288=cut
268 289
269our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
270 292
271sub lock_wait($) { 293sub lock_wait($) {
272 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
273 300
274 # wait for lock, if any 301 # wait for lock, if any
275 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 304 Coro::schedule;
283 310
284 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
285 lock_wait $key; 312 lock_wait $key;
286 313
287 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
288 316
289 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
292 } 321 }
293} 322}
294 323
306 }; 335 };
307 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
308 $guard 337 $guard
309} 338}
310 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
355=item cf::get_slot $time[, $priority[, $name]]
356
357Allocate $time seconds of blocking CPU time at priority C<$priority>:
358This call blocks and returns only when you have at least C<$time> seconds
359of cpu time till the next tick. The slot is only valid till the next cede.
360
361The optional C<$name> can be used to identify the job to run. It might be
362used for statistical purposes and should identify the same time-class.
363
364Useful for short background jobs.
365
366=cut
367
368our @SLOT_QUEUE;
369our $SLOT_QUEUE;
370
371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
375 my $signal = new Coro::Signal;
376
377 while () {
378 next_job:
379 my $avail = cf::till_tick;
380 if ($avail > 0.01) {
381 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) {
383 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send;
385 Coro::cede;
386 goto next_job;
387 }
388 }
389 }
390
391 if (@SLOT_QUEUE) {
392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
393 push @cf::WAIT_FOR_TICK, $signal;
394 $signal->wait;
395 } else {
396 Coro::schedule;
397 }
398 }
399};
400
401sub get_slot($;$$) {
402 my ($time, $pri, $name) = @_;
403
404 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal;
406
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready;
410 $sig->wait;
411}
412
311=item cf::async { BLOCK } 413=item cf::async { BLOCK }
312 414
313Currently the same as Coro::async_pool, meaning you cannot use 415Currently the same as Coro::async_pool, meaning you cannot use
314C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 416C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
315thing you are allowed to do is call C<prio> on it. 417thing you are allowed to do is call C<prio> on it.
318 420
319BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
320 422
321=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
322 424
323The design of crossfire+ requires that the main coro ($Coro::main) is 425The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 426is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
428acceptable.
326 429
327If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 432server will be frozen during this time, so the block should either finish
330fast or be very important. 433fast or be very important.
333 436
334sub sync_job(&) { 437sub sync_job(&) {
335 my ($job) = @_; 438 my ($job) = @_;
336 439
337 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
338 my $time = Event::time; 441 my $time = EV::time;
339 442
340 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
342 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
343 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
344 # (but this is cancel-safe) 449 # (but this is cancel-safe)
345 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
346 451
347 my $busy = 1; 452 my $busy = 1;
348 my @res; 453 my @res;
349 454
350 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 457 @res = eval { $job->() };
352 warn $@ if $@; 458 warn $@ if $@;
353 undef $busy; 459 undef $busy;
354 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
355 461
356 while ($busy) { 462 while ($busy) {
357 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
358 } 467 }
468 }
359 469
360 $time = Event::time - $time; 470 $time = EV::time - $time;
361 471
362 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364 474
365 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
390 $EXT_CORO{$coro+0} = $coro; 500 $EXT_CORO{$coro+0} = $coro;
391 501
392 $coro 502 $coro
393} 503}
394 504
395sub write_runtime { 505=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 506
398 # first touch the runtime file to show we are still running: 507Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 508process, returning the results. Everything must be serialisable with
509Coro::Storable. May, of course, block. Note that the executed sub may
510never block itself or use any form of event handling.
400 511
401 IO::AIO::aio_utime $runtime, undef, undef; 512=cut
402 513
403 my $guard = cf::lock_acquire "write_runtime"; 514sub fork_call(&@) {
515 my ($cb, @args) = @_;
404 516
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 517 # we seemingly have to make a local copy of the whole thing,
406 or return; 518 # otherwise perl prematurely frees the stuff :/
519 # TODO: investigate and fix (likely this will be rather laborious)
407 520
408 my $value = $cf::RUNTIME + 90 + 10; 521 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 522 reset_signals;
410 # 60 allows for the watchdog to kill the server. 523 &$cb
524 }, @args;
411 525
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 526 wantarray ? @res : $res[-1]
413 and return; 527}
414 528
415 # always fsync - this file is important 529=item $value = cf::db_get $family => $key
416 aio_fsync $fh
417 and return;
418 530
419 # touch it again to show we are up-to-date 531Returns a single value from the environment database.
420 aio_utime $fh, undef, undef;
421 532
422 close $fh 533=item cf::db_put $family => $key => $value
423 or return;
424 534
425 aio_rename "$runtime~", $runtime 535Stores the given C<$value> in the family. It can currently store binary
426 and return; 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
427 537
428 warn "runtime file written.\n";#d# 538=item $db = cf::db_table "name"
429 539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
561
562our $DB;
563
564sub db_init {
565 cf::sync_job {
566 $DB ||= db_table "db";
567 };
568}
569
570sub db_get($$) {
571 my $key = "$_[0]/$_[1]";
572
573 cf::sync_job {
574 BDB::db_get $DB, undef, $key, my $data;
575
576 $! ? ()
577 : $data
430 1 578 }
579}
580
581sub db_put($$$) {
582 BDB::dbreq_pri 4;
583 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
584}
585
586=item cf::cache $id => [$paths...], $processversion => $process
587
588Generic caching function that returns the value of the resource $id,
589caching and regenerating as required.
590
591This function can block.
592
593=cut
594
595sub cache {
596 my ($id, $src, $processversion, $process) = @_;
597
598 my $meta =
599 join "\x00",
600 $processversion,
601 map {
602 aio_stat $_
603 and Carp::croak "$_: $!";
604
605 ($_, (stat _)[7,9])
606 } @$src;
607
608 my $dbmeta = db_get cache => "$id/meta";
609 if ($dbmeta ne $meta) {
610 # changed, we may need to process
611
612 my @data;
613 my $md5;
614
615 for (0 .. $#$src) {
616 0 <= aio_load $src->[$_], $data[$_]
617 or Carp::croak "$src->[$_]: $!";
618 }
619
620 # if processing is expensive, check
621 # checksum first
622 if (1) {
623 $md5 =
624 join "\x00",
625 $processversion,
626 map {
627 cf::cede_to_tick;
628 ($src->[$_], Digest::MD5::md5_hex $data[$_])
629 } 0.. $#$src;
630
631
632 my $dbmd5 = db_get cache => "$id/md5";
633 if ($dbmd5 eq $md5) {
634 db_put cache => "$id/meta", $meta;
635
636 return db_get cache => "$id/data";
637 }
638 }
639
640 my $t1 = Time::HiRes::time;
641 my $data = $process->(\@data);
642 my $t2 = Time::HiRes::time;
643
644 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
645
646 db_put cache => "$id/data", $data;
647 db_put cache => "$id/md5" , $md5;
648 db_put cache => "$id/meta", $meta;
649
650 return $data;
651 }
652
653 db_get cache => "$id/data"
431} 654}
432 655
433=item cf::datalog type => key => value, ... 656=item cf::datalog type => key => value, ...
434 657
435Log a datalog packet of the given type with the given key-value pairs. 658Log a datalog packet of the given type with the given key-value pairs.
453attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
455 678
456In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 681Deliantra).
459 682
460=over 4 683=over 4
461 684
462=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
463 686
665 _attach $registry, $klass, @attach; 888 _attach $registry, $klass, @attach;
666 } 889 }
667 890
668 $obj->{$name} = \%arg; 891 $obj->{$name} = \%arg;
669 } else { 892 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 893 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 894 }
672 895
673 $obj->{_attachment}{$name} = undef; 896 $obj->{_attachment}{$name} = undef;
674} 897}
675 898
715 "; 938 ";
716 die if $@; 939 die if $@;
717} 940}
718 941
719our $override; 942our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 943our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 944
722sub override { 945sub override {
723 $override = 1; 946 $override = 1;
724 @invoke_results = (); 947 @INVOKE_RESULTS = (@_);
725} 948}
726 949
727sub do_invoke { 950sub do_invoke {
728 my $event = shift; 951 my $event = shift;
729 my $callbacks = shift; 952 my $callbacks = shift;
730 953
731 @invoke_results = (); 954 @INVOKE_RESULTS = ();
732 955
733 local $override; 956 local $override;
734 957
735 for (@$callbacks) { 958 for (@$callbacks) {
736 eval { &{$_->[1]} }; 959 eval { &{$_->[1]} };
753 976
754Generate an object-specific event with the given arguments. 977Generate an object-specific event with the given arguments.
755 978
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 979This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 980removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 981results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 982
760=back 983=back
761 984
762=cut 985=cut
763 986
764############################################################################# 987#############################################################################
765# object support 988# object support
989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
1023sub _can_merge {
1024 my ($ob1, $ob2) = @_;
1025
1026 ++$SLOW_MERGES;#d#
1027
1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
1030}
766 1031
767sub reattach { 1032sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1034 my ($obj) = @_;
770 1035
791cf::attachable->attach ( 1056cf::attachable->attach (
792 prio => -1000000, 1057 prio => -1000000,
793 on_instantiate => sub { 1058 on_instantiate => sub {
794 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
795 1060
796 $data = from_json $data; 1061 $data = decode_json $data;
797 1062
798 for (@$data) { 1063 for (@$data) {
799 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
800 1065
801 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
817sub object_freezer_save { 1082sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
819 1084
820 sync_job { 1085 sync_job {
821 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
824 1090
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1095 close $fh;
830 1096
831 if (@$objs) { 1097 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1103 close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
839 } 1105 }
847 } 1113 }
848 } else { 1114 } else {
849 aio_unlink $filename; 1115 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
851 } 1117 }
852 } 1118 };
853} 1119}
854 1120
855sub object_freezer_as_string { 1121sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
857 1123
869 or return; 1135 or return;
870 1136
871 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
873 or return; 1139 or return;
1140
874 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
875 } 1143 }
876 1144
1145 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []};#d# 1147 $decname, length $data, scalar @{$av || []};
1148
879 return ($data, $av); 1149 ($data, $av)
880} 1150}
1151
1152=head2 COMMAND CALLBACKS
1153
1154=over 4
1155
1156=cut
881 1157
882############################################################################# 1158#############################################################################
883# command handling &c 1159# command handling &c
884 1160
885=item cf::register_command $name => \&callback($ob,$args); 1161=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1174 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1175}
900 1176
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1177=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1178
903Register a callbackf ro execution when the client sends an extcmd packet. 1179Register a callback for execution when the client sends an (synchronous)
1180extcmd packet. Ext commands will be processed in the order they are
1181received by the server, like other user commands. The first argument is
1182the logged-in player. Ext commands can only be processed after a player
1183has logged in successfully.
904 1184
905If the callback returns something, it is sent back as if reply was being 1185If the callback returns something, it is sent back as if reply was being
906called. 1186called.
907 1187
1188=item cf::register_exticmd $name => \&callback($ns,$packet);
1189
1190Register a callback for execution when the client sends an (asynchronous)
1191exticmd packet. Exti commands are processed by the server as soon as they
1192are received, i.e. out of order w.r.t. other commands. The first argument
1193is a client socket. Exti commands can be received anytime, even before
1194log-in.
1195
1196If the callback returns something, it is sent back as if reply was being
1197called.
1198
908=cut 1199=cut
909 1200
910sub register_extcmd { 1201sub register_extcmd {
911 my ($name, $cb) = @_; 1202 my ($name, $cb) = @_;
912 1203
913 $EXTCMD{$name} = $cb; 1204 $EXTCMD{$name} = $cb;
1205}
1206
1207sub register_exticmd {
1208 my ($name, $cb) = @_;
1209
1210 $EXTICMD{$name} = $cb;
914} 1211}
915 1212
916cf::player->attach ( 1213cf::player->attach (
917 on_command => sub { 1214 on_command => sub {
918 my ($pl, $name, $params) = @_; 1215 my ($pl, $name, $params) = @_;
927 cf::override; 1224 cf::override;
928 }, 1225 },
929 on_extcmd => sub { 1226 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1227 my ($pl, $buf) = @_;
931 1228
932 my $msg = eval { from_json $buf }; 1229 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1230
934 if (ref $msg) { 1231 if (ref $msg) {
1232 my ($type, $reply, @payload) =
1233 "ARRAY" eq ref $msg
1234 ? @$msg
1235 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1236
1237 my @reply;
1238
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1239 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1240 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1241 }
1242
1243 $pl->ext_reply ($reply, @reply)
1244 if $reply;
1245
940 } else { 1246 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1248 }
943 1249
944 cf::override; 1250 cf::override;
945 }, 1251 },
946); 1252);
947 1253
948sub load_extension {
949 my ($path) = @_;
950
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
952 my $base = $1;
953 my $pkg = $1;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 }
976 die $@;
977 }
978
979 push @EXTS, $pkg;
980}
981
982sub load_extensions { 1254sub load_extensions {
1255 cf::sync_job {
1256 my %todo;
1257
983 for my $ext (<$LIBDIR/*.ext>) { 1258 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1259 next unless -r $path;
985 eval { 1260
986 load_extension $ext; 1261 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1262 my $base = $1;
1263 my $pkg = $1;
1264 $pkg =~ s/[^[:word:]]/_/g;
1265 $pkg = "ext::$pkg";
1266
1267 open my $fh, "<:utf8", $path
1268 or die "$path: $!";
1269
1270 my $source = do { local $/; <$fh> };
1271
1272 my %ext = (
1273 path => $path,
1274 base => $base,
1275 pkg => $pkg,
1276 );
1277
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280
1281 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n"
1284 . $source
1285 . "\n};\n1";
1286
1287 $todo{$base} = \%ext;
1288 }
1289
1290 my %done;
1291 while (%todo) {
1292 my $progress;
1293
1294 while (my ($k, $v) = each %todo) {
1295 for (split /,\s*/, $v->{meta}{depends}) {
1296 goto skip
1297 unless exists $done{$_};
1298 }
1299
1300 warn "... loading '$k' into '$v->{pkg}'\n";
1301
1302 unless (eval $v->{source}) {
1303 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n";
1305
1306 if (exists $v->{meta}{mandatory}) {
1307 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n";
1309 exit 1;
1310 }
1311
1312 warn $msg;
1313 }
1314
1315 $done{$k} = delete $todo{$k};
1316 push @EXTS, $v->{pkg};
1317 $progress = 1;
987 1 1318 }
988 } or warn "$ext not loaded: $@"; 1319
1320 skip:
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1322 unless $progress;
1323 }
989 } 1324 };
990} 1325}
991 1326
992############################################################################# 1327#############################################################################
993 1328
1329=back
1330
994=head2 CORE EXTENSIONS 1331=head2 CORE EXTENSIONS
995 1332
996Functions and methods that extend core crossfire objects. 1333Functions and methods that extend core crossfire objects.
997 1334
998=cut 1335=cut
1002use Coro::AIO; 1339use Coro::AIO;
1003 1340
1004=head3 cf::player 1341=head3 cf::player
1005 1342
1006=over 4 1343=over 4
1344
1345=item cf::player::num_playing
1346
1347Returns the official number of playing players, as per the Crossfire metaserver rules.
1348
1349=cut
1350
1351sub num_playing {
1352 scalar grep
1353 $_->ob->map
1354 && !$_->hidden
1355 && !$_->ob->flag (cf::FLAG_WIZ),
1356 cf::player::list
1357}
1007 1358
1008=item cf::player::find $login 1359=item cf::player::find $login
1009 1360
1010Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1011 1362
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1402
1052 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1404 or return;
1405
1406 my $pl = cf::player::load_pl $f
1407 or return;
1408 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1055 } 1411 }
1056 } 1412 }
1057} 1413}
1058 1414
1068 1424
1069 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1071 1427
1072 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1073 Coro::cede; 1429 cf::cede_to_tick;
1074} 1430}
1075 1431
1076sub new($) { 1432sub new($) {
1077 my ($login) = @_; 1433 my ($login) = @_;
1078 1434
1082 $self->{deny_save} = 1; 1438 $self->{deny_save} = 1;
1083 1439
1084 $cf::PLAYER{$login} = $self; 1440 $cf::PLAYER{$login} = $self;
1085 1441
1086 $self 1442 $self
1443}
1444
1445=item $player->send_msg ($channel, $msg, $color, [extra...])
1446
1447=cut
1448
1449sub send_msg {
1450 my $ns = shift->ns
1451 or return;
1452 $ns->send_msg (@_);
1087} 1453}
1088 1454
1089=item $pl->quit_character 1455=item $pl->quit_character
1090 1456
1091Nukes the player without looking back. If logged in, the connection will 1457Nukes the player without looking back. If logged in, the connection will
1146 or return []; 1512 or return [];
1147 1513
1148 my @logins; 1514 my @logins;
1149 1515
1150 for my $login (@$dirs) { 1516 for my $login (@$dirs) {
1517 my $path = path $login;
1518
1519 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1154 1525
1155 utf8::decode $login; 1526 utf8::decode $login;
1156 push @logins, $login; 1527 push @logins, $login;
1157 } 1528 }
1158 1529
1185 } 1556 }
1186 1557
1187 \@paths 1558 \@paths
1188} 1559}
1189 1560
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1562
1563Expand crossfire pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653
1190=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1191 1655
1192Sends an ext reply to the player. 1656Sends an ext reply to the player.
1193 1657
1194=cut 1658=cut
1195 1659
1196sub ext_reply($$%) { 1660sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1198 1662
1199 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1664}
1203 1665
1204=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1205 1667
1206Sends an ext event to the client. 1668Sends an ext event to the client.
1207 1669
1208=cut 1670=cut
1209 1671
1210sub ext_event($$%) { 1672sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1212 1674
1213 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1214} 1676}
1215 1677
1216=head3 cf::region 1678=head3 cf::region
1217 1679
1218=over 4 1680=over 4
1221 1683
1222package cf::region; 1684package cf::region;
1223 1685
1224=item cf::region::find_by_path $path 1686=item cf::region::find_by_path $path
1225 1687
1226Tries to decuce the probable region for a map knowing only its path. 1688Tries to decuce the likely region for a map knowing only its path.
1227 1689
1228=cut 1690=cut
1229 1691
1230sub find_by_path($) { 1692sub find_by_path($) {
1231 my ($path) = @_; 1693 my ($path) = @_;
1232 1694
1233 my ($match, $specificity); 1695 my ($match, $specificity);
1234 1696
1235 for my $region (list) { 1697 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1698 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1699 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1700 if $region->specificity > $specificity;
1239 } 1701 }
1240 } 1702 }
1241 1703
1305 my ($self, $merge) = @_; 1767 my ($self, $merge) = @_;
1306 1768
1307 # we have to keep some variables in memory intact 1769 # we have to keep some variables in memory intact
1308 local $self->{path}; 1770 local $self->{path};
1309 local $self->{load_path}; 1771 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1772
1313 $self->SUPER::thawer_merge ($merge); 1773 $self->SUPER::thawer_merge ($merge);
1314} 1774}
1315 1775
1316sub normalise { 1776sub normalise {
1363 $self->init; # pass $1 etc. 1823 $self->init; # pass $1 etc.
1364 return $self; 1824 return $self;
1365 } 1825 }
1366 } 1826 }
1367 1827
1368 Carp::carp "unable to resolve path '$path' (base '$base')."; 1828 Carp::cluck "unable to resolve path '$path' (base '$base').";
1369 () 1829 ()
1370} 1830}
1371 1831
1372sub init { 1832sub init {
1373 my ($self) = @_; 1833 my ($self) = @_;
1416 1876
1417 $_->change_map_light ($change) 1877 $_->change_map_light ($change)
1418 for grep $_->outdoor, values %cf::MAP; 1878 for grep $_->outdoor, values %cf::MAP;
1419} 1879}
1420 1880
1881sub decay_objects {
1882 my ($self) = @_;
1883
1884 return if $self->{deny_reset};
1885
1886 $self->do_decay_objects;
1887}
1888
1421sub unlink_save { 1889sub unlink_save {
1422 my ($self) = @_; 1890 my ($self) = @_;
1423 1891
1424 utf8::encode (my $save = $self->save_path); 1892 utf8::encode (my $save = $self->save_path);
1425 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1893 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1428 1896
1429sub load_header_from($) { 1897sub load_header_from($) {
1430 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1431 1899
1432 utf8::encode $path; 1900 utf8::encode $path;
1433 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1434 # or return;
1435
1436 $self->_load_header ($path)
1437 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1438 1909
1439 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1440 1911
1441 1 1912 1
1442} 1913}
1481 $self->load_header_orig 1952 $self->load_header_orig
1482 or return; 1953 or return;
1483 $self->prepare_orig; 1954 $self->prepare_orig;
1484 } 1955 }
1485 1956
1957 $self->{deny_reset} = 1
1958 if $self->no_reset;
1959
1486 $self->default_region (cf::region::find_by_path $self->{path}) 1960 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 1961 unless $self->default_region;
1488 1962
1489 1 1963 1
1490} 1964}
1493sub find { 1967sub find {
1494 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1495 1969
1496 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1497 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1498 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1499 1974
1500 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1501 my $guard = cf::lock_acquire "map_find:$path"; 1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1502 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1503 or return; 1980 or return;
1504 1981
1505 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1506 1983
1507 $map->load_header 1984 $map->load_header
1508 or return; 1985 or return;
1509 1986
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1513 $map->reset; 1992 $map->reset;
1514 undef $guard;
1515 return find $path; 1993 return find $path;
1516 } 1994 }
1517 1995
1518 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1519 } 1997 }
1528 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1529 2007
1530 my $path = $self->{path}; 2008 my $path = $self->{path};
1531 2009
1532 { 2010 {
1533 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1534 2012
2013 return unless $self->valid;
1535 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1536 2015
1537 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1538 2017
1539 $self->alloc; 2018 $self->alloc;
1540 2019
1541 $self->pre_load; 2020 $self->pre_load;
1542 Coro::cede; 2021 cf::cede_to_tick;
1543 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1544 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1545 or return; 2026 or return;
1546 2027
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1548 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1549 2030
1550 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq; 2032 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1553 $self->clear_unique_items; 2035 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1555 } 2039 }
1556 } 2040 }
1557 2041
1558 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1559 # now do the right thing for maps 2045 # now do the right thing for maps
1560 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1561 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1562 unless $self->difficulty; 2048 unless $self->difficulty;
1563 Coro::cede; 2049 cf::cede_to_tick;
1564 2050
1565 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1566 $self->decay_objects; 2052 $self->decay_objects;
1567 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1568 $self->update_buttons; 2054 $self->update_buttons;
1569 Coro::cede; 2055 cf::cede_to_tick;
1570 $self->set_darkness_map; 2056 $self->set_darkness_map;
1571 Coro::cede; 2057 cf::cede_to_tick;
1572 $self->activate; 2058 $self->activate;
1573 } 2059 }
2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
1574 2063
1575 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_IN_MEMORY);
1576 } 2065 }
1577 2066
1578 $self->post_load; 2067 $self->post_load;
1582 my ($self, $ob) = @_; 2071 my ($self, $ob) = @_;
1583 2072
1584 return find "~" . $ob->name . "/" . $self->{path} 2073 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 2074 if $self->per_player;
1586 2075
2076# return find "?party/" . $ob->name . "/" . $self->{path}
2077# if $self->per_party;
2078
1587 $self 2079 $self
1588} 2080}
1589 2081
1590# find and load all maps in the 3x3 area around a map 2082# find and load all maps in the 3x3 area around a map
1591sub load_diag { 2083sub load_neighbours {
1592 my ($map) = @_; 2084 my ($map) = @_;
1593 2085
1594 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1595 2087
1596 for (0 .. 3) { 2088 for (0 .. 3) {
1597 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1598 or next; 2090 or next;
1599 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1600 or next; 2092 or next;
1601 $neigh->load; 2093 $neigh->load;
1602 2094
2095 push @neigh,
1603 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1604 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1605 } 2098 }
1606 2099
1607 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1608 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1609 or next; 2103 or next;
1610 $neigh->load; 2104 $neigh->load;
1611 } 2105 }
1612} 2106}
1613 2107
1618} 2112}
1619 2113
1620sub do_load_sync { 2114sub do_load_sync {
1621 my ($map) = @_; 2115 my ($map) = @_;
1622 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1623 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1624} 2121}
1625 2122
1626our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1627our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1628 2125
1629sub find_async { 2126sub find_async {
1630 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1631 2128
1632 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1633 2130
1634 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1636 } 2133 }
1637 2134
1638 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1639 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1640 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1642 my $map = find $path 2142 if (my $map = find $k) {
1643 or next;
1644 $map->load; 2143 $map->load if $v;
2144 }
1645 2145
1646 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1647 } 2147 }
1648 } 2148 }
1649 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1650 }; 2150 };
1651 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
1654} 2154}
1655 2155
1656sub save { 2156sub save {
1657 my ($self) = @_; 2157 my ($self) = @_;
1658 2158
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2160
1661 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1662 2162
1663 return unless $self->dirty; 2163 return unless $self->dirty;
1664 2164
1670 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1671 2171
1672 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1673 2173
1674 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1675 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1676 }; 2177 };
1677 2178
1678 if ($uniq) { 2179 if ($uniq) {
1679 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1687 my ($self) = @_; 2188 my ($self) = @_;
1688 2189
1689 # save first because save cedes 2190 # save first because save cedes
1690 $self->save; 2191 $self->save;
1691 2192
1692 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
1693 2194
1694 return if $self->players; 2195 return if $self->players;
1695 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
1696 return if $self->{deny_save}; 2197 return if $self->{deny_save};
1697 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
1698 $self->clear; 2203 $self->clear;
1699 $self->in_memory (cf::MAP_SWAPPED);
1700} 2204}
1701 2205
1702sub reset_at { 2206sub reset_at {
1703 my ($self) = @_; 2207 my ($self) = @_;
1704 2208
1705 # TODO: safety, remove and allow resettable per-player maps 2209 # TODO: safety, remove and allow resettable per-player maps
1706 return 1e99 if $self->isa ("ext::map_per_player");#d#
1707 return 1e99 if $self->{deny_reset}; 2210 return 1e99 if $self->{deny_reset};
1708 2211
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2212 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2213 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 2214
1722 my ($self) = @_; 2225 my ($self) = @_;
1723 2226
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 2228
1726 return if $self->players; 2229 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 2230
1729 warn "resetting map ", $self->path;#d# 2231 warn "resetting map ", $self->path;
1730 2232
1731 $self->in_memory (cf::MAP_SWAPPED); 2233 $self->in_memory (cf::MAP_SWAPPED);
1732 2234
1733 # need to save uniques path 2235 # need to save uniques path
1734 unless ($self->{deny_save}) { 2236 unless ($self->{deny_save}) {
1738 if $uniq; 2240 if $uniq;
1739 } 2241 }
1740 2242
1741 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
1742 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
1743 $self->clear; 2247 $self->clear;
1744
1745 $_->clear_links_to ($self) for values %cf::MAP;
1746 2248
1747 $self->unlink_save; 2249 $self->unlink_save;
1748 $self->destroy; 2250 $self->destroy;
1749} 2251}
1750 2252
1751my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
1752 2254
1753sub nuke { 2255sub nuke {
1754 my ($self) = @_; 2256 my ($self) = @_;
1755 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
1756 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
1757 2262
1758 $self->unlink_save; 2263 $self->unlink_save;
1759 2264
1760 bless $self, "cf::map"; 2265 bless $self, "cf::map";
1761 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
1762 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
1763 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
1764 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1765 2270
1766 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
1767 2273
1768 $self->reset; # polite request, might not happen 2274 $self->reset; # polite request, might not happen
2275}
2276
2277=item $maps = cf::map::tmp_maps
2278
2279Returns an arrayref with all map paths of currently instantiated and saved
2280maps. May block.
2281
2282=cut
2283
2284sub tmp_maps() {
2285 [
2286 map {
2287 utf8::decode $_;
2288 /\.map$/
2289 ? normalise $_
2290 : ()
2291 } @{ aio_readdir $TMPDIR or [] }
2292 ]
2293}
2294
2295=item $maps = cf::map::random_maps
2296
2297Returns an arrayref with all map paths of currently instantiated and saved
2298random maps. May block.
2299
2300=cut
2301
2302sub random_maps() {
2303 [
2304 map {
2305 utf8::decode $_;
2306 /\.map$/
2307 ? normalise "?random/$_"
2308 : ()
2309 } @{ aio_readdir $RANDOMDIR or [] }
2310 ]
1769} 2311}
1770 2312
1771=item cf::map::unique_maps 2313=item cf::map::unique_maps
1772 2314
1773Returns an arrayref of paths of all shared maps that have 2315Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 2316instantiated unique items. May block.
1775 2317
1776=cut 2318=cut
1777 2319
1778sub unique_maps() { 2320sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 2321 [
1780 or return; 2322 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 2323 utf8::decode $_;
1786 next if /\.pst$/; 2324 /\.map$/
1787 next unless /^$PATH_SEP/o; 2325 ? normalise $_
1788 2326 : ()
1789 push @paths, cf::map::normalise $_; 2327 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 2328 ]
1791
1792 \@paths
1793} 2329}
1794 2330
1795package cf; 2331package cf;
1796 2332
1797=back 2333=back
1815 map { $_, inv_recursive_ $_->inv } @_ 2351 map { $_, inv_recursive_ $_->inv } @_
1816} 2352}
1817 2353
1818sub inv_recursive { 2354sub inv_recursive {
1819 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
2356}
2357
2358=item $ref = $ob->ref
2359
2360creates and returns a persistent reference to an objetc that can be stored as a string.
2361
2362=item $ob = cf::object::deref ($refstring)
2363
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block.
2366
2367=cut
2368
2369sub deref {
2370 my ($ref) = @_;
2371
2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2373 my ($uuid, $name) = ($1, $2);
2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2375 or return;
2376 $pl->ob->uuid eq $uuid
2377 or return;
2378
2379 $pl->ob
2380 } else {
2381 warn "$ref: cannot resolve object reference\n";
2382 undef
2383 }
1820} 2384}
1821 2385
1822package cf; 2386package cf;
1823 2387
1824=back 2388=back
1843 2407
1844 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2408 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1845 2409
1846 if ($self->{record_replies}) { 2410 if ($self->{record_replies}) {
1847 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2411 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2412
1848 } else { 2413 } else {
2414 my $pl = $self->contr;
2415
2416 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2417 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419
2420 } else {
1849 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
1850 $self->message ($msg, $flags); 2422 $self->message ($msg, $flags);
2423 }
1851 } 2424 }
2425}
2426
2427=item $object->send_msg ($channel, $msg, $color, [extra...])
2428
2429=cut
2430
2431sub cf::object::send_msg {
2432 my $pl = shift->contr
2433 or return;
2434 $pl->send_msg (@_);
1852} 2435}
1853 2436
1854=item $player_object->may ("access") 2437=item $player_object->may ("access")
1855 2438
1856Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
1935 # use -1 or undef as default coordinates, not 0, 0 2518 # use -1 or undef as default coordinates, not 0, 0
1936 ($x, $y) = ($map->enter_x, $map->enter_y) 2519 ($x, $y) = ($map->enter_x, $map->enter_y)
1937 if $x <=0 && $y <= 0; 2520 if $x <=0 && $y <= 0;
1938 2521
1939 $map->load; 2522 $map->load;
1940 $map->load_diag; 2523 $map->load_neighbours;
1941 2524
1942 return unless $self->contr->active; 2525 return unless $self->contr->active;
1943 $self->activate_recursive; 2526 $self->activate_recursive;
1944 2527
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1946 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
1947} 2530}
1948 2531
1949=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1950 2533
1951Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position. 2537the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process.
1955 2539
1956=cut 2540=cut
1957 2541
1958our $GOTOGEN; 2542our $GOTOGEN;
1959 2543
1960sub cf::object::player::goto { 2544sub cf::object::player::goto {
1961 my ($self, $path, $x, $y, $check) = @_; 2545 my ($self, $path, $x, $y, $check, $done) = @_;
1962 2546
1963 # do generation counting so two concurrent goto's will be executed in-order 2547 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1965 2549
1966 $self->enter_link; 2550 $self->enter_link;
1967 2551
1968 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
1969 my $map = eval { 2574 my $map = eval {
1970 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
1971 2576
1972 if ($map) { 2577 if ($map) {
1973 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
1975 } else { 2580 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1977 } 2582 }
1978 2583
1979 $map 2584 $map
1980 }; 2585 };
1981 2586
1986 2591
1987 if ($gen == $self->{_goto_generation}) { 2592 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation}; 2593 delete $self->{_goto_generation};
1989 $self->leave_link ($map, $x, $y); 2594 $self->leave_link ($map, $x, $y);
1990 } 2595 }
2596
2597 $done->() if $done;
1991 })->prio (1); 2598 })->prio (1);
1992} 2599}
1993 2600
1994=item $player_object->enter_exit ($exit_object) 2601=item $player_object->enter_exit ($exit_object)
1995 2602
2032 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2033 } 2640 }
2034 2641
2035 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2036 2643
2037 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2038 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2039 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2040 2647
2041 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2042 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2064 my $hp = $exit->stats->hp; 2671 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp; 2672 my $sp = $exit->stats->sp;
2066 2673
2067 $self->enter_link; 2674 $self->enter_link;
2068 2675
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2069 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2070 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2071 unless (eval { 2684 unless (eval {
2072 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2073 2686
2074 1; 2687 1;
2100 2713
2101 utf8::encode $text; 2714 utf8::encode $text;
2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2715 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2103} 2716}
2104 2717
2718=item $client->send_msg ($channel, $msg, $color, [extra...])
2719
2720Send a drawinfo or msg packet to the client, formatting the msg for the
2721client if neccessary. C<$type> should be a string identifying the type of
2722the message, with C<log> being the default. If C<$color> is negative, suppress
2723the message unless the client supports the msg packet.
2724
2725=cut
2726
2727# non-persistent channels (usually the info channel)
2728our %CHANNEL = (
2729 "c/identify" => {
2730 id => "infobox",
2731 title => "Identify",
2732 reply => undef,
2733 tooltip => "Items recently identified",
2734 },
2735 "c/examine" => {
2736 id => "infobox",
2737 title => "Examine",
2738 reply => undef,
2739 tooltip => "Signs and other items you examined",
2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2777);
2778
2779sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_;
2781
2782 $msg = $self->pl->expand_cfpod ($msg);
2783
2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785
2786 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2795 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel)
2800 if $self->can_msg;
2801 }
2802
2803 $channel = $channel->{id};
2804 }
2805
2806 return unless @extra || length $msg;
2807
2808 if ($self->can_msg) {
2809 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF;
2812
2813 $self->send_packet ("msg " . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2815 } else {
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826
2827 $color &= cf::NDI_COLOR_MASK;
2828
2829 utf8::encode $msg;
2830
2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 }
2840}
2841
2105=item $client->ext_event ($type, %msg) 2842=item $client->ext_msg ($type, @msg)
2106 2843
2107Sends an exti event to the client. 2844Sends an ext event to the client.
2108 2845
2109=cut 2846=cut
2110 2847
2111sub cf::client::ext_event($$%) { 2848sub cf::client::ext_msg($$@) {
2112 my ($self, $type, %msg) = @_; 2849 my ($self, $type, @msg) = @_;
2113 2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove
2114 $msg{msgtype} = "event_$type"; 2854 push @msg, msgtype => "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 }
2857}
2858
2859=item $client->ext_reply ($msgid, @msg)
2860
2861Sends an ext reply to the client.
2862
2863=cut
2864
2865sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_;
2867
2868 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 }
2116} 2875}
2117 2876
2118=item $success = $client->query ($flags, "text", \&cb) 2877=item $success = $client->query ($flags, "text", \&cb)
2119 2878
2120Queues a query to the client, calling the given callback with 2879Queues a query to the client, calling the given callback with
2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2880the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2122C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2881C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2123 2882
2124Queries can fail, so check the return code. Or don't, as queries will become 2883Queries can fail, so check the return code. Or don't, as queries will
2125reliable at some point in the future. 2884become reliable at some point in the future.
2126 2885
2127=cut 2886=cut
2128 2887
2129sub cf::client::query { 2888sub cf::client::query {
2130 my ($self, $flags, $text, $cb) = @_; 2889 my ($self, $flags, $text, $cb) = @_;
2138 utf8::encode $text; 2897 utf8::encode $text;
2139 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2898 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2140 2899
2141 $self->send_packet ($self->{query_queue}[0][0]) 2900 $self->send_packet ($self->{query_queue}[0][0])
2142 if @{ $self->{query_queue} } == 1; 2901 if @{ $self->{query_queue} } == 1;
2902
2903 1
2143} 2904}
2144 2905
2145cf::client->attach ( 2906cf::client->attach (
2907 on_connect => sub {
2908 my ($ns) = @_;
2909
2910 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2911 },
2146 on_reply => sub { 2912 on_reply => sub {
2147 my ($ns, $msg) = @_; 2913 my ($ns, $msg) = @_;
2148 2914
2149 # this weird shuffling is so that direct followup queries 2915 # this weird shuffling is so that direct followup queries
2150 # get handled first 2916 # get handled first
2162 } else { 2928 } else {
2163 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2929 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2164 } 2930 }
2165 } 2931 }
2166 }, 2932 },
2933 on_exticmd => sub {
2934 my ($ns, $buf) = @_;
2935
2936 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2937
2938 if (ref $msg) {
2939 my ($type, $reply, @payload) =
2940 "ARRAY" eq ref $msg
2941 ? @$msg
2942 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2943
2944 my @reply;
2945
2946 if (my $cb = $EXTICMD{$type}) {
2947 @reply = $cb->($ns, @payload);
2948 }
2949
2950 $ns->ext_reply ($reply, @reply)
2951 if $reply;
2952
2953 } else {
2954 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2955 }
2956
2957 cf::override;
2958 },
2167); 2959);
2168 2960
2169=item $client->async (\&cb) 2961=item $client->async (\&cb)
2170 2962
2171Create a new coroutine, running the specified callback. The coroutine will 2963Create a new coroutine, running the specified callback. The coroutine will
2212our $safe = new Safe "safe"; 3004our $safe = new Safe "safe";
2213our $safe_hole = new Safe::Hole; 3005our $safe_hole = new Safe::Hole;
2214 3006
2215$SIG{FPE} = 'IGNORE'; 3007$SIG{FPE} = 'IGNORE';
2216 3008
2217$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3009$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math
3011 grepstart grepwhile mapstart mapwhile
3012 sort time
3013));
2218 3014
2219# here we export the classes and methods available to script code 3015# here we export the classes and methods available to script code
2220 3016
2221=pod 3017=pod
2222 3018
2223The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2224 3020
2225 cf::object contr pay_amount pay_player map 3021 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr
3024
2226 cf::object::player player 3025 cf::object::player
2227 cf::player peaceful 3026 player
2228 cf::map trigger 3027
3028 cf::player
3029 peaceful
3030
3031 cf::map
3032 trigger
2229 3033
2230=cut 3034=cut
2231 3035
2232for ( 3036for (
2233 ["cf::object" => qw(contr pay_amount pay_player map)], 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race
3039 decrease_ob_nr destroy)],
2234 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2235 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2236 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2237) { 3043) {
2238 no strict 'refs'; 3044 no strict 'refs';
2309=back 3115=back
2310 3116
2311=cut 3117=cut
2312 3118
2313############################################################################# 3119#############################################################################
2314
2315=head2 EXTENSION DATABASE SUPPORT
2316
2317Crossfire maintains a very simple database for extension use. It can
2318currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2319convert to/from binary).
2320
2321The parameter C<$family> should best start with the name of the extension
2322using it, it should be unique.
2323
2324=over 4
2325
2326=item $value = cf::db_get $family => $key
2327
2328Returns a single value from the database.
2329
2330=item cf::db_put $family => $key => $value
2331
2332Stores the given C<$value> in the family.
2333
2334=cut
2335
2336our $DB;
2337
2338sub db_init {
2339 unless ($DB) {
2340 $DB = BDB::db_create $DB_ENV;
2341
2342 cf::sync_job {
2343 eval {
2344 $DB->set_flags (BDB::CHKSUM);
2345
2346 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2347 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2348 cf::cleanup "db_open(db): $!" if $!;
2349 };
2350 cf::cleanup "db_open(db): $@" if $@;
2351 };
2352 }
2353}
2354
2355sub db_get($$) {
2356 my $key = "$_[0]/$_[1]";
2357
2358 cf::sync_job {
2359 BDB::db_get $DB, undef, $key, my $data;
2360
2361 $! ? ()
2362 : $data
2363 }
2364}
2365
2366sub db_put($$$) {
2367 BDB::dbreq_pri 4;
2368 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2369}
2370
2371=item cf::cache $id => [$paths...], $processversion => $process
2372
2373Generic caching function that returns the value of the resource $id,
2374caching and regenerating as required.
2375
2376This function can block.
2377
2378=cut
2379
2380sub cache {
2381 my ($id, $src, $processversion, $process) = @_;
2382
2383 my $meta =
2384 join "\x00",
2385 $processversion,
2386 map {
2387 aio_stat $_
2388 and Carp::croak "$_: $!";
2389
2390 ($_, (stat _)[7,9])
2391 } @$src;
2392
2393 my $dbmeta = db_get cache => "$id/meta";
2394 if ($dbmeta ne $meta) {
2395 # changed, we may need to process
2396
2397 my @data;
2398 my $md5;
2399
2400 for (0 .. $#$src) {
2401 0 <= aio_load $src->[$_], $data[$_]
2402 or Carp::croak "$src->[$_]: $!";
2403 }
2404
2405 # if processing is expensive, check
2406 # checksum first
2407 if (1) {
2408 $md5 =
2409 join "\x00",
2410 $processversion,
2411 map {
2412 Coro::cede;
2413 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2414 } 0.. $#$src;
2415
2416
2417 my $dbmd5 = db_get cache => "$id/md5";
2418 if ($dbmd5 eq $md5) {
2419 db_put cache => "$id/meta", $meta;
2420
2421 return db_get cache => "$id/data";
2422 }
2423 }
2424
2425 my $t1 = Time::HiRes::time;
2426 my $data = $process->(\@data);
2427 my $t2 = Time::HiRes::time;
2428
2429 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2430
2431 db_put cache => "$id/data", $data;
2432 db_put cache => "$id/md5" , $md5;
2433 db_put cache => "$id/meta", $meta;
2434
2435 return $data;
2436 }
2437
2438 db_get cache => "$id/data"
2439}
2440
2441=item fork_call { }, $args
2442
2443Executes the given code block with the given arguments in a seperate
2444process, returning the results. Everything must be serialisable with
2445Coro::Storable. May, of course, block. Note that the executed sub may
2446never block itself or use any form of Event handling.
2447
2448=cut
2449
2450sub fork_call(&@) {
2451 my ($cb, @args) = @_;
2452
2453# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2454# or die "socketpair: $!";
2455 pipe my $fh1, my $fh2
2456 or die "pipe: $!";
2457
2458 if (my $pid = fork) {
2459 close $fh2;
2460
2461 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2462 $res = Coro::Storable::thaw $res;
2463
2464 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2465
2466 die $$res unless "ARRAY" eq ref $res;
2467
2468 return wantarray ? @$res : $res->[-1];
2469 } else {
2470 reset_signals;
2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2473 eval {
2474 close $fh1;
2475
2476 my @res = eval { $cb->(@args) };
2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2478 };
2479
2480 warn $@ if $@;
2481 _exit 0;
2482 }
2483}
2484
2485#############################################################################
2486# the server's init and main functions 3120# the server's init and main functions
2487 3121
2488sub load_facedata($) { 3122sub load_facedata($) {
2489 my ($path) = @_; 3123 my ($path) = @_;
3124
3125 # HACK to clear player env face cache, we need some signal framework
3126 # for this (global event?)
3127 %ext::player_env::MUSIC_FACE_CACHE = ();
3128
3129 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2490 3130
2491 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2492 3132
2493 my $facedata; 3133 my $facedata;
2494 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
2497 $facedata = Coro::Storable::thaw $facedata; 3137 $facedata = Coro::Storable::thaw $facedata;
2498 3138
2499 $facedata->{version} == 2 3139 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed."; 3140 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501 3141
3142 # patch in the exptable
3143 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3146 };
3147 cf::cede_to_tick;
3148
2502 { 3149 {
2503 my $faces = $facedata->{faceinfo}; 3150 my $faces = $facedata->{faceinfo};
2504 3151
2505 while (my ($face, $info) = each %$faces) { 3152 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3153 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3154 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2510 Coro::cede; 3158
3159 cf::cede_to_tick;
2511 } 3160 }
2512 3161
2513 while (my ($face, $info) = each %$faces) { 3162 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth}; 3163 next unless $info->{smooth};
2515 my $idx = cf::face::find $face 3164 my $idx = cf::face::find $face
2516 or next; 3165 or next;
2517 if (my $smooth = cf::face::find $info->{smooth}) { 3166 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth;
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519 } else { 3169 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3170 warn "smooth face '$info->{smooth}' not found for face '$face'";
2521 } 3171 }
2522 Coro::cede; 3172
3173 cf::cede_to_tick;
2523 } 3174 }
2524 } 3175 }
2525 3176
2526 { 3177 {
2527 my $anims = $facedata->{animinfo}; 3178 my $anims = $facedata->{animinfo};
2528 3179
2529 while (my ($anim, $info) = each %$anims) { 3180 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3181 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede; 3182 cf::cede_to_tick;
2532 } 3183 }
2533 3184
2534 cf::anim::invalidate_all; # d'oh 3185 cf::anim::invalidate_all; # d'oh
2535 } 3186 }
2536 3187
3188 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource};
3192
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198
3199 if ($info->{type} & 1) {
3200 # prepend meta info
3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
3208 } else {
3209 $data = $info->{data};
3210 }
3211
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick;
3216 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 }
3236
2537 1 3237 1
2538} 3238}
2539 3239
3240register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_;
3242
3243 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v);
3245 }
3246};
3247
2540sub reload_regions { 3248sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = ();
3252
2541 load_resource_file "$MAPDIR/regions" 3253 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n"; 3254 or die "unable to load regions file\n";
3255
3256 for (cf::region::list) {
3257 $_->{match} = qr/$_->{match}/
3258 if exists $_->{match};
3259 }
2543} 3260}
2544 3261
2545sub reload_facedata { 3262sub reload_facedata {
2546 load_facedata "$DATADIR/facedata" 3263 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n"; 3264 or die "unable to load facedata\n";
2548} 3265}
2549 3266
2550sub reload_archetypes { 3267sub reload_archetypes {
2551 load_resource_file "$DATADIR/archetypes" 3268 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n"; 3269 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
2553} 3275}
2554 3276
2555sub reload_treasures { 3277sub reload_treasures {
2556 load_resource_file "$DATADIR/treasures" 3278 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n"; 3279 or die "unable to load treasurelists\n";
2560sub reload_resources { 3282sub reload_resources {
2561 warn "reloading resource files...\n"; 3283 warn "reloading resource files...\n";
2562 3284
2563 reload_regions; 3285 reload_regions;
2564 reload_facedata; 3286 reload_facedata;
3287 #reload_archetypes;#d#
2565 reload_archetypes; 3288 reload_archetypes;
2566 reload_treasures; 3289 reload_treasures;
2567 3290
2568 warn "finished reloading resource files\n"; 3291 warn "finished reloading resource files\n";
2569} 3292}
2570 3293
2571sub init { 3294sub init {
2572 reload_resources; 3295 reload_resources;
2573} 3296}
2574 3297
2575sub cfg_load { 3298sub reload_config {
2576 open my $fh, "<:utf8", "$CONFDIR/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
2577 or return; 3300 or return;
2578 3301
2579 local $/; 3302 local $/;
2580 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
2596sub main { 3319sub main {
2597 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
2598 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
2599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2600 (async { 3323 (async {
2601 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
2602 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
2603 }; 3327 };
2604 3328
2605 cfg_load; 3329 reload_config;
2606 db_init; 3330 db_init;
2607 load_extensions; 3331 load_extensions;
2608 3332
2609 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2610 Event::loop; 3335 EV::loop;
2611} 3336}
2612 3337
2613############################################################################# 3338#############################################################################
2614# initialisation and cleanup 3339# initialisation and cleanup
2615 3340
2616# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
2617BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
2618 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
2619 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2620 reentrant => 0,
2621 data => WF_AUTOCANCEL,
2622 signal => $signal,
2623 prio => 0,
2624 cb => sub {
2625 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
2626 },
2627 ); 3347 };
3348 }
3349}
3350
3351sub write_runtime {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time.
3356
3357 IO::AIO::aio_utime $runtime, undef, undef;
3358
3359 my $guard = cf::lock_acquire "write_runtime";
3360
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3362 or return;
3363
3364 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server.
3367
3368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3369 and return;
3370
3371 # always fsync - this file is important
3372 aio_fsync $fh
3373 and return;
3374
3375 # touch it again to show we are up-to-date
3376 aio_utime $fh, undef, undef;
3377
3378 close $fh
3379 or return;
3380
3381 aio_rename "$runtime~", $runtime
3382 and return;
3383
3384 warn "runtime file written.\n";
3385
2628 } 3386 1
2629} 3387}
2630 3388
2631sub emergency_save() { 3389sub emergency_save() {
2632 my $freeze_guard = cf::freeze_mainloop; 3390 my $freeze_guard = cf::freeze_mainloop;
2633 3391
2639 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
2640 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
2641 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
2642 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
2643 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2644 $pl->save; 3403 $pl->save;
2645 } 3404 }
2646 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
2647 3406
2648 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
2687 warn "syncing database to disk"; 3446 warn "syncing database to disk";
2688 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
2689 3448
2690 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
2691 3450
2692 warn "cancelling all WF_AUTOCANCEL watchers";
2693 for (Event::all_watchers) {
2694 $_->cancel if $_->data & WF_AUTOCANCEL;
2695 }
2696
2697 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
2698 for (;;) { 3452 for (;;) {
2699 BDB::flush; 3453 BDB::flush;
2700 IO::AIO::flush; 3454 IO::AIO::flush;
2701 Coro::cede; 3455 Coro::cede_notself;
2702 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
2703 warn "iterate..."; 3457 warn "iterate...";
2704 } 3458 }
2705 3459
2706 ++$RELOAD; 3460 ++$RELOAD;
2710 %EXT_CORO = (); 3464 %EXT_CORO = ();
2711 3465
2712 warn "removing commands"; 3466 warn "removing commands";
2713 %COMMAND = (); 3467 %COMMAND = ();
2714 3468
2715 warn "removing ext commands"; 3469 warn "removing ext/exti commands";
2716 %EXTCMD = (); 3470 %EXTCMD = ();
3471 %EXTICMD = ();
2717 3472
2718 warn "unloading/nuking all extensions"; 3473 warn "unloading/nuking all extensions";
2719 for my $pkg (@EXTS) { 3474 for my $pkg (@EXTS) {
2720 warn "... unloading $pkg"; 3475 warn "... unloading $pkg";
2721 3476
2764 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
2765 require cf; 3520 require cf;
2766 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2767 3522
2768 warn "loading config and database again"; 3523 warn "loading config and database again";
2769 cf::cfg_load; 3524 cf::reload_config;
2770 3525
2771 warn "loading extensions"; 3526 warn "loading extensions";
2772 cf::load_extensions; 3527 cf::load_extensions;
2773 3528
2774 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
2794 3549
2795sub reload_perl() { 3550sub reload_perl() {
2796 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
2797 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
2798 3553
2799 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2800 reentrant => 0,
2801 after => 0,
2802 data => WF_AUTOCANCEL,
2803 cb => sub {
2804 do_reload_perl;
2805 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
2806 }, 3556 do_reload_perl;
2807 ); 3557 };
2808} 3558}
2809 3559
2810register_command "reload" => sub { 3560register_command "reload" => sub {
2811 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2812 3562
2813 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2814 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
2815 async { reload_perl }; 3567 reload_perl;
3568 };
2816 } 3569 }
2817}; 3570};
2818 3571
2819unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2820 3573
2839 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
2840 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
2841 $signal->wait; 3594 $signal->wait;
2842} 3595}
2843 3596
2844 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2845 my $avg = 10;
2846$TICK_WATCHER = Event->timer (
2847 reentrant => 0,
2848 parked => 1,
2849 prio => 0,
2850 at => $NEXT_TICK || $TICK,
2851 data => WF_AUTOCANCEL,
2852 cb => sub {
2853 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
2854 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2855 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
2856 return; 3601 return;
2857 } 3602 }
2858 3603
2859 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
2860 3605
2861 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
2862 3607
2863 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
2864 for(1..10) { 3609 $NEXT_TICK += $TICK;
2865 my $t = Event::time;
2866 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2867 or die;
2868 3610
2869 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2870 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = $NOW + 10;
2871 $map->alloc; 3613 Coro::async_pool {
2872 $map->_load_objects ("/tmp/x.map", 1); 3614 $Coro::current->{desc} = "runtime saver";
2873 my $t = Event::time - $t; 3615 write_runtime
2874 3616 or warn "ERROR: unable to write runtime file: $!";
2875 #next unless $t < 0.0013;#d#
2876 if ($t < $min) {
2877 $min = $t;
2878 }
2879 $avg = $avg * 0.99 + $t * 0.01;
2880 }
2881 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2882 exit 0;
2883 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2884 }; 3617 };
3618 }
2885 3619
2886 $RUNTIME += $TICK;
2887 $NEXT_TICK += $TICK;
2888
2889 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2890 $NEXT_RUNTIME_WRITE = $NOW + 10;
2891 Coro::async_pool {
2892 write_runtime
2893 or warn "ERROR: unable to write runtime file: $!";
2894 };
2895 }
2896
2897# my $AFTER = Event::time;
2898# warn $AFTER - $NOW;#d#
2899
2900 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2901 $sig->send; 3621 $sig->send;
2902 } 3622 }
2903 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
2904 $sig->send; 3624 $sig->send;
2905 } 3625 }
2906 3626
2907 $NOW = Event::time;
2908
2909 # if we are delayed by four ticks or more, skip them all
2910 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2911
2912 $TICK_WATCHER->at ($NEXT_TICK);
2913 $TICK_WATCHER->start;
2914
2915 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
2916 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2917 3629
2918 _post_tick; 3630 _post_tick;
2919 3631};
2920 3632$TICK_WATCHER->priority (EV::MAXPRI);
2921 },
2922);
2923 3633
2924{ 3634{
2925 BDB::max_poll_time $TICK * 0.1;
2926 $BDB_POLL_WATCHER = Event->io (
2927 reentrant => 0,
2928 fd => BDB::poll_fileno,
2929 poll => 'r',
2930 prio => 0,
2931 data => WF_AUTOCANCEL,
2932 cb => \&BDB::poll_cb,
2933 );
2934 BDB::min_parallel 8; 3635 BDB::min_parallel 8;
2935 3636 BDB::max_poll_reqs $TICK * 0.1;
2936 BDB::set_sync_prepare {
2937 my $status;
2938 my $current = $Coro::current;
2939 (
2940 sub {
2941 $status = $!;
2942 $current->ready; undef $current;
2943 },
2944 sub {
2945 Coro::schedule while defined $current;
2946 $! = $status;
2947 },
2948 )
2949 };
2950 3637
2951 unless ($DB_ENV) { 3638 unless ($DB_ENV) {
2952 $DB_ENV = BDB::db_env_create; 3639 $DB_ENV = BDB::db_env_create;
3640 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3641 | BDB::LOG_AUTOREMOVE, 1);
3642 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3643 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2953 3644
2954 cf::sync_job { 3645 cf::sync_job {
2955 eval { 3646 eval {
2956 BDB::db_env_open 3647 BDB::db_env_open
2957 $DB_ENV, 3648 $DB_ENV,
2959 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3650 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2960 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3651 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2961 0666; 3652 0666;
2962 3653
2963 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3654 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2964
2965 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2966 $DB_ENV->set_lk_detect;
2967 }; 3655 };
2968 3656
2969 cf::cleanup "db_env_open(db): $@" if $@; 3657 cf::cleanup "db_env_open(db): $@" if $@;
2970 }; 3658 };
2971 } 3659 }
3660
3661 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 };
3664 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3665 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3666 };
3667 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3668 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3669 };
2972} 3670}
2973 3671
2974{ 3672{
2975 IO::AIO::min_parallel 8; 3673 IO::AIO::min_parallel 8;
2976 3674
2977 undef $Coro::AIO::WATCHER; 3675 undef $Coro::AIO::WATCHER;
2978 IO::AIO::max_poll_time $TICK * 0.1; 3676 IO::AIO::max_poll_time $TICK * 0.1;
2979 $AIO_POLL_WATCHER = Event->io ( 3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
2980 reentrant => 0,
2981 data => WF_AUTOCANCEL,
2982 fd => IO::AIO::poll_fileno,
2983 poll => 'r',
2984 prio => 6,
2985 cb => \&IO::AIO::poll_cb,
2986 );
2987} 3678}
2988 3679
2989my $_log_backtrace; 3680my $_log_backtrace;
2990 3681
2991sub _log_backtrace { 3682sub _log_backtrace {
2995 3686
2996 # limit the # of concurrent backtraces 3687 # limit the # of concurrent backtraces
2997 if ($_log_backtrace < 2) { 3688 if ($_log_backtrace < 2) {
2998 ++$_log_backtrace; 3689 ++$_log_backtrace;
2999 async { 3690 async {
3691 $Coro::current->{desc} = "abt $msg";
3692
3000 my @bt = fork_call { 3693 my @bt = fork_call {
3001 @addr = map { sprintf "%x", $_ } @addr; 3694 @addr = map { sprintf "%x", $_ } @addr;
3002 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3695 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3003 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3696 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3004 or die "addr2line: $!"; 3697 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines