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.362 by root, Mon Sep 10 12:44:06 2007 UTC vs.
Revision 1.426 by root, Thu Apr 24 04:40:31 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, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # 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
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 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 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#?
195 231
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 248)) {
213 no strict 'refs'; 249 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 251}
216 252
217$Event::DIED = sub { 253$EV::DIED = sub {
218 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
219}; 255};
220 256
221############################################################################# 257#############################################################################
222 258
245 $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;
246 $d 282 $d
247 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
248} 284}
249 285
250=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
251 287
252Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
253 289
254=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
255 291
256Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
257 293
258=cut 294=cut
259 295
260our $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
261 297
262sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
264 300
265=item cf::lock_wait $string 301=item cf::lock_wait $string
266 302
267Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
268 304
324 360
325 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
326} 362}
327 363
328sub freeze_mainloop { 364sub freeze_mainloop {
329 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
330 366
331 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
332 $TICK_WATCHER->start; 368}
333 }; 369
334 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
335 $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
336} 383}
337 384
338=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
339 386
340Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
351our @SLOT_QUEUE; 398our @SLOT_QUEUE;
352our $SLOT_QUEUE; 399our $SLOT_QUEUE;
353 400
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
356 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
357 406
358 while () { 407 while () {
359 next_job: 408 next_job:
360 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
368 } 417 }
369 } 418 }
370 } 419 }
371 420
372 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
373 # 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
374 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 424 $signal->wait;
376 } else { 425 } else {
377 Coro::schedule; 426 Coro::schedule;
378 } 427 }
379 } 428 }
380}; 429};
381 430
382sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
383 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
384 435
385 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
386 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
387 438
401 452
402BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
403 454
404=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
405 456
406The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
407is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
408partly 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
409acceptable. 460acceptable.
410 461
411If 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
412the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
417 468
418sub sync_job(&) { 469sub sync_job(&) {
419 my ($job) = @_; 470 my ($job) = @_;
420 471
421 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
422 my $time = Event::time; 473 my $time = EV::time;
423 474
424 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
426 477
427 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
428 # (but this is cancel-safe) 479
429 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
430 481
431 my $busy = 1; 482 my $busy = 1;
432 my @res; 483 my @res;
433 484
434 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 487 @res = eval { $job->() };
436 warn $@ if $@; 488 warn $@ if $@;
437 undef $busy; 489 undef $busy;
438 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
439 491
440 while ($busy) { 492 while ($busy) {
441 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
442 } 497 }
498 }
443 499
444 $time = Event::time - $time; 500 my $time = EV::time - $time;
445 501
446 LOG llevError | logBacktrace, Carp::longmess "long sync job"
447 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
448
449 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
450 503
451 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
452 } else { 505 } else {
453 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
454 507
479=item fork_call { }, $args 532=item fork_call { }, $args
480 533
481Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
485 538
486=cut 539=cut
487 540
488sub fork_call(&@) { 541sub fork_call(&@) {
489 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
498 }, @args; 551 }, @args;
499 552
500 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
501} 554}
502 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
503=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
504 584
505Returns a single value from the environment database. 585Returns a single value from the environment database.
506 586
507=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
508 588
509Stores 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
510data 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).
511 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
512=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}
513 615
514our $DB; 616our $DB;
515 617
516sub db_init { 618sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 619 cf::sync_job {
521 eval { 620 $DB ||= db_table "db";
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
530 } 621 };
531} 622}
532 623
533sub db_get($$) { 624sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
535 626
639attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
640to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
641 732
642In 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>
643C<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
644Crossfire TRT). 735Deliantra).
645 736
646=over 4 737=over 4
647 738
648=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
649 740
931 } 1022 }
932 1023
933 0 1024 0
934} 1025}
935 1026
936=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
937 1028
938=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
939 1030
940Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
941 1032
947 1038
948=cut 1039=cut
949 1040
950############################################################################# 1041#############################################################################
951# object support 1042# object support
952#
953 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#
954sub _can_merge { 1077sub _can_merge {
955 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
956 1079
957 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1081
961 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
962} 1084}
963 1085
964sub reattach { 1086sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1088 my ($obj) = @_;
988cf::attachable->attach ( 1110cf::attachable->attach (
989 prio => -1000000, 1111 prio => -1000000,
990 on_instantiate => sub { 1112 on_instantiate => sub {
991 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
992 1114
993 $data = from_json $data; 1115 $data = decode_json $data;
994 1116
995 for (@$data) { 1117 for (@$data) {
996 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
997 1119
998 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1011 }, 1133 },
1012); 1134);
1013 1135
1014sub object_freezer_save { 1136sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
1016
1017 my $guard = cf::lock_acquire "io";
1018 1138
1019 sync_job { 1139 sync_job {
1020 if (length $$rdata) { 1140 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1029 close $fh; 1149 close $fh;
1030 1150
1031 if (@$objs) { 1151 if (@$objs) {
1032 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) {
1033 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1157 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1159 }
1048 } else { 1168 } else {
1049 aio_unlink $filename; 1169 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1051 } 1171 }
1052 }; 1172 };
1053
1054 undef $guard;
1055} 1173}
1056 1174
1057sub object_freezer_as_string { 1175sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1059 1177
1064 1182
1065sub object_thawer_load { 1183sub object_thawer_load {
1066 my ($filename) = @_; 1184 my ($filename) = @_;
1067 1185
1068 my ($data, $av); 1186 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1187
1072 (aio_load $filename, $data) >= 0 1188 (aio_load $filename, $data) >= 0
1073 or return; 1189 or return;
1074 1190
1075 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1193 or return;
1078 1194
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1081 } 1197 }
1082 1198
1083 utf8::decode (my $decname = $filename); 1199 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1241 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1242 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1243 1359
1244 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1245 warn $msg; 1361 warn $msg;
1246 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1247 exit 1;
1248 } 1363 }
1249 1364
1250 warn $msg; 1365 warn $msg;
1251 } 1366 }
1252 1367
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1455
1341 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1457 or return;
1343 1458
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1346 or return; 1460 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1461 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1462 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1362 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1363 1477
1364 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1365 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1366 1480
1481 cf::get_slot 0.01;
1482
1367 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1368 cf::cede_to_tick; 1484 cf::cede_to_tick;
1369} 1485}
1370 1486
1371sub new($) { 1487sub new($) {
1501 1617
1502Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1503 1619
1504=cut 1620=cut
1505 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
1506sub expand_cfpod { 1633sub expand_cfpod {
1507 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1508 1635
1509 # escape & and < 1636 my $xml;
1510 s/&/&amp;/g;
1511 s/(?<![BIUGHT])</&lt;/g;
1512 1637
1513 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1514 1641
1515 1 while 1642 $group =~ s/&/&amp;/g;
1516 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1517 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1518 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1519 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1647 ([BCGHITU])
1521 # replace G<male|female> tags 1648 <
1522 || s{G<([^>|]*)\|([^>]*)>}{ 1649 (?:
1523 $self->gender ? $2 : $1 1650 ([^<>]*) (?{ $group = $^N })
1524 }ge 1651 | < $interior >
1525 # replace H<hint text> 1652 )
1526 || s{H<([^\>]*)>} 1653 >
1654 %gcsx
1527 { 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") {
1528 ("<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>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "") 1675 "")
1531 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1532 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1533 1687
1688 for ($xml) {
1534 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1535 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1536 1691
1537 # compress some whitespace 1692 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1542 1698
1543 $_ 1699 $xml
1544} 1700}
1701
1702no re 'eval';
1545 1703
1546sub hintmode { 1704sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode} 1706 $_[0]{hintmode}
1549} 1707}
1621our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1622our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1623 1781
1624sub generate_random_map { 1782sub generate_random_map {
1625 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
1626 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1627 $self->_create_random_map ( 1788 $self->_create_random_map (
1628 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1629 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1630 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1752 1913
1753# the temporary/swap location 1914# the temporary/swap location
1754sub save_path { 1915sub save_path {
1755 my ($self) = @_; 1916 my ($self) = @_;
1756 1917
1757 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1758 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1759} 1920}
1760 1921
1761# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1762sub uniq_path { 1923sub uniq_path {
1763 my ($self) = @_; 1924 my ($self) = @_;
1764 1925
1765 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1766 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1767} 1928}
1768 1929
1769# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1770# all maps in C++... 1931# all maps in C++...
1956 } 2117 }
1957 2118
1958 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1959 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1960 2121
1961 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1962 } 2123 }
1963 2124
1964 $self->post_load; 2125 $self->post_load;
1965} 2126}
1966 2127
2024 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2025 2186
2026 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2027 2188
2028 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2030 } 2191 }
2031 2192
2032 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2033 2194
2034 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
2035 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2200 if (my $map = find $k) {
2038 $map->load if $v; 2201 $map->load if $v;
2039 } 2202 }
2065 return if $self->{deny_save}; 2228 return if $self->{deny_save};
2066 2229
2067 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
2068 2231
2069 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2071 }; 2235 };
2236
2237 cf::get_slot 0.02;
2072 2238
2073 if ($uniq) { 2239 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2075 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2076 } else { 2242 } else {
2085 $self->save; 2251 $self->save;
2086 2252
2087 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2088 2254
2089 return if $self->players; 2255 return if $self->players;
2090 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2091 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2092 2258
2093 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2094 2260
2095 $self->deactivate; 2261 $self->deactivate;
2213 2379
2214sub unique_maps() { 2380sub unique_maps() {
2215 [ 2381 [
2216 map { 2382 map {
2217 utf8::decode $_; 2383 utf8::decode $_;
2218 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2219 ? normalise $_ 2387 : normalise $_
2220 : ()
2221 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2222 ] 2389 ]
2223} 2390}
2224 2391
2225package cf;
2226
2227=back 2392=back
2228 2393
2229=head3 cf::object 2394=head3 cf::object
2230 2395
2231=cut 2396=cut
2234 2399
2235=over 4 2400=over 4
2236 2401
2237=item $ob->inv_recursive 2402=item $ob->inv_recursive
2238 2403
2239Returns 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.
2240 2406
2241=cut 2407=cut
2242 2408
2243sub inv_recursive_; 2409sub inv_recursive_;
2244sub inv_recursive_ { 2410sub inv_recursive_ {
2249 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2250} 2416}
2251 2417
2252=item $ref = $ob->ref 2418=item $ref = $ob->ref
2253 2419
2254creates and returns a persistent reference to an objetc that can be stored as a string. 2420Creates and returns a persistent reference to an object that can be stored as a string.
2255 2421
2256=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2257 2423
2258returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2259even if the object actually exists. May block. 2425even if the object actually exists. May block.
2261=cut 2427=cut
2262 2428
2263sub deref { 2429sub deref {
2264 my ($ref) = @_; 2430 my ($ref) = @_;
2265 2431
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2432 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2433 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2434 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2435 or return;
2273 $pl->ob->uuid eq $uuid 2436 $pl->ob->uuid eq $uuid
2274 or return; 2437 or return;
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2609
2447 $self->enter_link; 2610 $self->enter_link;
2448 2611
2449 (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
2450 my $map = eval { 2634 my $map = eval {
2451 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2452 2636
2453 if ($map) { 2637 if ($map) {
2454 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2456 } else { 2640 } else {
2457 $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);
2458 } 2642 }
2459 2643
2460 $map 2644 $map
2461 }; 2645 };
2462 2646
2515 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2516 } 2700 }
2517 2701
2518 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2519 2703
2520 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2521 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2522 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2523 2707
2524 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2525 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2552 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2555 2739
2556 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2557 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2558 unless (eval { 2744 unless (eval {
2559 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2560 2746
2561 1; 2747 1;
2596the 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
2597the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2598 2784
2599=cut 2785=cut
2600 2786
2787# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 2788our %CHANNEL = (
2602 "c/identify" => { 2789 "c/identify" => {
2603 id => "identify", 2790 id => "infobox",
2604 title => "Identify", 2791 title => "Identify",
2605 reply => undef, 2792 reply => undef,
2606 tooltip => "Items recently identified", 2793 tooltip => "Items recently identified",
2607 }, 2794 },
2608 "c/examine" => { 2795 "c/examine" => {
2609 id => "examine", 2796 id => "infobox",
2610 title => "Examine", 2797 title => "Examine",
2611 reply => undef, 2798 reply => undef,
2612 tooltip => "Signs and other items you examined", 2799 tooltip => "Signs and other items you examined",
2613 }, 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 "c/party" => {
2838 id => "party",
2839 title => "Party",
2840 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party",
2842 },
2614); 2843);
2615 2844
2616sub cf::client::send_msg { 2845sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2846 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2847
2619 $msg = $self->pl->expand_cfpod ($msg); 2848 $msg = $self->pl->expand_cfpod ($msg);
2620 2849
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2850 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2851
2623 # check predefined channels, for the benefit of C 2852 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2853 if ($CHANNEL{$channel}) {
2854 $channel = $CHANNEL{$channel};
2625 2855
2856 $self->ext_msg (channel_info => $channel)
2857 if $self->can_msg;
2858
2859 $channel = $channel->{id};
2860
2626 if (ref $channel) { 2861 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2862 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2863 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2864 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2865 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg; 2866 if $self->can_msg;
2848=pod 3083=pod
2849 3084
2850The following functions and methods are available within a safe environment: 3085The following functions and methods are available within a safe environment:
2851 3086
2852 cf::object 3087 cf::object
2853 contr pay_amount pay_player map x y force_find force_add 3088 contr pay_amount pay_player map x y force_find force_add destroy
2854 insert remove name archname title slaying race decrease_ob_nr 3089 insert remove name archname title slaying race decrease split
2855 3090
2856 cf::object::player 3091 cf::object::player
2857 player 3092 player
2858 3093
2859 cf::player 3094 cf::player
2865=cut 3100=cut
2866 3101
2867for ( 3102for (
2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3103 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race 3104 insert remove inv name archname title slaying race
2870 decrease_ob_nr)], 3105 decrease split destroy)],
2871 ["cf::object::player" => qw(player)], 3106 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3107 ["cf::player" => qw(peaceful)],
2873 ["cf::map" => qw(trigger)], 3108 ["cf::map" => qw(trigger)],
2874) { 3109) {
2875 no strict 'refs'; 3110 no strict 'refs';
2980 { 3215 {
2981 my $faces = $facedata->{faceinfo}; 3216 my $faces = $facedata->{faceinfo};
2982 3217
2983 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
2984 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3219 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3220
2985 cf::face::set_visibility $idx, $info->{visibility}; 3221 cf::face::set_visibility $idx, $info->{visibility};
2986 cf::face::set_magicmap $idx, $info->{magicmap}; 3222 cf::face::set_magicmap $idx, $info->{magicmap};
2987 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3223 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2988 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3224 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2989 3225
2990 cf::cede_to_tick; 3226 cf::cede_to_tick;
2991 } 3227 }
2992 3228
2993 while (my ($face, $info) = each %$faces) { 3229 while (my ($face, $info) = each %$faces) {
2994 next unless $info->{smooth}; 3230 next unless $info->{smooth};
3231
2995 my $idx = cf::face::find $face 3232 my $idx = cf::face::find $face
2996 or next; 3233 or next;
3234
2997 if (my $smooth = cf::face::find $info->{smooth}) { 3235 if (my $smooth = cf::face::find $info->{smooth}) {
2998 cf::face::set_smooth $idx, $smooth; 3236 cf::face::set_smooth $idx, $smooth;
2999 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3237 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3000 } else { 3238 } else {
3001 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3239 warn "smooth face '$info->{smooth}' not found for face '$face'";
3019 { 3257 {
3020 # TODO: for gcfclient pleasure, we should give resources 3258 # TODO: for gcfclient pleasure, we should give resources
3021 # that gcfclient doesn't grok a >10000 face index. 3259 # that gcfclient doesn't grok a >10000 face index.
3022 my $res = $facedata->{resource}; 3260 my $res = $facedata->{resource};
3023 3261
3024 my $soundconf = delete $res->{"res/sound.conf"};
3025
3026 while (my ($name, $info) = each %$res) { 3262 while (my ($name, $info) = each %$res) {
3263 if (defined $info->{type}) {
3027 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3264 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data; 3265 my $data;
3029 3266
3030 if ($info->{type} & 1) { 3267 if ($info->{type} & 1) {
3031 # prepend meta info 3268 # prepend meta info
3032 3269
3033 my $meta = $enc->encode ({ 3270 my $meta = $enc->encode ({
3034 name => $name, 3271 name => $name,
3035 %{ $info->{meta} || {} }, 3272 %{ $info->{meta} || {} },
3036 }); 3273 });
3037 3274
3038 $data = pack "(w/a*)*", $meta, $info->{data}; 3275 $data = pack "(w/a*)*", $meta, $info->{data};
3276 } else {
3277 $data = $info->{data};
3278 }
3279
3280 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3281 cf::face::set_type $idx, $info->{type};
3039 } else { 3282 } else {
3040 $data = $info->{data}; 3283 $RESOURCE{$name} = $info;
3041 } 3284 }
3042 3285
3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3044 cf::face::set_type $idx, $info->{type};
3045
3046 cf::cede_to_tick; 3286 cf::cede_to_tick;
3047 } 3287 }
3048
3049 if ($soundconf) {
3050 $soundconf = $enc->decode (delete $soundconf->{data});
3051
3052 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3053 my $sound = $soundconf->{compat}[$_]
3054 or next;
3055
3056 my $face = cf::face::find "sound/$sound->[1]";
3057 cf::sound::set $sound->[0] => $face;
3058 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3059 }
3060
3061 while (my ($k, $v) = each %{$soundconf->{event}}) {
3062 my $face = cf::face::find "sound/$v";
3063 cf::sound::set $k => $face;
3064 }
3065 }
3066 } 3288 }
3289
3290 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3067 3291
3068 1 3292 1
3069} 3293}
3294
3295cf::global->attach (on_resource_update => sub {
3296 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3297 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3298
3299 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3300 my $sound = $soundconf->{compat}[$_]
3301 or next;
3302
3303 my $face = cf::face::find "sound/$sound->[1]";
3304 cf::sound::set $sound->[0] => $face;
3305 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3306 }
3307
3308 while (my ($k, $v) = each %{$soundconf->{event}}) {
3309 my $face = cf::face::find "sound/$v";
3310 cf::sound::set $k => $face;
3311 }
3312 }
3313});
3070 3314
3071register_exticmd fx_want => sub { 3315register_exticmd fx_want => sub {
3072 my ($ns, $want) = @_; 3316 my ($ns, $want) = @_;
3073 3317
3074 while (my ($k, $v) = each %$want) { 3318 while (my ($k, $v) = each %$want) {
3075 $ns->fx_want ($k, $v); 3319 $ns->fx_want ($k, $v);
3076 } 3320 }
3077}; 3321};
3322
3323sub load_resource_file($) {
3324 my $guard = lock_acquire "load_resource_file";
3325
3326 my $status = load_resource_file_ $_[0];
3327 get_slot 0.1, 100;
3328 cf::arch::commit_load;
3329
3330 $status
3331}
3078 3332
3079sub reload_regions { 3333sub reload_regions {
3080 # HACK to clear player env face cache, we need some signal framework 3334 # HACK to clear player env face cache, we need some signal framework
3081 # for this (global event?) 3335 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = (); 3336 %ext::player_env::MUSIC_FACE_CACHE = ();
3096} 3350}
3097 3351
3098sub reload_archetypes { 3352sub reload_archetypes {
3099 load_resource_file "$DATADIR/archetypes" 3353 load_resource_file "$DATADIR/archetypes"
3100 or die "unable to load archetypes\n"; 3354 or die "unable to load archetypes\n";
3101 #d# NEED to laod twice to resolve forward references
3102 # this really needs to be done in an extra post-pass
3103 # (which needs to be synchronous, so solve it differently)
3104 load_resource_file "$DATADIR/archetypes"
3105 or die "unable to load archetypes\n";
3106} 3355}
3107 3356
3108sub reload_treasures { 3357sub reload_treasures {
3109 load_resource_file "$DATADIR/treasures" 3358 load_resource_file "$DATADIR/treasures"
3110 or die "unable to load treasurelists\n"; 3359 or die "unable to load treasurelists\n";
3111} 3360}
3112 3361
3113sub reload_resources { 3362sub reload_resources {
3114 warn "reloading resource files...\n"; 3363 warn "reloading resource files...\n";
3115 3364
3365 reload_facedata;
3366 reload_archetypes;
3116 reload_regions; 3367 reload_regions;
3117 reload_facedata;
3118 #reload_archetypes;#d#
3119 reload_archetypes;
3120 reload_treasures; 3368 reload_treasures;
3121 3369
3122 warn "finished reloading resource files\n"; 3370 warn "finished reloading resource files\n";
3123} 3371}
3124 3372
3125sub init { 3373sub init {
3374 my $guard = freeze_mainloop;
3375
3126 reload_resources; 3376 reload_resources;
3127} 3377}
3128 3378
3129sub reload_config { 3379sub reload_config {
3130 open my $fh, "<:utf8", "$CONFDIR/config" 3380 open my $fh, "<:utf8", "$CONFDIR/config"
3131 or return; 3381 or return;
3132 3382
3133 local $/; 3383 local $/;
3134 *CFG = YAML::Syck::Load <$fh>; 3384 *CFG = YAML::Load <$fh>;
3135 3385
3136 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3386 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3137 3387
3138 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3388 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3139 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3389 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3150sub main { 3400sub main {
3151 # we must not ever block the main coroutine 3401 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3402 local $Coro::idle = sub {
3153 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3403 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3154 (async { 3404 (async {
3155 Event::one_event; 3405 $Coro::current->{desc} = "IDLE BUG HANDLER";
3406 EV::loop EV::LOOP_ONESHOT;
3156 })->prio (Coro::PRIO_MAX); 3407 })->prio (Coro::PRIO_MAX);
3157 }; 3408 };
3158 3409
3410 {
3411 my $guard = freeze_mainloop;
3159 reload_config; 3412 reload_config;
3160 db_init; 3413 db_init;
3161 load_extensions; 3414 load_extensions;
3162 3415
3163 $TICK_WATCHER->start; 3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 evthread_start IO::AIO::poll_fileno;
3418 }
3419
3164 Event::loop; 3420 EV::loop;
3165} 3421}
3166 3422
3167############################################################################# 3423#############################################################################
3168# initialisation and cleanup 3424# initialisation and cleanup
3169 3425
3170# install some emergency cleanup handlers 3426# install some emergency cleanup handlers
3171BEGIN { 3427BEGIN {
3428 our %SIGWATCHER = ();
3172 for my $signal (qw(INT HUP TERM)) { 3429 for my $signal (qw(INT HUP TERM)) {
3173 Event->signal ( 3430 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3174 reentrant => 0,
3175 data => WF_AUTOCANCEL,
3176 signal => $signal,
3177 prio => 0,
3178 cb => sub {
3179 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
3180 },
3181 ); 3432 };
3182 } 3433 }
3183} 3434}
3184 3435
3185sub write_runtime { 3436sub write_runtime_sync {
3186 my $runtime = "$LOCALDIR/runtime"; 3437 my $runtime = "$LOCALDIR/runtime";
3187 3438
3188 # first touch the runtime file to show we are still running: 3439 # first touch the runtime file to show we are still running:
3189 # the fsync below can take a very very long time. 3440 # the fsync below can take a very very long time.
3190 3441
3216 and return; 3467 and return;
3217 3468
3218 warn "runtime file written.\n"; 3469 warn "runtime file written.\n";
3219 3470
3220 1 3471 1
3472}
3473
3474our $uuid_lock;
3475our $uuid_skip;
3476
3477sub write_uuid_sync($) {
3478 $uuid_skip ||= $_[0];
3479
3480 return if $uuid_lock;
3481 local $uuid_lock = 1;
3482
3483 my $uuid = "$LOCALDIR/uuid";
3484
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return;
3487
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3489 $uuid_skip = 0;
3490
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return;
3493
3494 # always fsync - this file is important
3495 aio_fsync $fh
3496 and return;
3497
3498 close $fh
3499 or return;
3500
3501 aio_rename "$uuid~", $uuid
3502 and return;
3503
3504 warn "uuid file written ($value).\n";
3505
3506 1
3507
3508}
3509
3510sub write_uuid($$) {
3511 my ($skip, $sync) = @_;
3512
3513 $sync ? write_uuid_sync $skip
3514 : async { write_uuid_sync $skip };
3221} 3515}
3222 3516
3223sub emergency_save() { 3517sub emergency_save() {
3224 my $freeze_guard = cf::freeze_mainloop; 3518 my $freeze_guard = cf::freeze_mainloop;
3225 3519
3231 # and maps saved/destroyed asynchronously. 3525 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3526 warn "begin emergency player save\n";
3233 for my $login (keys %cf::PLAYER) { 3527 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3528 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3529 $pl->valid or next;
3530 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3531 $pl->save;
3237 } 3532 }
3238 warn "end emergency player save\n"; 3533 warn "end emergency player save\n";
3239 3534
3240 warn "begin emergency map save\n"; 3535 warn "begin emergency map save\n";
3246 warn "end emergency map save\n"; 3541 warn "end emergency map save\n";
3247 3542
3248 warn "begin emergency database checkpoint\n"; 3543 warn "begin emergency database checkpoint\n";
3249 BDB::db_env_txn_checkpoint $DB_ENV; 3544 BDB::db_env_txn_checkpoint $DB_ENV;
3250 warn "end emergency database checkpoint\n"; 3545 warn "end emergency database checkpoint\n";
3546
3547 warn "begin write uuid\n";
3548 write_uuid_sync 1;
3549 warn "end write uuid\n";
3251 }; 3550 };
3252 3551
3253 warn "leave emergency perl save\n"; 3552 warn "leave emergency perl save\n";
3254} 3553}
3255 3554
3270 warn "reloading..."; 3569 warn "reloading...";
3271 3570
3272 warn "entering sync_job"; 3571 warn "entering sync_job";
3273 3572
3274 cf::sync_job { 3573 cf::sync_job {
3275 cf::write_runtime; # external watchdog should not bark 3574 cf::write_runtime_sync; # external watchdog should not bark
3276 cf::emergency_save; 3575 cf::emergency_save;
3277 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3278 3577
3279 warn "syncing database to disk"; 3578 warn "syncing database to disk";
3280 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3281 3580
3282 # if anything goes wrong in here, we should simply crash as we already saved 3581 # if anything goes wrong in here, we should simply crash as we already saved
3283
3284 warn "cancelling all WF_AUTOCANCEL watchers";
3285 for (Event::all_watchers) {
3286 $_->cancel if $_->data & WF_AUTOCANCEL;
3287 }
3288 3582
3289 warn "flushing outstanding aio requests"; 3583 warn "flushing outstanding aio requests";
3290 for (;;) { 3584 for (;;) {
3291 BDB::flush; 3585 BDB::flush;
3292 IO::AIO::flush; 3586 IO::AIO::flush;
3293 Coro::cede; 3587 Coro::cede_notself;
3294 last unless IO::AIO::nreqs || BDB::nreqs; 3588 last unless IO::AIO::nreqs || BDB::nreqs;
3295 warn "iterate..."; 3589 warn "iterate...";
3296 } 3590 }
3297 3591
3298 ++$RELOAD; 3592 ++$RELOAD;
3374 warn "leaving sync_job"; 3668 warn "leaving sync_job";
3375 3669
3376 1 3670 1
3377 } or do { 3671 } or do {
3378 warn $@; 3672 warn $@;
3379 warn "error while reloading, exiting."; 3673 cf::cleanup "error while reloading, exiting.";
3380 exit 1;
3381 }; 3674 };
3382 3675
3383 warn "reloaded"; 3676 warn "reloaded";
3384}; 3677};
3385 3678
3387 3680
3388sub reload_perl() { 3681sub reload_perl() {
3389 # doing reload synchronously and two reloads happen back-to-back, 3682 # doing reload synchronously and two reloads happen back-to-back,
3390 # coro crashes during coro_state_free->destroy here. 3683 # coro crashes during coro_state_free->destroy here.
3391 3684
3392 $RELOAD_WATCHER ||= Event->timer ( 3685 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3393 reentrant => 0,
3394 after => 0,
3395 data => WF_AUTOCANCEL,
3396 cb => sub {
3397 do_reload_perl; 3686 do_reload_perl;
3398 undef $RELOAD_WATCHER; 3687 undef $RELOAD_WATCHER;
3399 },
3400 ); 3688 };
3401} 3689}
3402 3690
3403register_command "reload" => sub { 3691register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3692 my ($who, $arg) = @_;
3405 3693
3406 if ($who->flag (FLAG_WIZ)) { 3694 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3695 $who->message ("reloading server.");
3696 async {
3697 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3698 reload_perl;
3699 };
3409 } 3700 }
3410}; 3701};
3411 3702
3412unshift @INC, $LIBDIR; 3703unshift @INC, $LIBDIR;
3413 3704
3415 3706
3416our @WAIT_FOR_TICK; 3707our @WAIT_FOR_TICK;
3417our @WAIT_FOR_TICK_BEGIN; 3708our @WAIT_FOR_TICK_BEGIN;
3418 3709
3419sub wait_for_tick { 3710sub wait_for_tick {
3420 return unless $TICK_WATCHER->is_active;
3421 return if $Coro::current == $Coro::main; 3711 return if tick_inhibit || $Coro::current == $Coro::main;
3422 3712
3423 my $signal = new Coro::Signal; 3713 my $signal = new Coro::Signal;
3424 push @WAIT_FOR_TICK, $signal; 3714 push @WAIT_FOR_TICK, $signal;
3425 $signal->wait; 3715 $signal->wait;
3426} 3716}
3427 3717
3428sub wait_for_tick_begin { 3718sub wait_for_tick_begin {
3429 return unless $TICK_WATCHER->is_active;
3430 return if $Coro::current == $Coro::main; 3719 return if tick_inhibit || $Coro::current == $Coro::main;
3431 3720
3432 my $signal = new Coro::Signal; 3721 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3722 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3723 $signal->wait;
3435} 3724}
3436 3725
3437 my $min = 1e6;#d# 3726sub tick {
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer (
3440 reentrant => 0,
3441 parked => 1,
3442 prio => 0,
3443 at => $NEXT_TICK || $TICK,
3444 data => WF_AUTOCANCEL,
3445 cb => sub {
3446 if ($Coro::current != $Coro::main) { 3727 if ($Coro::current != $Coro::main) {
3447 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3728 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3448 unless ++$bug_warning > 10; 3729 unless ++$bug_warning > 10;
3449 return; 3730 return;
3450 } 3731 }
3451 3732
3452 $NOW = $tick_start = Event::time;
3453
3454 cf::server_tick; # one server iteration 3733 cf::server_tick; # one server iteration
3455 3734
3456 0 && sync_job {#d# 3735 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3457 for(1..10) { 3736 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3458 my $t = Event::time; 3737 Coro::async_pool {
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3738 $Coro::current->{desc} = "runtime saver";
3460 or die; 3739 write_runtime_sync
3461 3740 or warn "ERROR: unable to write runtime file: $!";
3462 $map->width (50);
3463 $map->height (50);
3464 $map->alloc;
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3466 my $t = Event::time - $t;
3467
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 }; 3741 };
3742 }
3478 3743
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool {
3485 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 }
3489
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3744 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3745 $sig->send;
3495 } 3746 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3747 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3748 $sig->send;
3498 } 3749 }
3499 3750
3500 $NOW = Event::time; 3751 $LOAD = ($NOW - $TICK_START) / $TICK;
3501
3502 # if we are delayed by four ticks or more, skip them all
3503 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3504
3505 $TICK_WATCHER->at ($NEXT_TICK);
3506 $TICK_WATCHER->start;
3507
3508 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3752 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3753
3511 _post_tick; 3754 if (0) {
3512 3755 if ($NEXT_TICK) {
3513 3756 my $jitter = $TICK_START - $NEXT_TICK;
3757 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3758 warn "jitter $JITTER\n";#d#
3759 }
3514 }, 3760 }
3515); 3761}
3516 3762
3517{ 3763{
3518 BDB::max_poll_time $TICK * 0.1; 3764 # configure BDB
3519 $BDB_POLL_WATCHER = Event->io ( 3765
3520 reentrant => 0,
3521 fd => BDB::poll_fileno,
3522 poll => 'r',
3523 prio => 0,
3524 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb,
3526 );
3527 BDB::min_parallel 8; 3766 BDB::min_parallel 8;
3528 3767 BDB::max_poll_reqs $TICK * 0.1;
3529 BDB::set_sync_prepare { 3768 $Coro::BDB::WATCHER->priority (1);
3530 my $status;
3531 my $current = $Coro::current;
3532 (
3533 sub {
3534 $status = $!;
3535 $current->ready; undef $current;
3536 },
3537 sub {
3538 Coro::schedule while defined $current;
3539 $! = $status;
3540 },
3541 )
3542 };
3543 3769
3544 unless ($DB_ENV) { 3770 unless ($DB_ENV) {
3545 $DB_ENV = BDB::db_env_create; 3771 $DB_ENV = BDB::db_env_create;
3772 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3773 | BDB::LOG_AUTOREMOVE, 1);
3774 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3546 3776
3547 cf::sync_job { 3777 cf::sync_job {
3548 eval { 3778 eval {
3549 BDB::db_env_open 3779 BDB::db_env_open
3550 $DB_ENV, 3780 $DB_ENV,
3552 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3782 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3783 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 3784 0666;
3555 3785
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3786 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3557
3558 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3559 $DB_ENV->set_lk_detect;
3560 }; 3787 };
3561 3788
3562 cf::cleanup "db_env_open(db): $@" if $@; 3789 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 3790 };
3564 } 3791 }
3792
3793 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3794 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3795 };
3796 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3797 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3798 };
3799 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3800 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3801 };
3565} 3802}
3566 3803
3567{ 3804{
3805 # configure IO::AIO
3806
3568 IO::AIO::min_parallel 8; 3807 IO::AIO::min_parallel 8;
3569
3570 undef $Coro::AIO::WATCHER;
3571 IO::AIO::max_poll_time $TICK * 0.1; 3808 IO::AIO::max_poll_time $TICK * 0.1;
3572 $AIO_POLL_WATCHER = Event->io ( 3809 $Coro::AIO::WATCHER->priority (1);
3573 reentrant => 0,
3574 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno,
3576 poll => 'r',
3577 prio => 6,
3578 cb => \&IO::AIO::poll_cb,
3579 );
3580} 3810}
3581 3811
3582my $_log_backtrace; 3812my $_log_backtrace;
3583 3813
3584sub _log_backtrace { 3814sub _log_backtrace {
3588 3818
3589 # limit the # of concurrent backtraces 3819 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 3820 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 3821 ++$_log_backtrace;
3592 async { 3822 async {
3823 $Coro::current->{desc} = "abt $msg";
3824
3593 my @bt = fork_call { 3825 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 3826 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3827 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3828 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3597 or die "addr2line: $!"; 3829 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines