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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.437 by root, Tue Jul 8 08:33:27 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB 1.6;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS 1.4 (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.32 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
36 61
37# configure various modules to our taste 62# configure various modules to our taste
38# 63#
39$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 67
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 69
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 71
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
75 96
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 99our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
83 101
102our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 104our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 105our $DB_ENV;
86 106
87our %CFG; 107our %CFG;
88 108
89our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 110our $RUNTIME;
111our $NOW;
91 112
92our %PLAYER; # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 114our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
95 116
96# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 119
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
102 124
103binmode STDOUT; 125binmode STDOUT;
104binmode STDERR; 126binmode STDERR;
105 127
106# read virtual server time, if available 128# read virtual server time, if available
159 181
160The raw value load value from the last tick. 182The raw value load value from the last tick.
161 183
162=item %cf::CFG 184=item %cf::CFG
163 185
164Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 187from wherever your confdir points to.
166 188
167=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
168 190
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 209 $msg .= "\n"
188 unless $msg =~ /\n$/; 210 unless $msg =~ /\n$/;
189 211
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 213
192 utf8::encode $msg;
193 LOG llevError, $msg; 214 LOG llevError, $msg;
194 }; 215 };
195} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
196 232
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 249)) {
214 no strict 'refs'; 250 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 252}
217 253
218$Event::DIED = sub { 254$EV::DIED = sub {
219 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
220}; 256};
221 257
222############################################################################# 258#############################################################################
223 259
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 283 $d
248 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
249} 285}
250 286
251=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
252 288
253Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
254 290
255=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
256 292
257Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
258 294
259=cut 295=cut
260 296
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 298
263sub to_json ($) { $json_coder->encode ($_[0]) } 299sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 300sub decode_json($) { $json_coder->decode ($_[0]) }
265 301
266=item cf::lock_wait $string 302=item cf::lock_wait $string
267 303
268Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
269 305
272Wait until the given lock is available and then acquires it and returns 308Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 309a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 310for example when the coroutine gets canceled), the lock is automatically
275returned. 311returned.
276 312
313Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro.
315
277Lock names should begin with a unique identifier (for example, cf::map::find 316Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 317uses map_find and cf::map::load uses map_load).
279 318
280=item $locked = cf::lock_active $string 319=item $locked = cf::lock_active $string
281 320
282Return true if the lock is currently active, i.e. somebody has locked it. 321Return true if the lock is currently active, i.e. somebody has locked it.
283 322
284=cut 323=cut
285 324
286our %LOCK; 325our %LOCK;
326our %LOCKER;#d#
287 327
288sub lock_wait($) { 328sub lock_wait($) {
289 my ($key) = @_; 329 my ($key) = @_;
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
290 335
291 # wait for lock, if any 336 # wait for lock, if any
292 while ($LOCK{$key}) { 337 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 338 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 339 Coro::schedule;
300 345
301 # wait, to be sure we are not locked 346 # wait, to be sure we are not locked
302 lock_wait $key; 347 lock_wait $key;
303 348
304 $LOCK{$key} = []; 349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
305 351
306 Coro::guard { 352 Coro::guard {
353 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 354 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 355 $_->ready for @{ delete $LOCK{$key} };
309 } 356 }
310} 357}
311 358
314 361
315 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
316} 363}
317 364
318sub freeze_mainloop { 365sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
320 367
321 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
322 $TICK_WATCHER->start; 369}
323 }; 370
324 $TICK_WATCHER->stop; 371=item cf::periodic $interval, $cb
325 $guard 372
373Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer.
375
376=cut
377
378sub periodic($$) {
379 my ($interval, $cb) = @_;
380
381 my $start = rand List::Util::min 180, $interval;
382
383 EV::periodic $start, $interval, 0, $cb
326} 384}
327 385
328=item cf::get_slot $time[, $priority[, $name]] 386=item cf::get_slot $time[, $priority[, $name]]
329 387
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 388Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 399our @SLOT_QUEUE;
342our $SLOT_QUEUE; 400our $SLOT_QUEUE;
343 401
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 402$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 403$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager");
405
346 my $signal = new Coro::Signal; 406 my $signal = new Coro::Signal;
347 407
348 while () { 408 while () {
349 next_job: 409 next_job:
350 my $avail = cf::till_tick; 410 my $avail = cf::till_tick;
358 } 418 }
359 } 419 }
360 } 420 }
361 421
362 if (@SLOT_QUEUE) { 422 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 423 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 424 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 425 $signal->wait;
366 } else { 426 } else {
367 Coro::schedule; 427 Coro::schedule;
368 } 428 }
369 } 429 }
370}; 430};
371 431
372sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
373 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
374 436
375 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
377 439
391 453
392BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
393 455
394=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
395 457
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 459is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 461acceptable.
400 462
401If it must be done, put the blocking parts into C<sync_job>. This will run 463If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 464the given BLOCK in another coroutine while waiting for the result. The
407 469
408sub sync_job(&) { 470sub sync_job(&) {
409 my ($job) = @_; 471 my ($job) = @_;
410 472
411 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 474 my $time = EV::time;
413 475
414 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
416 478
417 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 480
419 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
420 482
421 my $busy = 1; 483 my $busy = 1;
422 my @res; 484 my @res;
423 485
424 (async { 486 (async {
487 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 488 @res = eval { $job->() };
426 warn $@ if $@; 489 warn $@ if $@;
427 undef $busy; 490 undef $busy;
428 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
429 492
430 while ($busy) { 493 while ($busy) {
431 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
432 } 498 }
499 }
433 500
434 $time = Event::time - $time; 501 my $time = EV::time - $time;
435 502
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
440 504
441 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
442 } else { 506 } else {
443 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
444 508
469=item fork_call { }, $args 533=item fork_call { }, $args
470 534
471Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
475 539
476=cut 540=cut
477 541
478sub fork_call(&@) { 542sub fork_call(&@) {
479 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
480 544
481 # we seemingly have to make a local copy of the whole thing, 545 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 546 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 547 # TODO: investigate and fix (likely this will be rather laborious)
484 548
485 my @res = Coro::Util::fork_eval { 549 my @res = Coro::Util::fork_eval {
486 reset_signals; 550 reset_signals;
487 &$cb 551 &$cb
488 }, @args; 552 }, @args;
489 553
490 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
491} 555}
492 556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
582}
583
493=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
494 585
495Returns a single value from the environment database. 586Returns a single value from the environment database.
496 587
497=item cf::db_put $family => $key => $value 588=item cf::db_put $family => $key => $value
498 589
499Stores the given C<$value> in the family. It can currently store binary 590Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 591data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 592
593=item $db = cf::db_table "name"
594
595Create and/or open a new database table. The string must not be "db" and must be unique
596within each server.
597
502=cut 598=cut
599
600sub db_table($) {
601 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV;
603
604 eval {
605 $db->set_flags (BDB::CHKSUM);
606
607 utf8::encode $name;
608 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
609 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
610 cf::cleanup "db_open(db): $!" if $!;
611 };
612 cf::cleanup "db_open(db): $@" if $@;
613
614 $db
615}
503 616
504our $DB; 617our $DB;
505 618
506sub db_init { 619sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 620 cf::sync_job {
511 eval { 621 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 622 };
521} 623}
522 624
523sub db_get($$) { 625sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 626 my $key = "$_[0]/$_[1]";
525 627
575 if (1) { 677 if (1) {
576 $md5 = 678 $md5 =
577 join "\x00", 679 join "\x00",
578 $processversion, 680 $processversion,
579 map { 681 map {
580 Coro::cede; 682 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 683 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 684 } 0.. $#$src;
583 685
584 686
585 my $dbmd5 = db_get cache => "$id/md5"; 687 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
631 733
632In the following description, CLASS can be any of C<global>, C<object> 734In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 735C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 736Deliantra).
635 737
636=over 4 738=over 4
637 739
638=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
639 741
921 } 1023 }
922 1024
923 0 1025 0
924} 1026}
925 1027
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1029
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1031
930Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
931 1033
937 1039
938=cut 1040=cut
939 1041
940############################################################################# 1042#############################################################################
941# object support 1043# object support
942#
943 1044
1045sub _object_equal($$);
1046sub _object_equal($$) {
1047 my ($a, $b) = @_;
1048
1049 return 0 unless (ref $a) eq (ref $b);
1050
1051 if ("HASH" eq ref $a) {
1052 my @ka = keys %$a;
1053 my @kb = keys %$b;
1054
1055 return 0 if @ka != @kb;
1056
1057 for (0 .. $#ka) {
1058 return 0 unless $ka[$_] eq $kb[$_];
1059 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1060 }
1061
1062 } elsif ("ARRAY" eq ref $a) {
1063
1064 return 0 if @$a != @$b;
1065
1066 for (0 .. $#$a) {
1067 return 0 unless _object_equal $a->[$_], $b->[$_];
1068 }
1069
1070 } elsif ($a ne $b) {
1071 return 0;
1072 }
1073
1074 1
1075}
1076
1077our $SLOW_MERGES;#d#
944sub _can_merge { 1078sub _can_merge {
945 my ($ob1, $ob2) = @_; 1079 my ($ob1, $ob2) = @_;
946 1080
947 local $Storable::canonical = 1; 1081 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1082
951 $fob1 eq $fob2 1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
952} 1085}
953 1086
954sub reattach { 1087sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1089 my ($obj) = @_;
978cf::attachable->attach ( 1111cf::attachable->attach (
979 prio => -1000000, 1112 prio => -1000000,
980 on_instantiate => sub { 1113 on_instantiate => sub {
981 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
982 1115
983 $data = from_json $data; 1116 $data = decode_json $data;
984 1117
985 for (@$data) { 1118 for (@$data) {
986 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
987 1120
988 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1137sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1138 my ($filename, $rdata, $objs) = @_;
1006 1139
1007 sync_job { 1140 sync_job {
1008 if (length $$rdata) { 1141 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1011 1145
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1150 aio_close $fh;
1017 1151
1018 if (@$objs) { 1152 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1158 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1160 }
1027 } else { 1161 } else {
1028 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1029 } 1163 }
1034 } 1168 }
1035 } else { 1169 } else {
1036 aio_unlink $filename; 1170 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1038 } 1172 }
1039 } 1173 };
1040} 1174}
1041 1175
1042sub object_freezer_as_string { 1176sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1177 my ($rdata, $objs) = @_;
1044 1178
1056 or return; 1190 or return;
1057 1191
1058 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1194 or return;
1195
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1062 } 1198 }
1063 1199
1200 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1203
1066 return ($data, $av); 1204 ($data, $av)
1067} 1205}
1068 1206
1069=head2 COMMAND CALLBACKS 1207=head2 COMMAND CALLBACKS
1070 1208
1071=over 4 1209=over 4
1149 my ($type, $reply, @payload) = 1287 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1288 "ARRAY" eq ref $msg
1151 ? @$msg 1289 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1290 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1291
1292 my @reply;
1293
1154 if (my $cb = $EXTCMD{$type}) { 1294 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1295 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1296 }
1297
1298 $pl->ext_reply ($reply, @reply)
1299 if $reply;
1300
1160 } else { 1301 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1303 }
1163 1304
1164 cf::override; 1305 cf::override;
1217 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1219 1360
1220 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1221 warn $msg; 1362 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1223 exit 1;
1224 } 1364 }
1225 1365
1226 warn $msg; 1366 warn $msg;
1227 } 1367 }
1228 1368
1253use Coro::AIO; 1393use Coro::AIO;
1254 1394
1255=head3 cf::player 1395=head3 cf::player
1256 1396
1257=over 4 1397=over 4
1398
1399=item cf::player::num_playing
1400
1401Returns the official number of playing players, as per the Crossfire metaserver rules.
1402
1403=cut
1404
1405sub num_playing {
1406 scalar grep
1407 $_->ob->map
1408 && !$_->hidden
1409 && !$_->ob->flag (cf::FLAG_WIZ),
1410 cf::player::list
1411}
1258 1412
1259=item cf::player::find $login 1413=item cf::player::find $login
1260 1414
1261Returns the given player object, loading it if necessary (might block). 1415Returns the given player object, loading it if necessary (might block).
1262 1416
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1452 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1453 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1454 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1455 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1456
1303 my $pl = load_pl path $login 1457 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1458 or return;
1459
1460 my $pl = cf::player::load_pl $f
1461 or return;
1462
1463 local $cf::PLAYER_LOADING{$login} = $pl;
1464 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1306 } 1466 }
1307 } 1467 }
1308} 1468}
1309 1469
1318 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1319 1479
1320 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1322 1482
1483 cf::get_slot 0.01;
1484
1323 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1324 Coro::cede; 1486 cf::cede_to_tick;
1325} 1487}
1326 1488
1327sub new($) { 1489sub new($) {
1328 my ($login) = @_; 1490 my ($login) = @_;
1329 1491
1362 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1363 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1364 1526
1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1366 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1367 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1368 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1369 1533
1370 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1371 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1407 or return []; 1571 or return [];
1408 1572
1409 my @logins; 1573 my @logins;
1410 1574
1411 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1576 my $path = path $login;
1577
1578 # a .pst is a dead give-away for a valid player
1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1584 }
1415 1585
1416 utf8::decode $login; 1586 utf8::decode $login;
1417 push @logins, $login; 1587 push @logins, $login;
1418 } 1588 }
1419 1589
1452 1622
1453Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1454 1624
1455=cut 1625=cut
1456 1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1457sub expand_cfpod { 1638sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1459 1640
1460 # escape & and < 1641 my $xml;
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1642
1464 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1465 1646
1466 1 while 1647 $group =~ s/&/&amp;/g;
1467 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1471 # replace G<male|female> tags 1652 ([BCGHITU])
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1653 <
1473 $self->gender ? $2 : $1 1654 (?:
1474 }ge 1655 ([^<>]*) (?{ $group = $^N })
1475 # replace H<hint text> 1656 | < $interior >
1476 || s{H<([^\>]*)>} 1657 )
1658 >
1659 %gcsx
1477 { 1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1680 "")
1481 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1482 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1483 1692
1693 for ($xml) {
1484 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1486 1696
1487 # compress some whitespace 1697 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1492 1703
1493 $_ 1704 $xml
1494} 1705}
1706
1707no re 'eval';
1495 1708
1496sub hintmode { 1709sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1711 $_[0]{hintmode}
1499} 1712}
1505=cut 1718=cut
1506 1719
1507sub ext_reply($$@) { 1720sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1721 my ($self, $id, @msg) = @_;
1509 1722
1510 if ($self->ns->extcmd == 2) { 1723 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1724}
1518 1725
1519=item $player->ext_msg ($type, @msg) 1726=item $player->ext_msg ($type, @msg)
1520 1727
1521Sends an ext event to the client. 1728Sends an ext event to the client.
1577our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1579 1786
1580sub generate_random_map { 1787sub generate_random_map {
1581 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1582 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1793 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1918
1709# the temporary/swap location 1919# the temporary/swap location
1710sub save_path { 1920sub save_path {
1711 my ($self) = @_; 1921 my ($self) = @_;
1712 1922
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1715} 1925}
1716 1926
1717# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1718sub uniq_path { 1928sub uniq_path {
1719 my ($self) = @_; 1929 my ($self) = @_;
1720 1930
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1723} 1933}
1724 1934
1725# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1726# all maps in C++... 1936# all maps in C++...
1749 1959
1750sub load_header_from($) { 1960sub load_header_from($) {
1751 my ($self, $path) = @_; 1961 my ($self, $path) = @_;
1752 1962
1753 utf8::encode $path; 1963 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1964 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1965 or return;
1966
1967 $self->_load_header ($f)
1968 or return;
1969
1970 local $MAP_LOADING{$self->{path}} = $self;
1971 $f->resolve_delayed_derefs;
1759 1972
1760 $self->{load_path} = $path; 1973 $self->{load_path} = $path;
1761 1974
1762 1 1975 1
1763} 1976}
1817sub find { 2030sub find {
1818 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1819 2032
1820 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1821 2034
2035 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1823 2037
1824 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1825 my $guard = cf::lock_acquire "map_find:$path"; 2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
1826 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1827 or return; 2043 or return;
1828 2044
1829 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1830 2046
1832 or return; 2048 or return;
1833 2049
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2054 undef $guard1;
1837 $map->reset; 2055 $map->reset;
1838 undef $guard;
1839 return find $path; 2056 return find $path;
1840 } 2057 }
1841 2058
1842 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1843 } 2060 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
1853 2070
1854 my $path = $self->{path}; 2071 my $path = $self->{path};
1855 2072
1856 { 2073 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 2074 my $guard = cf::lock_acquire "map_data:$path";
1858 2075
2076 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2077 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2078
1861 $self->in_memory (cf::MAP_LOADING); 2079 $self->in_memory (cf::MAP_LOADING);
1862 2080
1863 $self->alloc; 2081 $self->alloc;
1864 2082
1865 $self->pre_load; 2083 $self->pre_load;
1866 Coro::cede; 2084 cf::cede_to_tick;
1867 2085
2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2088 $self->_load_objects ($f)
1869 or return; 2089 or return;
1870 2090
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 2092 if delete $self->{load_original};
1873 2093
1874 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2095 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2096 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2098 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2099 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs;
2101 }
1879 } 2102 }
1880 } 2103 }
1881 2104
1882 Coro::cede; 2105 $f->resolve_delayed_derefs;
2106
2107 cf::cede_to_tick;
1883 # now do the right thing for maps 2108 # now do the right thing for maps
1884 $self->link_multipart_objects; 2109 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2110 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2111 unless $self->difficulty;
1887 Coro::cede; 2112 cf::cede_to_tick;
1888 2113
1889 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2115 $self->decay_objects;
1891 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
1892 $self->update_buttons; 2117 $self->update_buttons;
1893 Coro::cede; 2118 cf::cede_to_tick;
1894 $self->set_darkness_map; 2119 $self->set_darkness_map;
1895 Coro::cede; 2120 cf::cede_to_tick;
1896 $self->activate; 2121 $self->activate;
1897 } 2122 }
1898 2123
1899 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
1901 2126
1902 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1903 } 2128 }
1904 2129
1905 $self->post_load; 2130 $self->post_load;
1906} 2131}
1907 2132
1916 2141
1917 $self 2142 $self
1918} 2143}
1919 2144
1920# find and load all maps in the 3x3 area around a map 2145# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2146sub load_neighbours {
1922 my ($map) = @_; 2147 my ($map) = @_;
1923 2148
1924 my @diag; # diagonal neighbours 2149 my @neigh; # diagonal neighbours
1925 2150
1926 for (0 .. 3) { 2151 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2152 my $neigh = $map->tile_path ($_)
1928 or next; 2153 or next;
1929 $neigh = find $neigh, $map 2154 $neigh = find $neigh, $map
1930 or next; 2155 or next;
1931 $neigh->load; 2156 $neigh->load;
1932 2157
2158 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2159 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2160 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2161 }
1936 2162
1937 for (@diag) { 2163 for (grep defined $_->[0], @neigh) {
2164 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2165 my $neigh = find $path, $origin
1939 or next; 2166 or next;
1940 $neigh->load; 2167 $neigh->load;
1941 } 2168 }
1942} 2169}
1943 2170
1948} 2175}
1949 2176
1950sub do_load_sync { 2177sub do_load_sync {
1951 my ($map) = @_; 2178 my ($map) = @_;
1952 2179
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main;
2182
1953 cf::sync_job { $map->load }; 2183 cf::sync_job { $map->load };
1954} 2184}
1955 2185
1956our %MAP_PREFETCH; 2186our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2187our $MAP_PREFETCHER = undef;
1958 2188
1959sub find_async { 2189sub find_async {
1960 my ($path, $origin) = @_; 2190 my ($path, $origin, $load) = @_;
1961 2191
1962 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
1963 2193
1964 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1966 } 2196 }
1967 2197
1968 undef $MAP_PREFETCH{$path}; 2198 $MAP_PREFETCH{$path} |= $load;
2199
1969 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
1970 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2205 if (my $map = find $k) {
1973 $map->load; 2206 $map->load if $v;
1974 } 2207 }
1975 2208
1976 delete $MAP_PREFETCH{$path}; 2209 delete $MAP_PREFETCH{$k};
1977 } 2210 }
1978 } 2211 }
1979 undef $MAP_PREFETCHER; 2212 undef $MAP_PREFETCHER;
1980 }; 2213 };
1981 $MAP_PREFETCHER->prio (6); 2214 $MAP_PREFETCHER->prio (6);
1984} 2217}
1985 2218
1986sub save { 2219sub save {
1987 my ($self) = @_; 2220 my ($self) = @_;
1988 2221
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2223
1991 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
1992 2225
1993 return unless $self->dirty; 2226 return unless $self->dirty;
1994 2227
2000 return if $self->{deny_save}; 2233 return if $self->{deny_save};
2001 2234
2002 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
2003 2236
2004 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2006 }; 2240 };
2241
2242 cf::get_slot 0.02;
2007 2243
2008 if ($uniq) { 2244 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2010 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2011 } else { 2247 } else {
2017 my ($self) = @_; 2253 my ($self) = @_;
2018 2254
2019 # save first because save cedes 2255 # save first because save cedes
2020 $self->save; 2256 $self->save;
2021 2257
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2259
2024 return if $self->players; 2260 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2026 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2027 2263
2264 $self->in_memory (cf::MAP_SWAPPED);
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2268 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2269}
2031 2270
2032sub reset_at { 2271sub reset_at {
2033 my ($self) = @_; 2272 my ($self) = @_;
2034 2273
2066 if $uniq; 2305 if $uniq;
2067 } 2306 }
2068 2307
2069 delete $cf::MAP{$self->path}; 2308 delete $cf::MAP{$self->path};
2070 2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2312 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2313
2075 $self->unlink_save; 2314 $self->unlink_save;
2076 $self->destroy; 2315 $self->destroy;
2077} 2316}
2078 2317
2079my $nuke_counter = "aaaa"; 2318my $nuke_counter = "aaaa";
2080 2319
2081sub nuke { 2320sub nuke {
2082 my ($self) = @_; 2321 my ($self) = @_;
2083 2322
2323 {
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2084 delete $cf::MAP{$self->path}; 2326 delete $cf::MAP{$self->path};
2085 2327
2086 $self->unlink_save; 2328 $self->unlink_save;
2087 2329
2088 bless $self, "cf::map"; 2330 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2331 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2332 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2333 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2335
2094 $cf::MAP{$self->path} = $self; 2336 $cf::MAP{$self->path} = $self;
2337 }
2095 2338
2096 $self->reset; # polite request, might not happen 2339 $self->reset; # polite request, might not happen
2097} 2340}
2098 2341
2099=item $maps = cf::map::tmp_maps 2342=item $maps = cf::map::tmp_maps
2141 2384
2142sub unique_maps() { 2385sub unique_maps() {
2143 [ 2386 [
2144 map { 2387 map {
2145 utf8::decode $_; 2388 utf8::decode $_;
2146 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2147 ? normalise $_ 2392 : normalise $_
2148 : ()
2149 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2150 ] 2394 ]
2151} 2395}
2152 2396
2153package cf;
2154
2155=back 2397=back
2156 2398
2157=head3 cf::object 2399=head3 cf::object
2158 2400
2159=cut 2401=cut
2162 2404
2163=over 4 2405=over 4
2164 2406
2165=item $ob->inv_recursive 2407=item $ob->inv_recursive
2166 2408
2167Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2168 2411
2169=cut 2412=cut
2170 2413
2171sub inv_recursive_; 2414sub inv_recursive_;
2172sub inv_recursive_ { 2415sub inv_recursive_ {
2175 2418
2176sub inv_recursive { 2419sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2178} 2421}
2179 2422
2423=item $ref = $ob->ref
2424
2425Creates and returns a persistent reference to an object that can be stored as a string.
2426
2427=item $ob = cf::object::deref ($refstring)
2428
2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2430even if the object actually exists. May block.
2431
2432=cut
2433
2434sub deref {
2435 my ($ref) = @_;
2436
2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2438 my ($uuid, $name) = ($1, $2);
2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2440 or return;
2441 $pl->ob->uuid eq $uuid
2442 or return;
2443
2444 $pl->ob
2445 } else {
2446 warn "$ref: cannot resolve object reference\n";
2447 undef
2448 }
2449}
2450
2180package cf; 2451package cf;
2181 2452
2182=back 2453=back
2183 2454
2184=head3 cf::object::player 2455=head3 cf::object::player
2190Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2461Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2191can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2192dialogue with the given NPC character. 2463dialogue with the given NPC character.
2193 2464
2194=cut 2465=cut
2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2195 2480
2196# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2197# with dialog boxes. 2482# with dialog boxes.
2198#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2199sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2211 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2213 2498
2214 } else { 2499 } else {
2215 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2216 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2217 } 2502 }
2218 } 2503 }
2219} 2504}
2220 2505
2221=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2312 # use -1 or undef as default coordinates, not 0, 0 2597 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2598 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2599 if $x <=0 && $y <= 0;
2315 2600
2316 $map->load; 2601 $map->load;
2317 $map->load_diag; 2602 $map->load_neighbours;
2318 2603
2319 return unless $self->contr->active; 2604 return unless $self->contr->active;
2320 $self->activate_recursive; 2605 $self->activate_recursive;
2321 2606
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2329her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2330that has to return the map if sucecssful, and then unfreezes the player on 2615that has to return the map if sucecssful, and then unfreezes the player on
2331the new (success) or old (failed) map position. In either case, $done will 2616the new (success) or old (failed) map position. In either case, $done will
2332be called at the end of this process. 2617be called at the end of this process.
2333 2618
2619Note that $check will be called with a potentially non-loaded map, so if
2620it needs a loaded map it has to call C<< ->load >>.
2621
2334=cut 2622=cut
2335 2623
2336our $GOTOGEN; 2624our $GOTOGEN;
2337 2625
2338sub cf::object::player::goto { 2626sub cf::object::player::goto {
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2631
2344 $self->enter_link; 2632 $self->enter_link;
2345 2633
2346 (async { 2634 (async {
2635 $Coro::current->{desc} = "player::goto $path $x $y";
2636
2637 # *tag paths override both path and x|y
2638 if ($path =~ /^\*(.*)$/) {
2639 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2640 my $ob = $obs[rand @obs];
2641
2642 # see if we actually can go there
2643 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2644 $ob = $obs[rand @obs];
2645 } else {
2646 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2647 }
2648 # else put us there anyways for now #d#
2649
2650 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2651 } else {
2652 ($path, $x, $y) = (undef, undef, undef);
2653 }
2654 }
2655
2347 my $map = eval { 2656 my $map = eval {
2348 my $map = cf::map::find $path; 2657 my $map = defined $path ? cf::map::find $path : undef;
2349 2658
2350 if ($map) { 2659 if ($map) {
2351 $map = $map->customise_for ($self); 2660 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2661 $map = $check->($map) if $check && $map;
2353 } else { 2662 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2663 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2664 }
2356 2665
2357 $map 2666 $map
2358 }; 2667 };
2359 2668
2395} 2704}
2396 2705
2397sub prepare_random_map { 2706sub prepare_random_map {
2398 my ($exit) = @_; 2707 my ($exit) = @_;
2399 2708
2400 my $guard = cf::lock_acquire "exit_prepare:$exit";
2401
2402 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2403 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2404 # that depends on the exit object 2711 # that depends on the exit object
2405 2712
2406 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
2408 if ($exit->map) { 2715 if ($exit->map) {
2409 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2410 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2411 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2412 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2413 } 2722 }
2414 2723
2415 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2416 2725
2417 my $data = cf::to_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2418 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2419 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2420 2729
2421 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2423 undef $fh; 2732 undef $fh;
2424 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2425 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2426 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2427 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2428 } 2741 }
2429} 2742}
2430 2743
2431sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2432 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2433 2746
2434 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2435 2748
2436 if ($exit->slaying eq "/!") {
2437 #TODO: this should de-fi-ni-te-ly not be a sync-job
2438 # the problem is that $exit might not survive long enough
2439 # so it needs to be done right now, right here
2440 cf::sync_job { prepare_random_map $exit };
2441 }
2442
2443 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2444 my $hp = $exit->stats->hp;
2445 my $sp = $exit->stats->sp;
2446
2447 $self->enter_link; 2749 $self->enter_link;
2448 2750
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
2452
2453 (async { 2751 (async {
2454 $self->deactivate_recursive; # just to be sure 2752 $Coro::current->{desc} = "enter_exit";
2753
2455 unless (eval { 2754 unless (eval {
2755 $self->deactivate_recursive; # just to be sure
2756
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2766 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp;
2768
2456 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2457 2770
2771 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED);
2774
2458 1; 2775 1
2459 }) { 2776 }) {
2460 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2461 . "I'll try to bring you back to the map you were before. " 2778 . "I'll try to bring you back to the map you were before. "
2462 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2463 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2810the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2811the message unless the client supports the msg packet.
2495 2812
2496=cut 2813=cut
2497 2814
2815# non-persistent channels (usually the info channel)
2816our %CHANNEL = (
2817 "c/identify" => {
2818 id => "infobox",
2819 title => "Identify",
2820 reply => undef,
2821 tooltip => "Items recently identified",
2822 },
2823 "c/examine" => {
2824 id => "infobox",
2825 title => "Examine",
2826 reply => undef,
2827 tooltip => "Signs and other items you examined",
2828 },
2829 "c/book" => {
2830 id => "infobox",
2831 title => "Book",
2832 reply => undef,
2833 tooltip => "The contents of a note or book",
2834 },
2835 "c/lookat" => {
2836 id => "infobox",
2837 title => "Look",
2838 reply => undef,
2839 tooltip => "What you saw there",
2840 },
2841 "c/who" => {
2842 id => "infobox",
2843 title => "Players",
2844 reply => undef,
2845 tooltip => "Shows players who are currently online",
2846 },
2847 "c/body" => {
2848 id => "infobox",
2849 title => "Body Parts",
2850 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available",
2852 },
2853 "c/uptime" => {
2854 id => "infobox",
2855 title => "Uptime",
2856 reply => undef,
2857 tooltip => "How long the server has been running since last restart",
2858 },
2859 "c/mapinfo" => {
2860 id => "infobox",
2861 title => "Map Info",
2862 reply => undef,
2863 tooltip => "Information related to the maps",
2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2870 },
2871);
2872
2498sub cf::client::send_msg { 2873sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2875
2501 $msg = $self->pl->expand_cfpod ($msg); 2876 $msg = $self->pl->expand_cfpod ($msg);
2502 2877
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2878 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2879
2880 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel};
2883
2884 $self->ext_msg (channel_info => $channel)
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id};
2888
2505 if (ref $channel) { 2889 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2890 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2891 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2892 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2893 $self->ext_msg (channel_info => $channel)
2894 if $self->can_msg;
2510 } 2895 }
2511 2896
2512 $channel = $channel->{id}; 2897 $channel = $channel->{id};
2513 } 2898 }
2514 2899
2555=cut 2940=cut
2556 2941
2557sub cf::client::ext_msg($$@) { 2942sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2943 my ($self, $type, @msg) = @_;
2559 2944
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2945 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2947 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2948 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2951}
2952
2953=item $client->ext_reply ($msgid, @msg)
2954
2955Sends an ext reply to the client.
2956
2957=cut
2958
2959sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_;
2961
2962 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2968 }
2568} 2969}
2569 2970
2570=item $success = $client->query ($flags, "text", \&cb) 2971=item $success = $client->query ($flags, "text", \&cb)
2632 my ($type, $reply, @payload) = 3033 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 3034 "ARRAY" eq ref $msg
2634 ? @$msg 3035 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3036 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 3037
3038 my @reply;
3039
2637 if (my $cb = $EXTICMD{$type}) { 3040 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 3041 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 3042 }
3043
3044 $ns->ext_reply ($reply, @reply)
3045 if $reply;
3046
2643 } else { 3047 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3048 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 3049 }
2646 3050
2647 cf::override; 3051 cf::override;
2707=pod 3111=pod
2708 3112
2709The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
2710 3114
2711 cf::object 3115 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3116 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove name archname title slaying race 3117 insert remove name archname title slaying race decrease split
2714 3118
2715 cf::object::player 3119 cf::object::player
2716 player 3120 player
2717 3121
2718 cf::player 3122 cf::player
2723 3127
2724=cut 3128=cut
2725 3129
2726for ( 3130for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 3132 insert remove inv nrof name archname title slaying race
3133 decrease split destroy)],
2729 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
2732) { 3137) {
2733 no strict 'refs'; 3138 no strict 'refs';
2809# the server's init and main functions 3214# the server's init and main functions
2810 3215
2811sub load_facedata($) { 3216sub load_facedata($) {
2812 my ($path) = @_; 3217 my ($path) = @_;
2813 3218
3219 # HACK to clear player env face cache, we need some signal framework
3220 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = ();
3222
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224
2814 warn "loading facedata from $path\n"; 3225 warn "loading facedata from $path\n";
2815 3226
2816 my $facedata; 3227 my $facedata;
2817 0 < aio_load $path, $facedata 3228 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3229 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3231 $facedata = Coro::Storable::thaw $facedata;
2821 3232
2822 $facedata->{version} == 2 3233 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3234 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3235
3236 # patch in the exptable
3237 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3240 };
3241 cf::cede_to_tick;
3242
2825 { 3243 {
2826 my $faces = $facedata->{faceinfo}; 3244 my $faces = $facedata->{faceinfo};
2827 3245
2828 while (my ($face, $info) = each %$faces) { 3246 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3247 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248
2830 cf::face::set_visibility $idx, $info->{visibility}; 3249 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3250 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3253
2835 cf::cede_to_tick; 3254 cf::cede_to_tick;
2836 } 3255 }
2837 3256
2838 while (my ($face, $info) = each %$faces) { 3257 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3258 next unless $info->{smooth};
3259
2840 my $idx = cf::face::find $face 3260 my $idx = cf::face::find $face
2841 or next; 3261 or next;
3262
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3263 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3264 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3266 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3267 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3284
2864 { 3285 {
2865 # TODO: for gcfclient pleasure, we should give resources 3286 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3287 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3288 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3289
2872 while (my ($name, $info) = each %$res) { 3290 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3291 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3292 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
2879 3294
2880 if ($info->{type} & 1) { 3295 if ($info->{type} & 1) {
2881 # prepend meta info 3296 # prepend meta info
2882 3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3303 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3304 } else {
3305 $data = $info->{data};
3306 }
2885 3307
2886 cf::face::set_data $idx, 0, $data, $chk; 3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type};
2887 } else { 3310 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3311 $RESOURCE{$name} = $info;
2889 } 3312 }
2890 3313
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3314 cf::cede_to_tick;
2894 } 3315 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 } 3316 }
3317
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2914 3319
2915 1 3320 1
2916} 3321}
3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
2917 3342
2918register_exticmd fx_want => sub { 3343register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_; 3344 my ($ns, $want) = @_;
2920 3345
2921 while (my ($k, $v) = each %$want) { 3346 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v); 3347 $ns->fx_want ($k, $v);
2923 } 3348 }
2924}; 3349};
2925 3350
3351sub load_resource_file($) {
3352 my $guard = lock_acquire "load_resource_file";
3353
3354 my $status = load_resource_file_ $_[0];
3355 get_slot 0.1, 100;
3356 cf::arch::commit_load;
3357
3358 $status
3359}
3360
2926sub reload_regions { 3361sub reload_regions {
3362 # HACK to clear player env face cache, we need some signal framework
3363 # for this (global event?)
3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3365
2927 load_resource_file "$MAPDIR/regions" 3366 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3367 or die "unable to load regions file\n";
2929 3368
2930 for (cf::region::list) { 3369 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3370 $_->{match} = qr/$_->{match}/
2939} 3378}
2940 3379
2941sub reload_archetypes { 3380sub reload_archetypes {
2942 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
2943 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
2944 #d# NEED to laod twice to resolve forward references
2945 # this really needs to be done in an extra post-pass
2946 # (which needs to be synchronous, so solve it differently)
2947 load_resource_file "$DATADIR/archetypes"
2948 or die "unable to load archetypes\n";
2949} 3383}
2950 3384
2951sub reload_treasures { 3385sub reload_treasures {
2952 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
2953 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
2954} 3388}
2955 3389
2956sub reload_resources { 3390sub reload_resources {
2957 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
2958 3392
3393 reload_facedata;
3394 reload_archetypes;
2959 reload_regions; 3395 reload_regions;
2960 reload_facedata;
2961 #reload_archetypes;#d#
2962 reload_archetypes;
2963 reload_treasures; 3396 reload_treasures;
2964 3397
2965 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
2966} 3399}
2967 3400
2968sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
2969 reload_resources; 3406 reload_resources;
2970} 3407}
2971 3408
2972sub cfg_load { 3409sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3411 or return;
2975 3412
2976 local $/; 3413 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3414 *CFG = YAML::Load <$fh>;
2978 3415
2979 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2980 3417
2981 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2982 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2993sub main { 3430sub main {
2994 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3434 (async {
2998 Event::one_event; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT;
2999 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3000 }; 3438 };
3001 3439
3002 cfg_load; 3440 {
3441 my $guard = freeze_mainloop;
3442 reload_config;
3003 db_init; 3443 db_init;
3004 load_extensions; 3444 load_extensions;
3005 3445
3006 $TICK_WATCHER->start; 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 }
3448
3007 Event::loop; 3449 EV::loop;
3008} 3450}
3009 3451
3010############################################################################# 3452#############################################################################
3011# initialisation and cleanup 3453# initialisation and cleanup
3012 3454
3013# install some emergency cleanup handlers 3455# install some emergency cleanup handlers
3014BEGIN { 3456BEGIN {
3457 our %SIGWATCHER = ();
3015 for my $signal (qw(INT HUP TERM)) { 3458 for my $signal (qw(INT HUP TERM)) {
3016 Event->signal ( 3459 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3017 reentrant => 0,
3018 data => WF_AUTOCANCEL,
3019 signal => $signal,
3020 prio => 0,
3021 cb => sub {
3022 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
3023 },
3024 ); 3461 };
3025 } 3462 }
3026} 3463}
3027 3464
3028sub write_runtime { 3465sub write_runtime_sync {
3029 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
3030 3467
3031 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3032 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3033 3470
3059 and return; 3496 and return;
3060 3497
3061 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3062 3499
3063 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3518 $uuid_skip = 0;
3519
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return;
3522
3523 # always fsync - this file is important
3524 aio_fsync $fh
3525 and return;
3526
3527 close $fh
3528 or return;
3529
3530 aio_rename "$uuid~", $uuid
3531 and return;
3532
3533 warn "uuid file written ($value).\n";
3534
3535 1
3536
3537}
3538
3539sub write_uuid($$) {
3540 my ($skip, $sync) = @_;
3541
3542 $sync ? write_uuid_sync $skip
3543 : async { write_uuid_sync $skip };
3064} 3544}
3065 3545
3066sub emergency_save() { 3546sub emergency_save() {
3067 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
3068 3548
3074 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3555 warn "begin emergency player save\n";
3076 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3558 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3560 $pl->save;
3080 } 3561 }
3081 warn "end emergency player save\n"; 3562 warn "end emergency player save\n";
3082 3563
3083 warn "begin emergency map save\n"; 3564 warn "begin emergency map save\n";
3089 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
3090 3571
3091 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
3092 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3093 warn "end emergency database checkpoint\n"; 3574 warn "end emergency database checkpoint\n";
3575
3576 warn "begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "end write uuid\n";
3094 }; 3579 };
3095 3580
3096 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
3097} 3582}
3098 3583
3113 warn "reloading..."; 3598 warn "reloading...";
3114 3599
3115 warn "entering sync_job"; 3600 warn "entering sync_job";
3116 3601
3117 cf::sync_job { 3602 cf::sync_job {
3118 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
3119 cf::emergency_save; 3604 cf::emergency_save;
3120 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3121 3606
3122 warn "syncing database to disk"; 3607 warn "syncing database to disk";
3123 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
3124 3609
3125 # if anything goes wrong in here, we should simply crash as we already saved 3610 # if anything goes wrong in here, we should simply crash as we already saved
3126
3127 warn "cancelling all WF_AUTOCANCEL watchers";
3128 for (Event::all_watchers) {
3129 $_->cancel if $_->data & WF_AUTOCANCEL;
3130 }
3131 3611
3132 warn "flushing outstanding aio requests"; 3612 warn "flushing outstanding aio requests";
3133 for (;;) { 3613 for (;;) {
3134 BDB::flush; 3614 BDB::flush;
3135 IO::AIO::flush; 3615 IO::AIO::flush;
3136 Coro::cede; 3616 Coro::cede_notself;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3617 last unless IO::AIO::nreqs || BDB::nreqs;
3138 warn "iterate..."; 3618 warn "iterate...";
3139 } 3619 }
3140 3620
3141 ++$RELOAD; 3621 ++$RELOAD;
3200 warn "reloading cf.pm"; 3680 warn "reloading cf.pm";
3201 require cf; 3681 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3683
3204 warn "loading config and database again"; 3684 warn "loading config and database again";
3205 cf::cfg_load; 3685 cf::reload_config;
3206 3686
3207 warn "loading extensions"; 3687 warn "loading extensions";
3208 cf::load_extensions; 3688 cf::load_extensions;
3209 3689
3210 warn "reattaching attachments to objects/players"; 3690 warn "reattaching attachments to objects/players";
3217 warn "leaving sync_job"; 3697 warn "leaving sync_job";
3218 3698
3219 1 3699 1
3220 } or do { 3700 } or do {
3221 warn $@; 3701 warn $@;
3222 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
3223 exit 1;
3224 }; 3703 };
3225 3704
3226 warn "reloaded"; 3705 warn "reloaded";
3227}; 3706};
3228 3707
3230 3709
3231sub reload_perl() { 3710sub reload_perl() {
3232 # doing reload synchronously and two reloads happen back-to-back, 3711 # doing reload synchronously and two reloads happen back-to-back,
3233 # coro crashes during coro_state_free->destroy here. 3712 # coro crashes during coro_state_free->destroy here.
3234 3713
3235 $RELOAD_WATCHER ||= Event->timer ( 3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3236 reentrant => 0,
3237 after => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => sub {
3240 do_reload_perl; 3715 do_reload_perl;
3241 undef $RELOAD_WATCHER; 3716 undef $RELOAD_WATCHER;
3242 },
3243 ); 3717 };
3244} 3718}
3245 3719
3246register_command "reload" => sub { 3720register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3721 my ($who, $arg) = @_;
3248 3722
3249 if ($who->flag (FLAG_WIZ)) { 3723 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3724 $who->message ("reloading server.");
3725 async {
3726 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3727 reload_perl;
3728 };
3252 } 3729 }
3253}; 3730};
3254 3731
3255unshift @INC, $LIBDIR; 3732unshift @INC, $LIBDIR;
3256 3733
3258 3735
3259our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3260our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3261 3738
3262sub wait_for_tick { 3739sub wait_for_tick {
3263 return unless $TICK_WATCHER->is_active;
3264 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3265 3741
3266 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3267 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3268 $signal->wait; 3744 $signal->wait;
3269} 3745}
3270 3746
3271sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3272 return unless $TICK_WATCHER->is_active;
3273 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3274 3749
3275 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3752 $signal->wait;
3278} 3753}
3279 3754
3280 my $min = 1e6;#d# 3755sub tick {
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer (
3283 reentrant => 0,
3284 parked => 1,
3285 prio => 0,
3286 at => $NEXT_TICK || $TICK,
3287 data => WF_AUTOCANCEL,
3288 cb => sub {
3289 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
3290 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3757 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3291 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
3292 return; 3759 return;
3293 } 3760 }
3294 3761
3295 $NOW = $tick_start = Event::time;
3296
3297 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
3298 3763
3299 0 && sync_job {#d# 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3300 for(1..10) { 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3301 my $t = Event::time; 3766 Coro::async_pool {
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3767 $Coro::current->{desc} = "runtime saver";
3303 or die; 3768 write_runtime_sync
3304 3769 or warn "ERROR: unable to write runtime file: $!";
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 }; 3770 };
3771 }
3321 3772
3322 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK;
3324
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool {
3328 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!";
3330 };
3331 }
3332
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3774 $sig->send;
3338 } 3775 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3777 $sig->send;
3341 } 3778 }
3342 3779
3343 $NOW = Event::time; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
3344
3345 # if we are delayed by four ticks or more, skip them all
3346 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348 $TICK_WATCHER->at ($NEXT_TICK);
3349 $TICK_WATCHER->start;
3350
3351 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3782
3354 _post_tick; 3783 if (0) {
3355 3784 if ($NEXT_TICK) {
3356 3785 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d#
3788 }
3357 }, 3789 }
3358); 3790}
3359 3791
3360{ 3792{
3361 BDB::max_poll_time $TICK * 0.1; 3793 # configure BDB
3362 $BDB_POLL_WATCHER = Event->io ( 3794
3363 reentrant => 0,
3364 fd => BDB::poll_fileno,
3365 poll => 'r',
3366 prio => 0,
3367 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb,
3369 );
3370 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3371 3796 BDB::max_poll_reqs $TICK * 0.1;
3372 BDB::set_sync_prepare { 3797 $AnyEvent::BDB::WATCHER->priority (1);
3373 my $status;
3374 my $current = $Coro::current;
3375 (
3376 sub {
3377 $status = $!;
3378 $current->ready; undef $current;
3379 },
3380 sub {
3381 Coro::schedule while defined $current;
3382 $! = $status;
3383 },
3384 )
3385 };
3386 3798
3387 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3802 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3803 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3806
3390 cf::sync_job { 3807 cf::sync_job {
3391 eval { 3808 eval {
3392 BDB::db_env_open 3809 BDB::db_env_open
3393 $DB_ENV, 3810 $DB_ENV,
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3812 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3813 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3814 0666;
3398 3815
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3816 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3817 };
3404 3818
3405 cf::cleanup "db_env_open(db): $@" if $@; 3819 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3820 };
3407 } 3821 }
3822
3823 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3824 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3825 };
3826 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3827 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3828 };
3829 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3830 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3831 };
3408} 3832}
3409 3833
3410{ 3834{
3835 # configure IO::AIO
3836
3411 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3412
3413 undef $Coro::AIO::WATCHER;
3414 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3415 $AIO_POLL_WATCHER = Event->io ( 3839 undef $AnyEvent::AIO::WATCHER;
3416 reentrant => 0,
3417 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno,
3419 poll => 'r',
3420 prio => 6,
3421 cb => \&IO::AIO::poll_cb,
3422 );
3423} 3840}
3424 3841
3425my $_log_backtrace; 3842my $_log_backtrace;
3426 3843
3427sub _log_backtrace { 3844sub _log_backtrace {
3431 3848
3432 # limit the # of concurrent backtraces 3849 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3850 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3851 ++$_log_backtrace;
3435 async { 3852 async {
3853 $Coro::current->{desc} = "abt $msg";
3854
3436 my @bt = fork_call { 3855 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3856 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3857 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3858 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3859 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines