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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines