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.333 by root, Sun Aug 19 09:14:50 2007 UTC vs.
Revision 1.435 by root, Thu May 29 03:33:20 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;
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
1950} 2175}
1951 2176
1952sub do_load_sync { 2177sub do_load_sync {
1953 my ($map) = @_; 2178 my ($map) = @_;
1954 2179
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main;
2182
1955 cf::sync_job { $map->load }; 2183 cf::sync_job { $map->load };
1956} 2184}
1957 2185
1958our %MAP_PREFETCH; 2186our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 2187our $MAP_PREFETCHER = undef;
1960 2188
1961sub find_async { 2189sub find_async {
1962 my ($path, $origin) = @_; 2190 my ($path, $origin, $load) = @_;
1963 2191
1964 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
1965 2193
1966 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2196 }
1969 2197
1970 undef $MAP_PREFETCH{$path}; 2198 $MAP_PREFETCH{$path} |= $load;
2199
1971 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
1972 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
1973 for my $path (keys %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
1974 if (my $map = find $path) { 2205 if (my $map = find $k) {
1975 $map->load; 2206 $map->load if $v;
1976 } 2207 }
1977 2208
1978 delete $MAP_PREFETCH{$path}; 2209 delete $MAP_PREFETCH{$k};
1979 } 2210 }
1980 } 2211 }
1981 undef $MAP_PREFETCHER; 2212 undef $MAP_PREFETCHER;
1982 }; 2213 };
1983 $MAP_PREFETCHER->prio (6); 2214 $MAP_PREFETCHER->prio (6);
1986} 2217}
1987 2218
1988sub save { 2219sub save {
1989 my ($self) = @_; 2220 my ($self) = @_;
1990 2221
1991 my $lock = cf::lock_acquire "map_data:" . $self->path; 2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
1992 2223
1993 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
1994 2225
1995 return unless $self->dirty; 2226 return unless $self->dirty;
1996 2227
2002 return if $self->{deny_save}; 2233 return if $self->{deny_save};
2003 2234
2004 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
2005 2236
2006 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
2007 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2008 }; 2240 };
2241
2242 cf::get_slot 0.02;
2009 2243
2010 if ($uniq) { 2244 if ($uniq) {
2011 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2012 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2013 } else { 2247 } else {
2019 my ($self) = @_; 2253 my ($self) = @_;
2020 2254
2021 # save first because save cedes 2255 # save first because save cedes
2022 $self->save; 2256 $self->save;
2023 2257
2024 my $lock = cf::lock_acquire "map_data:" . $self->path; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2025 2259
2026 return if $self->players; 2260 return if $self->players;
2027 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2028 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2029 2263
2264 $self->in_memory (cf::MAP_SWAPPED);
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2030 $self->clear; 2268 $self->clear;
2031 $self->in_memory (cf::MAP_SWAPPED);
2032} 2269}
2033 2270
2034sub reset_at { 2271sub reset_at {
2035 my ($self) = @_; 2272 my ($self) = @_;
2036 2273
2068 if $uniq; 2305 if $uniq;
2069 } 2306 }
2070 2307
2071 delete $cf::MAP{$self->path}; 2308 delete $cf::MAP{$self->path};
2072 2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2073 $self->clear; 2312 $self->clear;
2074
2075 $_->clear_links_to ($self) for values %cf::MAP;
2076 2313
2077 $self->unlink_save; 2314 $self->unlink_save;
2078 $self->destroy; 2315 $self->destroy;
2079} 2316}
2080 2317
2081my $nuke_counter = "aaaa"; 2318my $nuke_counter = "aaaa";
2082 2319
2083sub nuke { 2320sub nuke {
2084 my ($self) = @_; 2321 my ($self) = @_;
2085 2322
2323 {
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2086 delete $cf::MAP{$self->path}; 2326 delete $cf::MAP{$self->path};
2087 2327
2088 $self->unlink_save; 2328 $self->unlink_save;
2089 2329
2090 bless $self, "cf::map"; 2330 bless $self, "cf::map";
2091 delete $self->{deny_reset}; 2331 delete $self->{deny_reset};
2092 $self->{deny_save} = 1; 2332 $self->{deny_save} = 1;
2093 $self->reset_timeout (1); 2333 $self->reset_timeout (1);
2094 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2095 2335
2096 $cf::MAP{$self->path} = $self; 2336 $cf::MAP{$self->path} = $self;
2337 }
2097 2338
2098 $self->reset; # polite request, might not happen 2339 $self->reset; # polite request, might not happen
2099} 2340}
2100 2341
2101=item $maps = cf::map::tmp_maps 2342=item $maps = cf::map::tmp_maps
2143 2384
2144sub unique_maps() { 2385sub unique_maps() {
2145 [ 2386 [
2146 map { 2387 map {
2147 utf8::decode $_; 2388 utf8::decode $_;
2148 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2149 ? normalise $_ 2392 : normalise $_
2150 : ()
2151 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2152 ] 2394 ]
2153} 2395}
2154 2396
2155package cf;
2156
2157=back 2397=back
2158 2398
2159=head3 cf::object 2399=head3 cf::object
2160 2400
2161=cut 2401=cut
2164 2404
2165=over 4 2405=over 4
2166 2406
2167=item $ob->inv_recursive 2407=item $ob->inv_recursive
2168 2408
2169Returns 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.
2170 2411
2171=cut 2412=cut
2172 2413
2173sub inv_recursive_; 2414sub inv_recursive_;
2174sub inv_recursive_ { 2415sub inv_recursive_ {
2177 2418
2178sub inv_recursive { 2419sub inv_recursive {
2179 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2180} 2421}
2181 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
2182package cf; 2451package cf;
2183 2452
2184=back 2453=back
2185 2454
2186=head3 cf::object::player 2455=head3 cf::object::player
2192Sends 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>
2193can 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
2194dialogue with the given NPC character. 2463dialogue with the given NPC character.
2195 2464
2196=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};
2197 2480
2198# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2199# with dialog boxes. 2482# with dialog boxes.
2200#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
2201sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2213 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2214 $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));
2215 2498
2216 } else { 2499 } else {
2217 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2218 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2219 } 2502 }
2220 } 2503 }
2221} 2504}
2222 2505
2223=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2628
2346 $self->enter_link; 2629 $self->enter_link;
2347 2630
2348 (async { 2631 (async {
2632 $Coro::current->{desc} = "player::goto $path $x $y";
2633
2634 # *tag paths override both path and x|y
2635 if ($path =~ /^\*(.*)$/) {
2636 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2637 my $ob = $obs[rand @obs];
2638
2639 # see if we actually can go there
2640 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2641 $ob = $obs[rand @obs];
2642 } else {
2643 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2644 }
2645 # else put us there anyways for now #d#
2646
2647 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2648 } else {
2649 ($path, $x, $y) = (undef, undef, undef);
2650 }
2651 }
2652
2349 my $map = eval { 2653 my $map = eval {
2350 my $map = cf::map::find $path; 2654 my $map = defined $path ? cf::map::find $path : undef;
2351 2655
2352 if ($map) { 2656 if ($map) {
2353 $map = $map->customise_for ($self); 2657 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2658 $map = $check->($map) if $check && $map;
2355 } else { 2659 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2660 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2661 }
2358 2662
2359 $map 2663 $map
2360 }; 2664 };
2361 2665
2397} 2701}
2398 2702
2399sub prepare_random_map { 2703sub prepare_random_map {
2400 my ($exit) = @_; 2704 my ($exit) = @_;
2401 2705
2402 my $guard = cf::lock_acquire "exit_prepare:$exit";
2403
2404 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2405 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2406 # that depends on the exit object 2708 # that depends on the exit object
2407 2709
2408 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
2410 if ($exit->map) { 2712 if ($exit->map) {
2411 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2412 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2413 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2414 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2415 } 2719 }
2416 2720
2417 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2418 2722
2419 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2422 2726
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2425 undef $fh; 2729 undef $fh;
2426 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2427 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2428 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2429 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2430 } 2738 }
2431} 2739}
2432 2740
2433sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2434 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2435 2743
2436 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2437 2745
2438 if ($exit->slaying eq "/!") {
2439 #TODO: this should de-fi-ni-te-ly not be a sync-job
2440 # the problem is that $exit might not survive long enough
2441 # so it needs to be done right now, right here
2442 cf::sync_job { prepare_random_map $exit };
2443 }
2444
2445 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2446 my $hp = $exit->stats->hp;
2447 my $sp = $exit->stats->sp;
2448
2449 $self->enter_link; 2746 $self->enter_link;
2450 2747
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2455 (async { 2748 (async {
2456 $self->deactivate_recursive; # just to be sure 2749 $Coro::current->{desc} = "enter_exit";
2750
2457 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2458 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2459 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2460 1; 2772 1
2461 }) { 2773 }) {
2462 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2463 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2464 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2465 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2807the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2808the message unless the client supports the msg packet.
2497 2809
2498=cut 2810=cut
2499 2811
2812# non-persistent channels (usually the info channel)
2813our %CHANNEL = (
2814 "c/identify" => {
2815 id => "infobox",
2816 title => "Identify",
2817 reply => undef,
2818 tooltip => "Items recently identified",
2819 },
2820 "c/examine" => {
2821 id => "infobox",
2822 title => "Examine",
2823 reply => undef,
2824 tooltip => "Signs and other items you examined",
2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2832 "c/lookat" => {
2833 id => "infobox",
2834 title => "Look",
2835 reply => undef,
2836 tooltip => "What you saw there",
2837 },
2838 "c/who" => {
2839 id => "infobox",
2840 title => "Players",
2841 reply => undef,
2842 tooltip => "Shows players who are currently online",
2843 },
2844 "c/body" => {
2845 id => "infobox",
2846 title => "Body Parts",
2847 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available",
2849 },
2850 "c/uptime" => {
2851 id => "infobox",
2852 title => "Uptime",
2853 reply => undef,
2854 tooltip => "How long the server has been running since last restart",
2855 },
2856 "c/mapinfo" => {
2857 id => "infobox",
2858 title => "Map Info",
2859 reply => undef,
2860 tooltip => "Information related to the maps",
2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2868);
2869
2500sub cf::client::send_msg { 2870sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2872
2503 $msg = $self->pl->expand_cfpod ($msg); 2873 $msg = $self->pl->expand_cfpod ($msg);
2504 2874
2505 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2876
2877 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel};
2880
2881 $self->ext_msg (channel_info => $channel)
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id};
2885
2507 if (ref $channel) { 2886 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2887 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2888 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2889 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel); 2890 $self->ext_msg (channel_info => $channel)
2891 if $self->can_msg;
2512 } 2892 }
2513 2893
2514 $channel = $channel->{id}; 2894 $channel = $channel->{id};
2515 } 2895 }
2516 2896
2557=cut 2937=cut
2558 2938
2559sub cf::client::ext_msg($$@) { 2939sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_; 2940 my ($self, $type, @msg) = @_;
2561 2941
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) { 2942 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove 2944 } elsif ($self->extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type"; 2945 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 }
2948}
2949
2950=item $client->ext_reply ($msgid, @msg)
2951
2952Sends an ext reply to the client.
2953
2954=cut
2955
2956sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_;
2958
2959 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id;
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2965 }
2570} 2966}
2571 2967
2572=item $success = $client->query ($flags, "text", \&cb) 2968=item $success = $client->query ($flags, "text", \&cb)
2634 my ($type, $reply, @payload) = 3030 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 3031 "ARRAY" eq ref $msg
2636 ? @$msg 3032 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3033 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 3034
3035 my @reply;
3036
2639 if (my $cb = $EXTICMD{$type}) { 3037 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 3038 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 3039 }
3040
3041 $ns->ext_reply ($reply, @reply)
3042 if $reply;
3043
2645 } else { 3044 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3045 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 } 3046 }
2648 3047
2649 cf::override; 3048 cf::override;
2709=pod 3108=pod
2710 3109
2711The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
2712 3111
2713 cf::object 3112 cf::object
2714 contr pay_amount pay_player map x y force_find force_add 3113 contr pay_amount pay_player map x y force_find force_add destroy
2715 insert remove name archname title slaying race 3114 insert remove name archname title slaying race decrease split
2716 3115
2717 cf::object::player 3116 cf::object::player
2718 player 3117 player
2719 3118
2720 cf::player 3119 cf::player
2725 3124
2726=cut 3125=cut
2727 3126
2728for ( 3127for (
2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)], 3129 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)],
2731 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
2732 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
2733 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
2734) { 3134) {
2735 no strict 'refs'; 3135 no strict 'refs';
2811# the server's init and main functions 3211# the server's init and main functions
2812 3212
2813sub load_facedata($) { 3213sub load_facedata($) {
2814 my ($path) = @_; 3214 my ($path) = @_;
2815 3215
3216 # HACK to clear player env face cache, we need some signal framework
3217 # for this (global event?)
3218 %ext::player_env::MUSIC_FACE_CACHE = ();
3219
3220 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3221
2816 warn "loading facedata from $path\n"; 3222 warn "loading facedata from $path\n";
2817 3223
2818 my $facedata; 3224 my $facedata;
2819 0 < aio_load $path, $facedata 3225 0 < aio_load $path, $facedata
2820 or die "$path: $!"; 3226 or die "$path: $!";
2822 $facedata = Coro::Storable::thaw $facedata; 3228 $facedata = Coro::Storable::thaw $facedata;
2823 3229
2824 $facedata->{version} == 2 3230 $facedata->{version} == 2
2825 or cf::cleanup "$path: version mismatch, cannot proceed."; 3231 or cf::cleanup "$path: version mismatch, cannot proceed.";
2826 3232
3233 # patch in the exptable
3234 $facedata->{resource}{"res/exp_table"} = {
3235 type => FT_RSRC,
3236 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3237 };
3238 cf::cede_to_tick;
3239
2827 { 3240 {
2828 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
2829 3242
2830 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
2831 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
2832 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
2833 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
2834 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2835 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2836 3250
2837 cf::cede_to_tick; 3251 cf::cede_to_tick;
2838 } 3252 }
2839 3253
2840 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
2841 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
2842 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
2843 or next; 3258 or next;
3259
2844 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
2845 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
2846 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2847 } else { 3263 } else {
2848 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
2865 3281
2866 { 3282 {
2867 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
2868 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
2869 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
2870 my $enc = JSON::XS->new->utf8->canonical;
2871
2872 my $soundconf = delete $res->{"res/sound.conf"};
2873 3286
2874 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
2875 my $meta = $enc->encode ({ 3288 if (defined $info->{type}) {
2876 name => $name,
2877 %{ $info->{meta} || {} },
2878 });
2879
2880 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
2881 3291
2882 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
2883 # prepend meta info 3293 # prepend meta info
2884 3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
2885 my $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
2886 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3301 } else {
3302 $data = $info->{data};
3303 }
2887 3304
2888 cf::face::set_data $idx, 0, $data, $chk; 3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
2889 } else { 3307 } else {
2890 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3308 $RESOURCE{$name} = $info;
2891 } 3309 }
2892 3310
2893 cf::face::set_type $idx, $info->{type};
2894
2895 cf::cede_to_tick; 3311 cf::cede_to_tick;
2896 } 3312 }
2897
2898 if ($soundconf) {
2899 $soundconf = $enc->decode (delete $soundconf->{data});
2900
2901 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2902 my $sound = $soundconf->{compat}[$_]
2903 or next;
2904
2905 my $face = cf::face::find "sound/$sound->[1]";
2906 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 }
2909
2910 while (my ($k, $v) = each %{$soundconf->{event}}) {
2911 my $face = cf::face::find "sound/$v";
2912 cf::sound::set $k => $face;
2913 }
2914 }
2915 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2916 3316
2917 1 3317 1
2918} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
2919 3339
2920register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
2921 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
2922 3342
2923 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
2924 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
2925 } 3345 }
2926}; 3346};
2927 3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3357
2928sub reload_regions { 3358sub reload_regions {
3359 # HACK to clear player env face cache, we need some signal framework
3360 # for this (global event?)
3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3362
2929 load_resource_file "$MAPDIR/regions" 3363 load_resource_file "$MAPDIR/regions"
2930 or die "unable to load regions file\n"; 3364 or die "unable to load regions file\n";
2931 3365
2932 for (cf::region::list) { 3366 for (cf::region::list) {
2933 $_->{match} = qr/$_->{match}/ 3367 $_->{match} = qr/$_->{match}/
2941} 3375}
2942 3376
2943sub reload_archetypes { 3377sub reload_archetypes {
2944 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
2945 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
2946 #d# NEED to laod twice to resolve forward references
2947 # this really needs to be done in an extra post-pass
2948 # (which needs to be synchronous, so solve it differently)
2949 load_resource_file "$DATADIR/archetypes"
2950 or die "unable to load archetypes\n";
2951} 3380}
2952 3381
2953sub reload_treasures { 3382sub reload_treasures {
2954 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
2955 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
2956} 3385}
2957 3386
2958sub reload_resources { 3387sub reload_resources {
2959 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
2960 3389
3390 reload_facedata;
3391 reload_archetypes;
2961 reload_regions; 3392 reload_regions;
2962 reload_facedata;
2963 #reload_archetypes;#d#
2964 reload_archetypes;
2965 reload_treasures; 3393 reload_treasures;
2966 3394
2967 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
2968} 3396}
2969 3397
2970sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
2971 reload_resources; 3403 reload_resources;
2972} 3404}
2973 3405
2974sub cfg_load { 3406sub reload_config {
2975 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
2976 or return; 3408 or return;
2977 3409
2978 local $/; 3410 local $/;
2979 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
2980 3412
2981 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2982 3414
2983 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2984 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2995sub main { 3427sub main {
2996 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
2997 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
2998 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2999 (async { 3431 (async {
3000 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
3001 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3002 }; 3435 };
3003 3436
3004 cfg_load; 3437 {
3438 my $guard = freeze_mainloop;
3439 reload_config;
3005 db_init; 3440 db_init;
3006 load_extensions; 3441 load_extensions;
3007 3442
3008 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3009 Event::loop; 3446 EV::loop;
3010} 3447}
3011 3448
3012############################################################################# 3449#############################################################################
3013# initialisation and cleanup 3450# initialisation and cleanup
3014 3451
3015# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
3016BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
3017 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
3018 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3019 reentrant => 0,
3020 data => WF_AUTOCANCEL,
3021 signal => $signal,
3022 prio => 0,
3023 cb => sub {
3024 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3025 },
3026 ); 3458 };
3027 } 3459 }
3028} 3460}
3029 3461
3030sub write_runtime { 3462sub write_runtime_sync {
3031 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3032 3464
3033 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3034 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3035 3467
3061 and return; 3493 and return;
3062 3494
3063 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3064 3496
3065 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3066} 3541}
3067 3542
3068sub emergency_save() { 3543sub emergency_save() {
3069 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3070 3545
3076 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
3077 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
3078 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
3079 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
3080 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3081 $pl->save; 3557 $pl->save;
3082 } 3558 }
3083 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
3084 3560
3085 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
3091 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3092 3568
3093 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3094 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3095 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3096 }; 3576 };
3097 3577
3098 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3099} 3579}
3100 3580
3115 warn "reloading..."; 3595 warn "reloading...";
3116 3596
3117 warn "entering sync_job"; 3597 warn "entering sync_job";
3118 3598
3119 cf::sync_job { 3599 cf::sync_job {
3120 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3121 cf::emergency_save; 3601 cf::emergency_save;
3122 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3123 3603
3124 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3125 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3126 3606
3127 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
3128
3129 warn "cancelling all WF_AUTOCANCEL watchers";
3130 for (Event::all_watchers) {
3131 $_->cancel if $_->data & WF_AUTOCANCEL;
3132 }
3133 3608
3134 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3135 for (;;) { 3610 for (;;) {
3136 BDB::flush; 3611 BDB::flush;
3137 IO::AIO::flush; 3612 IO::AIO::flush;
3138 Coro::cede; 3613 Coro::cede_notself;
3139 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
3140 warn "iterate..."; 3615 warn "iterate...";
3141 } 3616 }
3142 3617
3143 ++$RELOAD; 3618 ++$RELOAD;
3202 warn "reloading cf.pm"; 3677 warn "reloading cf.pm";
3203 require cf; 3678 require cf;
3204 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3205 3680
3206 warn "loading config and database again"; 3681 warn "loading config and database again";
3207 cf::cfg_load; 3682 cf::reload_config;
3208 3683
3209 warn "loading extensions"; 3684 warn "loading extensions";
3210 cf::load_extensions; 3685 cf::load_extensions;
3211 3686
3212 warn "reattaching attachments to objects/players"; 3687 warn "reattaching attachments to objects/players";
3219 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3220 3695
3221 1 3696 1
3222 } or do { 3697 } or do {
3223 warn $@; 3698 warn $@;
3224 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3225 exit 1;
3226 }; 3700 };
3227 3701
3228 warn "reloaded"; 3702 warn "reloaded";
3229}; 3703};
3230 3704
3232 3706
3233sub reload_perl() { 3707sub reload_perl() {
3234 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3235 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3236 3710
3237 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3238 reentrant => 0,
3239 after => 0,
3240 data => WF_AUTOCANCEL,
3241 cb => sub {
3242 do_reload_perl; 3712 do_reload_perl;
3243 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3244 },
3245 ); 3714 };
3246} 3715}
3247 3716
3248register_command "reload" => sub { 3717register_command "reload" => sub {
3249 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3250 3719
3251 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3252 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3253 async { reload_perl }; 3724 reload_perl;
3725 };
3254 } 3726 }
3255}; 3727};
3256 3728
3257unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3258 3730
3260 3732
3261our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3262our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3263 3735
3264sub wait_for_tick { 3736sub wait_for_tick {
3265 return unless $TICK_WATCHER->is_active;
3266 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3267 3738
3268 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3269 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3270 $signal->wait; 3741 $signal->wait;
3271} 3742}
3272 3743
3273sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3274 return unless $TICK_WATCHER->is_active;
3275 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3276 3746
3277 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3278 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3279 $signal->wait; 3749 $signal->wait;
3280} 3750}
3281 3751
3282 my $min = 1e6;#d# 3752sub tick {
3283 my $avg = 10;
3284$TICK_WATCHER = Event->timer (
3285 reentrant => 0,
3286 parked => 1,
3287 prio => 0,
3288 at => $NEXT_TICK || $TICK,
3289 data => WF_AUTOCANCEL,
3290 cb => sub {
3291 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3292 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3293 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3294 return; 3756 return;
3295 } 3757 }
3296 3758
3297 $NOW = $tick_start = Event::time;
3298
3299 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3300 3760
3301 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3302 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3303 my $t = Event::time; 3763 Coro::async_pool {
3304 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3305 or die; 3765 write_runtime_sync
3306 3766 or warn "ERROR: unable to write runtime file: $!";
3307 $map->width (50);
3308 $map->height (50);
3309 $map->alloc;
3310 $map->_load_objects ("/tmp/x.map", 1);
3311 my $t = Event::time - $t;
3312
3313 #next unless $t < 0.0013;#d#
3314 if ($t < $min) {
3315 $min = $t;
3316 }
3317 $avg = $avg * 0.99 + $t * 0.01;
3318 }
3319 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3320 exit 0;
3321 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3322 }; 3767 };
3768 }
3323 3769
3324 $RUNTIME += $TICK;
3325 $NEXT_TICK += $TICK;
3326
3327 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3328 $NEXT_RUNTIME_WRITE = $NOW + 10;
3329 Coro::async_pool {
3330 write_runtime
3331 or warn "ERROR: unable to write runtime file: $!";
3332 };
3333 }
3334
3335# my $AFTER = Event::time;
3336# warn $AFTER - $NOW;#d#
3337
3338 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3339 $sig->send; 3771 $sig->send;
3340 } 3772 }
3341 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3342 $sig->send; 3774 $sig->send;
3343 } 3775 }
3344 3776
3345 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3346
3347 # if we are delayed by four ticks or more, skip them all
3348 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3349
3350 $TICK_WATCHER->at ($NEXT_TICK);
3351 $TICK_WATCHER->start;
3352
3353 $LOAD = ($NOW - $tick_start) / $TICK;
3354 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3355 3779
3356 _post_tick; 3780 if (0) {
3357 3781 if ($NEXT_TICK) {
3358 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3359 }, 3786 }
3360); 3787}
3361 3788
3362{ 3789{
3363 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3364 $BDB_POLL_WATCHER = Event->io ( 3791
3365 reentrant => 0,
3366 fd => BDB::poll_fileno,
3367 poll => 'r',
3368 prio => 0,
3369 data => WF_AUTOCANCEL,
3370 cb => \&BDB::poll_cb,
3371 );
3372 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3373 3793 BDB::max_poll_reqs $TICK * 0.1;
3374 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3375 my $status;
3376 my $current = $Coro::current;
3377 (
3378 sub {
3379 $status = $!;
3380 $current->ready; undef $current;
3381 },
3382 sub {
3383 Coro::schedule while defined $current;
3384 $! = $status;
3385 },
3386 )
3387 };
3388 3795
3389 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3390 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3799 | BDB::LOG_AUTOREMOVE, 1);
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3391 3802
3392 cf::sync_job { 3803 cf::sync_job {
3393 eval { 3804 eval {
3394 BDB::db_env_open 3805 BDB::db_env_open
3395 $DB_ENV, 3806 $DB_ENV,
3397 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3808 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3398 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3399 0666; 3810 0666;
3400 3811
3401 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3402
3403 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3404 $DB_ENV->set_lk_detect;
3405 }; 3813 };
3406 3814
3407 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3408 }; 3816 };
3409 } 3817 }
3818
3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3821 };
3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 };
3410} 3828}
3411 3829
3412{ 3830{
3831 # configure IO::AIO
3832
3413 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3414
3415 undef $Coro::AIO::WATCHER;
3416 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3417 $AIO_POLL_WATCHER = Event->io ( 3835 undef $AnyEvent::AIO::WATCHER;
3418 reentrant => 0,
3419 data => WF_AUTOCANCEL,
3420 fd => IO::AIO::poll_fileno,
3421 poll => 'r',
3422 prio => 6,
3423 cb => \&IO::AIO::poll_cb,
3424 );
3425} 3836}
3426 3837
3427my $_log_backtrace; 3838my $_log_backtrace;
3428 3839
3429sub _log_backtrace { 3840sub _log_backtrace {
3433 3844
3434 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3435 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3436 ++$_log_backtrace; 3847 ++$_log_backtrace;
3437 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3438 my @bt = fork_call { 3851 my @bt = fork_call {
3439 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3440 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3441 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3854 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3442 or die "addr2line: $!"; 3855 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines