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.349 by root, Fri Aug 31 04:10:43 2007 UTC vs.
Revision 1.421 by root, Tue Apr 15 18:43:11 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 (); 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
285Return 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.
286 321
287=cut 322=cut
288 323
289our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
290 326
291sub lock_wait($) { 327sub lock_wait($) {
292 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#
293 334
294 # wait for lock, if any 335 # wait for lock, if any
295 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 338 Coro::schedule;
303 344
304 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
305 lock_wait $key; 346 lock_wait $key;
306 347
307 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
308 350
309 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
312 } 355 }
313} 356}
314 357
317 360
318 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
319} 362}
320 363
321sub freeze_mainloop { 364sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
323 366
324 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
325 $TICK_WATCHER->start; 368}
326 }; 369
327 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
328 $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
329} 383}
330 384
331=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
332 386
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 398our @SLOT_QUEUE;
345our $SLOT_QUEUE; 399our $SLOT_QUEUE;
346 400
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
349 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
350 406
351 while () { 407 while () {
352 next_job: 408 next_job:
353 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
361 } 417 }
362 } 418 }
363 } 419 }
364 420
365 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 424 $signal->wait;
369 } else { 425 } else {
370 Coro::schedule; 426 Coro::schedule;
371 } 427 }
372 } 428 }
373}; 429};
374 430
375sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit;
433
376 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
377 435
378 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
380 438
394 452
395BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
396 454
397=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
398 456
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
401partly 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
402acceptable. 460acceptable.
403 461
404If 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
405the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
410 468
411sub sync_job(&) { 469sub sync_job(&) {
412 my ($job) = @_; 470 my ($job) = @_;
413 471
414 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 473 my $time = EV::time;
416 474
417 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
419 477
420 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 479
422 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
423 481
424 my $busy = 1; 482 my $busy = 1;
425 my @res; 483 my @res;
426 484
427 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 487 @res = eval { $job->() };
429 warn $@ if $@; 488 warn $@ if $@;
430 undef $busy; 489 undef $busy;
431 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
432 491
433 while ($busy) { 492 while ($busy) {
434 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
435 } 497 }
498 }
436 499
437 $time = Event::time - $time; 500 my $time = EV::time - $time;
438 501
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
443 503
444 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
445 } else { 505 } else {
446 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
447 507
472=item fork_call { }, $args 532=item fork_call { }, $args
473 533
474Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
478 538
479=cut 539=cut
480 540
481sub fork_call(&@) { 541sub fork_call(&@) {
482 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
483 543
484 # 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,
485 # otherwise perl prematurely frees the stuff :/ 545 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 546 # TODO: investigate and fix (likely this will be rather laborious)
487 547
488 my @res = Coro::Util::fork_eval { 548 my @res = Coro::Util::fork_eval {
489 reset_signals; 549 reset_signals;
490 &$cb 550 &$cb
491 }, @args; 551 }, @args;
492 552
493 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
494} 554}
495 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
496=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
497 584
498Returns a single value from the environment database. 585Returns a single value from the environment database.
499 586
500=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
501 588
502Stores 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
503data 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).
504 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
505=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}
506 615
507our $DB; 616our $DB;
508 617
509sub db_init { 618sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 619 cf::sync_job {
514 eval { 620 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 621 };
524} 622}
525 623
526sub db_get($$) { 624sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
528 626
632attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
634 732
635In 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>
636C<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
637Crossfire TRT). 735Deliantra).
638 736
639=over 4 737=over 4
640 738
641=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
642 740
924 } 1022 }
925 1023
926 0 1024 0
927} 1025}
928 1026
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1028
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1030
933Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
934 1032
940 1038
941=cut 1039=cut
942 1040
943############################################################################# 1041#############################################################################
944# object support 1042# object support
945#
946 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#
947sub _can_merge { 1077sub _can_merge {
948 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
949 1079
950 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1081
954 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
955} 1084}
956 1085
957sub reattach { 1086sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1088 my ($obj) = @_;
981cf::attachable->attach ( 1110cf::attachable->attach (
982 prio => -1000000, 1111 prio => -1000000,
983 on_instantiate => sub { 1112 on_instantiate => sub {
984 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
985 1114
986 $data = from_json $data; 1115 $data = decode_json $data;
987 1116
988 for (@$data) { 1117 for (@$data) {
989 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
990 1119
991 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1136sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
1009 1138
1010 sync_job { 1139 sync_job {
1011 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1014 1144
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1146 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1149 close $fh;
1020 1150
1021 if (@$objs) { 1151 if (@$objs) {
1022 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) {
1023 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1157 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1159 }
1037 } 1167 }
1038 } else { 1168 } else {
1039 aio_unlink $filename; 1169 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1041 } 1171 }
1042 } 1172 };
1043} 1173}
1044 1174
1045sub object_freezer_as_string { 1175sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1047 1177
1059 or return; 1189 or return;
1060 1190
1061 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1193 or return;
1194
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1065 } 1197 }
1066 1198
1199 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1069 return ($data, $av); 1203 ($data, $av)
1070} 1204}
1071 1205
1072=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1073 1207
1074=over 4 1208=over 4
1223 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1225 1359
1226 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1227 warn $msg; 1361 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1229 exit 1;
1230 } 1363 }
1231 1364
1232 warn $msg; 1365 warn $msg;
1233 } 1366 }
1234 1367
1259use Coro::AIO; 1392use Coro::AIO;
1260 1393
1261=head3 cf::player 1394=head3 cf::player
1262 1395
1263=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}
1264 1411
1265=item cf::player::find $login 1412=item cf::player::find $login
1266 1413
1267Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1268 1415
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1455
1309 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1312 } 1464 }
1313 } 1465 }
1314} 1466}
1315 1467
1323 1475
1324 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1325 1477
1326 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1480
1481 cf::get_slot 0.01;
1328 1482
1329 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1484 cf::cede_to_tick;
1331} 1485}
1332 1486
1413 or return []; 1567 or return [];
1414 1568
1415 my @logins; 1569 my @logins;
1416 1570
1417 for my $login (@$dirs) { 1571 for my $login (@$dirs) {
1572 my $path = path $login;
1573
1574 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1577 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1578 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 }
1421 1580
1422 utf8::decode $login; 1581 utf8::decode $login;
1423 push @logins, $login; 1582 push @logins, $login;
1424 } 1583 }
1425 1584
1458 1617
1459Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1460 1619
1461=cut 1620=cut
1462 1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1463sub expand_cfpod { 1633sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1465 1635
1466 # escape & and < 1636 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469 1637
1470 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1471 1641
1472 1 while 1642 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1477 # replace G<male|female> tags 1647 ([BCGHITU])
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1648 <
1479 $self->gender ? $2 : $1 1649 (?:
1480 }ge 1650 ([^<>]*) (?{ $group = $^N })
1481 # replace H<hint text> 1651 | < $interior >
1482 || s{H<([^\>]*)>} 1652 )
1653 >
1654 %gcsx
1483 { 1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "") 1675 "")
1487 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1488 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1489 1687
1688 for ($xml) {
1490 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1492 1691
1493 # compress some whitespace 1692 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1498 1698
1499 $_ 1699 $xml
1500} 1700}
1701
1702no re 'eval';
1501 1703
1502sub hintmode { 1704sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode} 1706 $_[0]{hintmode}
1505} 1707}
1577our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1579 1781
1580sub generate_random_map { 1782sub generate_random_map {
1581 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1582 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1788 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1913
1709# the temporary/swap location 1914# the temporary/swap location
1710sub save_path { 1915sub save_path {
1711 my ($self) = @_; 1916 my ($self) = @_;
1712 1917
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1715} 1920}
1716 1921
1717# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1718sub uniq_path { 1923sub uniq_path {
1719 my ($self) = @_; 1924 my ($self) = @_;
1720 1925
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1723} 1928}
1724 1929
1725# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1726# all maps in C++... 1931# all maps in C++...
1749 1954
1750sub load_header_from($) { 1955sub load_header_from($) {
1751 my ($self, $path) = @_; 1956 my ($self, $path) = @_;
1752 1957
1753 utf8::encode $path; 1958 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1959 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1960 or return;
1961
1962 $self->_load_header ($f)
1963 or return;
1964
1965 local $MAP_LOADING{$self->{path}} = $self;
1966 $f->resolve_delayed_derefs;
1759 1967
1760 $self->{load_path} = $path; 1968 $self->{load_path} = $path;
1761 1969
1762 1 1970 1
1763} 1971}
1817sub find { 2025sub find {
1818 my ($path, $origin) = @_; 2026 my ($path, $origin) = @_;
1819 2027
1820 $path = normalise $path, $origin && $origin->path; 2028 $path = normalise $path, $origin && $origin->path;
1821 2029
2030 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2031 cf::lock_wait "map_find:$path";
1823 2032
1824 $cf::MAP{$path} || do { 2033 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
1826 my $map = new_from_path cf::map $path 2037 my $map = new_from_path cf::map $path
1827 or return; 2038 or return;
1828 2039
1829 $map->{last_save} = $cf::RUNTIME; 2040 $map->{last_save} = $cf::RUNTIME;
1830 2041
1832 or return; 2043 or return;
1833 2044
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2046 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2047 #$cf::WAIT_FOR_TICK->wait;
2048 undef $guard1;
2049 undef $guard2;
1837 $map->reset; 2050 $map->reset;
1838 undef $guard;
1839 return find $path; 2051 return find $path;
1840 } 2052 }
1841 2053
1842 $cf::MAP{$path} = $map 2054 $cf::MAP{$path} = $map
1843 } 2055 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2064 local $self->{deny_reset} = 1; # loading can take a long time
1853 2065
1854 my $path = $self->{path}; 2066 my $path = $self->{path};
1855 2067
1856 { 2068 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2069 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2070
2071 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2072 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2073
1862 $self->in_memory (cf::MAP_LOADING); 2074 $self->in_memory (cf::MAP_LOADING);
1863 2075
1864 $self->alloc; 2076 $self->alloc;
1865 2077
1866 $self->pre_load; 2078 $self->pre_load;
1867 cf::cede_to_tick; 2079 cf::cede_to_tick;
1868 2080
2081 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2083 $self->_load_objects ($f)
1870 or return; 2084 or return;
1871 2085
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 2087 if delete $self->{load_original};
1874 2088
1875 if (my $uniq = $self->uniq_path) { 2089 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2090 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2091 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2093 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2094 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs;
2096 }
1880 } 2097 }
1881 } 2098 }
2099
2100 $f->resolve_delayed_derefs;
1882 2101
1883 cf::cede_to_tick; 2102 cf::cede_to_tick;
1884 # now do the right thing for maps 2103 # now do the right thing for maps
1885 $self->link_multipart_objects; 2104 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2105 $self->difficulty ($self->estimate_difficulty)
1898 } 2117 }
1899 2118
1900 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1902 2121
1903 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1904 } 2123 }
1905 2124
1906 $self->post_load; 2125 $self->post_load;
1907} 2126}
1908 2127
1966 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
1967 2186
1968 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
1969 2188
1970 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1972 } 2191 }
1973 2192
1974 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
1975 2194
1976 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
1977 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2200 if (my $map = find $k) {
1980 $map->load if $v; 2201 $map->load if $v;
1981 } 2202 }
2007 return if $self->{deny_save}; 2228 return if $self->{deny_save};
2008 2229
2009 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
2010 2231
2011 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2013 }; 2235 };
2236
2237 cf::get_slot 0.02;
2014 2238
2015 if ($uniq) { 2239 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2242 } else {
2027 $self->save; 2251 $self->save;
2028 2252
2029 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2254
2031 return if $self->players; 2255 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2034 2258
2259 $self->in_memory (cf::MAP_SWAPPED);
2260
2261 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2263 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2264}
2038 2265
2039sub reset_at { 2266sub reset_at {
2040 my ($self) = @_; 2267 my ($self) = @_;
2041 2268
2073 if $uniq; 2300 if $uniq;
2074 } 2301 }
2075 2302
2076 delete $cf::MAP{$self->path}; 2303 delete $cf::MAP{$self->path};
2077 2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2307 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2308
2082 $self->unlink_save; 2309 $self->unlink_save;
2083 $self->destroy; 2310 $self->destroy;
2084} 2311}
2085 2312
2090 2317
2091 { 2318 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2319 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093 2320
2094 delete $cf::MAP{$self->path}; 2321 delete $cf::MAP{$self->path};
2322
2323 $self->unlink_save;
2095 2324
2096 bless $self, "cf::map"; 2325 bless $self, "cf::map";
2097 delete $self->{deny_reset}; 2326 delete $self->{deny_reset};
2098 $self->{deny_save} = 1; 2327 $self->{deny_save} = 1;
2099 $self->reset_timeout (1); 2328 $self->reset_timeout (1);
2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103 2330
2104 $cf::MAP{$self->path} = $self; 2331 $cf::MAP{$self->path} = $self;
2105 } 2332 }
2106 2333
2107 $self->reset; # polite request, might not happen 2334 $self->reset; # polite request, might not happen
2152 2379
2153sub unique_maps() { 2380sub unique_maps() {
2154 [ 2381 [
2155 map { 2382 map {
2156 utf8::decode $_; 2383 utf8::decode $_;
2157 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2158 ? normalise $_ 2387 : normalise $_
2159 : ()
2160 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2161 ] 2389 ]
2162} 2390}
2163 2391
2164package cf;
2165
2166=back 2392=back
2167 2393
2168=head3 cf::object 2394=head3 cf::object
2169 2395
2170=cut 2396=cut
2173 2399
2174=over 4 2400=over 4
2175 2401
2176=item $ob->inv_recursive 2402=item $ob->inv_recursive
2177 2403
2178Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2179 2406
2180=cut 2407=cut
2181 2408
2182sub inv_recursive_; 2409sub inv_recursive_;
2183sub inv_recursive_ { 2410sub inv_recursive_ {
2184 map { $_, inv_recursive_ $_->inv } @_ 2411 map { $_, inv_recursive_ $_->inv } @_
2185} 2412}
2186 2413
2187sub inv_recursive { 2414sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2416}
2417
2418=item $ref = $ob->ref
2419
2420Creates and returns a persistent reference to an object that can be stored as a string.
2421
2422=item $ob = cf::object::deref ($refstring)
2423
2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2425even if the object actually exists. May block.
2426
2427=cut
2428
2429sub deref {
2430 my ($ref) = @_;
2431
2432 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2433 my ($uuid, $name) = ($1, $2);
2434 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2435 or return;
2436 $pl->ob->uuid eq $uuid
2437 or return;
2438
2439 $pl->ob
2440 } else {
2441 warn "$ref: cannot resolve object reference\n";
2442 undef
2443 }
2189} 2444}
2190 2445
2191package cf; 2446package cf;
2192 2447
2193=back 2448=back
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2609
2355 $self->enter_link; 2610 $self->enter_link;
2356 2611
2357 (async { 2612 (async {
2613 $Coro::current->{desc} = "player::goto $path $x $y";
2614
2615 # *tag paths override both path and x|y
2616 if ($path =~ /^\*(.*)$/) {
2617 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2618 my $ob = $obs[rand @obs];
2619
2620 # see if we actually can go there
2621 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2622 $ob = $obs[rand @obs];
2623 } else {
2624 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2625 }
2626 # else put us there anyways for now #d#
2627
2628 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2629 } else {
2630 ($path, $x, $y) = (undef, undef, undef);
2631 }
2632 }
2633
2358 my $map = eval { 2634 my $map = eval {
2359 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2360 2636
2361 if ($map) { 2637 if ($map) {
2362 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2364 } else { 2640 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2366 } 2642 }
2367 2643
2368 $map 2644 $map
2369 }; 2645 };
2370 2646
2423 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2424 } 2700 }
2425 2701
2426 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2427 2703
2428 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canolicalize->encode ($rmp);
2429 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2430 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2431 2707
2432 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2433 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2460 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2463 2739
2464 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2465 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2466 unless (eval { 2744 unless (eval {
2467 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2468 2746
2469 1; 2747 1;
2504the message, with C<log> being the default. If C<$color> is negative, suppress 2782the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2506 2784
2507=cut 2785=cut
2508 2786
2787# non-persistent channels (usually the info channel)
2788our %CHANNEL = (
2789 "c/identify" => {
2790 id => "infobox",
2791 title => "Identify",
2792 reply => undef,
2793 tooltip => "Items recently identified",
2794 },
2795 "c/examine" => {
2796 id => "infobox",
2797 title => "Examine",
2798 reply => undef,
2799 tooltip => "Signs and other items you examined",
2800 },
2801 "c/book" => {
2802 id => "infobox",
2803 title => "Book",
2804 reply => undef,
2805 tooltip => "The contents of a note or book",
2806 },
2807 "c/lookat" => {
2808 id => "infobox",
2809 title => "Look",
2810 reply => undef,
2811 tooltip => "What you saw there",
2812 },
2813 "c/who" => {
2814 id => "infobox",
2815 title => "Players",
2816 reply => undef,
2817 tooltip => "Shows players who are currently online",
2818 },
2819 "c/body" => {
2820 id => "infobox",
2821 title => "Body Parts",
2822 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available",
2824 },
2825 "c/uptime" => {
2826 id => "infobox",
2827 title => "Uptime",
2828 reply => undef,
2829 tooltip => "How long the server has been running since last restart",
2830 },
2831 "c/mapinfo" => {
2832 id => "infobox",
2833 title => "Map Info",
2834 reply => undef,
2835 tooltip => "Information related to the maps",
2836 },
2837);
2838
2509sub cf::client::send_msg { 2839sub cf::client::send_msg {
2510 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2511 2841
2512 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg);
2513 2843
2514 $color &= cf::NDI_CLIENT_MASK; # just in case... 2844 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515 2845
2846 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel};
2849
2850 $self->ext_msg (channel_info => $channel)
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id};
2854
2516 if (ref $channel) { 2855 } elsif (ref $channel) {
2517 # send meta info to client, if not yet sent 2856 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) { 2857 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel; 2858 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel); 2859 $self->ext_msg (channel_info => $channel)
2860 if $self->can_msg;
2521 } 2861 }
2522 2862
2523 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2524 } 2864 }
2525 2865
2737=pod 3077=pod
2738 3078
2739The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
2740 3080
2741 cf::object 3081 cf::object
2742 contr pay_amount pay_player map x y force_find force_add 3082 contr pay_amount pay_player map x y force_find force_add destroy
2743 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease_ob_nr
2744 3084
2745 cf::object::player 3085 cf::object::player
2746 player 3086 player
2747 3087
2754=cut 3094=cut
2755 3095
2756for ( 3096for (
2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race 3098 insert remove inv name archname title slaying race
2759 decrease_ob_nr)], 3099 decrease_ob_nr destroy)],
2760 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2761 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
2762 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2763) { 3103) {
2764 no strict 'refs'; 3104 no strict 'refs';
2869 { 3209 {
2870 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
2871 3211
2872 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2873 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
2874 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
2875 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2878 3219
2879 cf::cede_to_tick; 3220 cf::cede_to_tick;
2880 } 3221 }
2881 3222
2882 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
2883 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
2884 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
2885 or next; 3227 or next;
3228
2886 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
2887 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
2888 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2889 } else { 3232 } else {
2890 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
2908 { 3251 {
2909 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
2910 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
2911 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
2912 3255
2913 my $soundconf = delete $res->{"res/sound.conf"};
2914
2915 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
2916 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data; 3259 my $data;
2918 3260
2919 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
2920 # prepend meta info 3262 # prepend meta info
2921 3263
2922 my $meta = $enc->encode ({ 3264 my $meta = $enc->encode ({
2923 name => $name, 3265 name => $name,
2924 %{ $info->{meta} || {} }, 3266 %{ $info->{meta} || {} },
2925 }); 3267 });
2926 3268
2927 $data = pack "(w/a*)*", $meta, $info->{data}; 3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
2928 } else { 3276 } else {
2929 $data = $info->{data}; 3277 $RESOURCE{$name} = $info;
2930 } 3278 }
2931 3279
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2935 cf::cede_to_tick; 3280 cf::cede_to_tick;
2936 } 3281 }
2937
2938 if ($soundconf) {
2939 $soundconf = $enc->decode (delete $soundconf->{data});
2940
2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2942 my $sound = $soundconf->{compat}[$_]
2943 or next;
2944
2945 my $face = cf::face::find "sound/$sound->[1]";
2946 cf::sound::set $sound->[0] => $face;
2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2948 }
2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2953 }
2954 }
2955 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2956 3285
2957 1 3286 1
2958} 3287}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
2959 3308
2960register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
2961 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
2962 3311
2963 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3018sub reload_config { 3367sub reload_config {
3019 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3020 or return; 3369 or return;
3021 3370
3022 local $/; 3371 local $/;
3023 *CFG = YAML::Syck::Load <$fh>; 3372 *CFG = YAML::Load <$fh>;
3024 3373
3025 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3026 3375
3027 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3028 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3039sub main { 3388sub main {
3040 # we must not ever block the main coroutine 3389 # we must not ever block the main coroutine
3041 local $Coro::idle = sub { 3390 local $Coro::idle = sub {
3042 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3043 (async { 3392 (async {
3044 Event::one_event; 3393 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT;
3045 })->prio (Coro::PRIO_MAX); 3395 })->prio (Coro::PRIO_MAX);
3046 }; 3396 };
3047 3397
3048 reload_config; 3398 reload_config;
3049 db_init; 3399 db_init;
3050 load_extensions; 3400 load_extensions;
3051 3401
3052 $TICK_WATCHER->start; 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno;
3053 Event::loop; 3404 EV::loop;
3054} 3405}
3055 3406
3056############################################################################# 3407#############################################################################
3057# initialisation and cleanup 3408# initialisation and cleanup
3058 3409
3059# install some emergency cleanup handlers 3410# install some emergency cleanup handlers
3060BEGIN { 3411BEGIN {
3412 our %SIGWATCHER = ();
3061 for my $signal (qw(INT HUP TERM)) { 3413 for my $signal (qw(INT HUP TERM)) {
3062 Event->signal ( 3414 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3063 reentrant => 0,
3064 data => WF_AUTOCANCEL,
3065 signal => $signal,
3066 prio => 0,
3067 cb => sub {
3068 cf::cleanup "SIG$signal"; 3415 cf::cleanup "SIG$signal";
3069 },
3070 ); 3416 };
3071 } 3417 }
3072} 3418}
3073 3419
3074sub write_runtime { 3420sub write_runtime_sync {
3075 my $runtime = "$LOCALDIR/runtime"; 3421 my $runtime = "$LOCALDIR/runtime";
3076 3422
3077 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3078 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3079 3425
3105 and return; 3451 and return;
3106 3452
3107 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3108 3454
3109 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3110} 3499}
3111 3500
3112sub emergency_save() { 3501sub emergency_save() {
3113 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3114 3503
3120 # and maps saved/destroyed asynchronously. 3509 # and maps saved/destroyed asynchronously.
3121 warn "begin emergency player save\n"; 3510 warn "begin emergency player save\n";
3122 for my $login (keys %cf::PLAYER) { 3511 for my $login (keys %cf::PLAYER) {
3123 my $pl = $cf::PLAYER{$login} or next; 3512 my $pl = $cf::PLAYER{$login} or next;
3124 $pl->valid or next; 3513 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3125 $pl->save; 3515 $pl->save;
3126 } 3516 }
3127 warn "end emergency player save\n"; 3517 warn "end emergency player save\n";
3128 3518
3129 warn "begin emergency map save\n"; 3519 warn "begin emergency map save\n";
3135 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3136 3526
3137 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3138 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3139 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3140 }; 3534 };
3141 3535
3142 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3143} 3537}
3144 3538
3159 warn "reloading..."; 3553 warn "reloading...";
3160 3554
3161 warn "entering sync_job"; 3555 warn "entering sync_job";
3162 3556
3163 cf::sync_job { 3557 cf::sync_job {
3164 cf::write_runtime; # external watchdog should not bark 3558 cf::write_runtime_sync; # external watchdog should not bark
3165 cf::emergency_save; 3559 cf::emergency_save;
3166 cf::write_runtime; # external watchdog should not bark 3560 cf::write_runtime_sync; # external watchdog should not bark
3167 3561
3168 warn "syncing database to disk"; 3562 warn "syncing database to disk";
3169 BDB::db_env_txn_checkpoint $DB_ENV; 3563 BDB::db_env_txn_checkpoint $DB_ENV;
3170 3564
3171 # if anything goes wrong in here, we should simply crash as we already saved 3565 # if anything goes wrong in here, we should simply crash as we already saved
3172
3173 warn "cancelling all WF_AUTOCANCEL watchers";
3174 for (Event::all_watchers) {
3175 $_->cancel if $_->data & WF_AUTOCANCEL;
3176 }
3177 3566
3178 warn "flushing outstanding aio requests"; 3567 warn "flushing outstanding aio requests";
3179 for (;;) { 3568 for (;;) {
3180 BDB::flush; 3569 BDB::flush;
3181 IO::AIO::flush; 3570 IO::AIO::flush;
3182 Coro::cede; 3571 Coro::cede_notself;
3183 last unless IO::AIO::nreqs || BDB::nreqs; 3572 last unless IO::AIO::nreqs || BDB::nreqs;
3184 warn "iterate..."; 3573 warn "iterate...";
3185 } 3574 }
3186 3575
3187 ++$RELOAD; 3576 ++$RELOAD;
3263 warn "leaving sync_job"; 3652 warn "leaving sync_job";
3264 3653
3265 1 3654 1
3266 } or do { 3655 } or do {
3267 warn $@; 3656 warn $@;
3268 warn "error while reloading, exiting."; 3657 cf::cleanup "error while reloading, exiting.";
3269 exit 1;
3270 }; 3658 };
3271 3659
3272 warn "reloaded"; 3660 warn "reloaded";
3273}; 3661};
3274 3662
3276 3664
3277sub reload_perl() { 3665sub reload_perl() {
3278 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3279 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3280 3668
3281 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3282 reentrant => 0,
3283 after => 0,
3284 data => WF_AUTOCANCEL,
3285 cb => sub {
3286 do_reload_perl; 3670 do_reload_perl;
3287 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3288 },
3289 ); 3672 };
3290} 3673}
3291 3674
3292register_command "reload" => sub { 3675register_command "reload" => sub {
3293 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3294 3677
3295 if ($who->flag (FLAG_WIZ)) { 3678 if ($who->flag (FLAG_WIZ)) {
3296 $who->message ("reloading server."); 3679 $who->message ("reloading server.");
3680 async {
3681 $Coro::current->{desc} = "perl_reload";
3297 async { reload_perl }; 3682 reload_perl;
3683 };
3298 } 3684 }
3299}; 3685};
3300 3686
3301unshift @INC, $LIBDIR; 3687unshift @INC, $LIBDIR;
3302 3688
3304 3690
3305our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3306our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3307 3693
3308sub wait_for_tick { 3694sub wait_for_tick {
3309 return unless $TICK_WATCHER->is_active; 3695 return if tick_inhibit;
3310 return if $Coro::current == $Coro::main; 3696 return if $Coro::current == $Coro::main;
3311 3697
3312 my $signal = new Coro::Signal; 3698 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK, $signal; 3699 push @WAIT_FOR_TICK, $signal;
3314 $signal->wait; 3700 $signal->wait;
3315} 3701}
3316 3702
3317sub wait_for_tick_begin { 3703sub wait_for_tick_begin {
3318 return unless $TICK_WATCHER->is_active; 3704 return if tick_inhibit;
3319 return if $Coro::current == $Coro::main; 3705 return if $Coro::current == $Coro::main;
3320 3706
3321 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3322 push @WAIT_FOR_TICK_BEGIN, $signal; 3708 push @WAIT_FOR_TICK_BEGIN, $signal;
3323 $signal->wait; 3709 $signal->wait;
3324} 3710}
3325 3711
3326 my $min = 1e6;#d# 3712sub tick {
3327 my $avg = 10;
3328$TICK_WATCHER = Event->timer (
3329 reentrant => 0,
3330 parked => 1,
3331 prio => 0,
3332 at => $NEXT_TICK || $TICK,
3333 data => WF_AUTOCANCEL,
3334 cb => sub {
3335 if ($Coro::current != $Coro::main) { 3713 if ($Coro::current != $Coro::main) {
3336 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3714 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3337 unless ++$bug_warning > 10; 3715 unless ++$bug_warning > 10;
3338 return; 3716 return;
3339 } 3717 }
3340 3718
3341 $NOW = $tick_start = Event::time;
3342
3343 cf::server_tick; # one server iteration 3719 cf::server_tick; # one server iteration
3344 3720
3345 0 && sync_job {#d# 3721 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3346 for(1..10) { 3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3347 my $t = Event::time; 3723 Coro::async_pool {
3348 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3724 $Coro::current->{desc} = "runtime saver";
3349 or die; 3725 write_runtime_sync
3350 3726 or warn "ERROR: unable to write runtime file: $!";
3351 $map->width (50);
3352 $map->height (50);
3353 $map->alloc;
3354 $map->_load_objects ("/tmp/x.map", 1);
3355 my $t = Event::time - $t;
3356
3357 #next unless $t < 0.0013;#d#
3358 if ($t < $min) {
3359 $min = $t;
3360 }
3361 $avg = $avg * 0.99 + $t * 0.01;
3362 }
3363 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3364 exit 0;
3365 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3366 }; 3727 };
3728 }
3367 3729
3368 $RUNTIME += $TICK;
3369 $NEXT_TICK += $TICK;
3370
3371 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3372 $NEXT_RUNTIME_WRITE = $NOW + 10;
3373 Coro::async_pool {
3374 write_runtime
3375 or warn "ERROR: unable to write runtime file: $!";
3376 };
3377 }
3378
3379# my $AFTER = Event::time;
3380# warn $AFTER - $NOW;#d#
3381
3382 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3383 $sig->send; 3731 $sig->send;
3384 } 3732 }
3385 while (my $sig = shift @WAIT_FOR_TICK) { 3733 while (my $sig = shift @WAIT_FOR_TICK) {
3386 $sig->send; 3734 $sig->send;
3387 } 3735 }
3388 3736
3389 $NOW = Event::time; 3737 $LOAD = ($NOW - $TICK_START) / $TICK;
3390
3391 # if we are delayed by four ticks or more, skip them all
3392 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3393
3394 $TICK_WATCHER->at ($NEXT_TICK);
3395 $TICK_WATCHER->start;
3396
3397 $LOAD = ($NOW - $tick_start) / $TICK;
3398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3738 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3399 3739
3400 _post_tick; 3740 if (0) {
3401 3741 if ($NEXT_TICK) {
3402 3742 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d#
3745 }
3403 }, 3746 }
3404); 3747}
3405 3748
3406{ 3749{
3407 BDB::max_poll_time $TICK * 0.1; 3750 # configure BDB
3408 $BDB_POLL_WATCHER = Event->io ( 3751
3409 reentrant => 0,
3410 fd => BDB::poll_fileno,
3411 poll => 'r',
3412 prio => 0,
3413 data => WF_AUTOCANCEL,
3414 cb => \&BDB::poll_cb,
3415 );
3416 BDB::min_parallel 8; 3752 BDB::min_parallel 8;
3417 3753 BDB::max_poll_reqs $TICK * 0.1;
3418 BDB::set_sync_prepare { 3754 $Coro::BDB::WATCHER->priority (1);
3419 my $status;
3420 my $current = $Coro::current;
3421 (
3422 sub {
3423 $status = $!;
3424 $current->ready; undef $current;
3425 },
3426 sub {
3427 Coro::schedule while defined $current;
3428 $! = $status;
3429 },
3430 )
3431 };
3432 3755
3433 unless ($DB_ENV) { 3756 unless ($DB_ENV) {
3434 $DB_ENV = BDB::db_env_create; 3757 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3759 | BDB::LOG_AUTOREMOVE, 1);
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3435 3762
3436 cf::sync_job { 3763 cf::sync_job {
3437 eval { 3764 eval {
3438 BDB::db_env_open 3765 BDB::db_env_open
3439 $DB_ENV, 3766 $DB_ENV,
3441 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3768 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3442 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3769 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3443 0666; 3770 0666;
3444 3771
3445 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3772 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3446
3447 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3448 $DB_ENV->set_lk_detect;
3449 }; 3773 };
3450 3774
3451 cf::cleanup "db_env_open(db): $@" if $@; 3775 cf::cleanup "db_env_open(db): $@" if $@;
3452 }; 3776 };
3453 } 3777 }
3778
3779 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3780 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3781 };
3782 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3783 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3784 };
3785 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3786 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3787 };
3454} 3788}
3455 3789
3456{ 3790{
3791 # configure IO::AIO
3792
3457 IO::AIO::min_parallel 8; 3793 IO::AIO::min_parallel 8;
3458
3459 undef $Coro::AIO::WATCHER;
3460 IO::AIO::max_poll_time $TICK * 0.1; 3794 IO::AIO::max_poll_time $TICK * 0.1;
3461 $AIO_POLL_WATCHER = Event->io ( 3795 $Coro::AIO::WATCHER->priority (1);
3462 reentrant => 0,
3463 data => WF_AUTOCANCEL,
3464 fd => IO::AIO::poll_fileno,
3465 poll => 'r',
3466 prio => 6,
3467 cb => \&IO::AIO::poll_cb,
3468 );
3469} 3796}
3470 3797
3471my $_log_backtrace; 3798my $_log_backtrace;
3472 3799
3473sub _log_backtrace { 3800sub _log_backtrace {
3477 3804
3478 # limit the # of concurrent backtraces 3805 # limit the # of concurrent backtraces
3479 if ($_log_backtrace < 2) { 3806 if ($_log_backtrace < 2) {
3480 ++$_log_backtrace; 3807 ++$_log_backtrace;
3481 async { 3808 async {
3809 $Coro::current->{desc} = "abt $msg";
3810
3482 my @bt = fork_call { 3811 my @bt = fork_call {
3483 @addr = map { sprintf "%x", $_ } @addr; 3812 @addr = map { sprintf "%x", $_ } @addr;
3484 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3813 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3485 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3814 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3486 or die "addr2line: $!"; 3815 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines