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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines