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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.437 by root, Tue Jul 8 08:33:27 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB 1.6;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.32 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
36 61
37# configure various modules to our taste 62# configure various modules to our taste
38# 63#
39$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 67
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 69
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 71
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
75 96
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 99our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
83 101
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 105our $DB_ENV;
89 106
90our %CFG; 107our %CFG;
91 108
92our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 110our $RUNTIME;
111our $NOW;
94 112
95our (%PLAYER, %PLAYER_LOADING); # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 114our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
98 116
99# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 119
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
105 124
106binmode STDOUT; 125binmode STDOUT;
107binmode STDERR; 126binmode STDERR;
108 127
109# read virtual server time, if available 128# read virtual server time, if available
162 181
163The raw value load value from the last tick. 182The raw value load value from the last tick.
164 183
165=item %cf::CFG 184=item %cf::CFG
166 185
167Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 187from wherever your confdir points to.
169 188
170=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
171 190
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 213
195 LOG llevError, $msg; 214 LOG llevError, $msg;
196 }; 215 };
197} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
198 232
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
215)) { 249)) {
216 no strict 'refs'; 250 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 252}
219 253
220$Event::DIED = sub { 254$EV::DIED = sub {
221 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
222}; 256};
223 257
224############################################################################# 258#############################################################################
225 259
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 283 $d
250 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
251} 285}
252 286
253=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
254 288
255Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
256 290
257=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
258 292
259Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
260 294
261=cut 295=cut
262 296
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 298
265sub to_json ($) { $json_coder->encode ($_[0]) } 299sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 300sub decode_json($) { $json_coder->decode ($_[0]) }
267 301
268=item cf::lock_wait $string 302=item cf::lock_wait $string
269 303
270Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
271 305
327 361
328 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
329} 363}
330 364
331sub freeze_mainloop { 365sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
333 367
334 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 369}
336 }; 370
337 $TICK_WATCHER->stop; 371=item cf::periodic $interval, $cb
338 $guard 372
373Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer.
375
376=cut
377
378sub periodic($$) {
379 my ($interval, $cb) = @_;
380
381 my $start = rand List::Util::min 180, $interval;
382
383 EV::periodic $start, $interval, 0, $cb
339} 384}
340 385
341=item cf::get_slot $time[, $priority[, $name]] 386=item cf::get_slot $time[, $priority[, $name]]
342 387
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 388Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 418 }
374 } 419 }
375 } 420 }
376 421
377 if (@SLOT_QUEUE) { 422 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 423 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 424 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 425 $signal->wait;
381 } else { 426 } else {
382 Coro::schedule; 427 Coro::schedule;
383 } 428 }
384 } 429 }
385}; 430};
386 431
387sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
388 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
389 436
390 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
392 439
406 453
407BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
408 455
409=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
410 457
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 459is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 461acceptable.
415 462
416If it must be done, put the blocking parts into C<sync_job>. This will run 463If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 464the given BLOCK in another coroutine while waiting for the result. The
422 469
423sub sync_job(&) { 470sub sync_job(&) {
424 my ($job) = @_; 471 my ($job) = @_;
425 472
426 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 474 my $time = EV::time;
428 475
429 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
431 478
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 479 LOG llevError, Carp::longmess "sync job";#d#
433 480
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
437 482
438 my $busy = 1; 483 my $busy = 1;
439 my @res; 484 my @res;
440 485
444 warn $@ if $@; 489 warn $@ if $@;
445 undef $busy; 490 undef $busy;
446 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
447 492
448 while ($busy) { 493 while ($busy) {
449 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
450 } 498 }
499 }
451 500
452 $time = Event::time - $time; 501 my $time = EV::time - $time;
453 502
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
458 504
459 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
460 } else { 506 } else {
461 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
462 508
487=item fork_call { }, $args 533=item fork_call { }, $args
488 534
489Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
493 539
494=cut 540=cut
495 541
496sub fork_call(&@) { 542sub fork_call(&@) {
497 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
504 reset_signals; 550 reset_signals;
505 &$cb 551 &$cb
506 }, @args; 552 }, @args;
507 553
508 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
555}
556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
509} 582}
510 583
511=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
512 585
513Returns a single value from the environment database. 586Returns a single value from the environment database.
658attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
660 733
661In the following description, CLASS can be any of C<global>, C<object> 734In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 735C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 736Deliantra).
664 737
665=over 4 738=over 4
666 739
667=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
668 741
950 } 1023 }
951 1024
952 0 1025 0
953} 1026}
954 1027
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1029
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1031
959Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
960 1033
966 1039
967=cut 1040=cut
968 1041
969############################################################################# 1042#############################################################################
970# object support 1043# object support
971#
972 1044
1045sub _object_equal($$);
1046sub _object_equal($$) {
1047 my ($a, $b) = @_;
1048
1049 return 0 unless (ref $a) eq (ref $b);
1050
1051 if ("HASH" eq ref $a) {
1052 my @ka = keys %$a;
1053 my @kb = keys %$b;
1054
1055 return 0 if @ka != @kb;
1056
1057 for (0 .. $#ka) {
1058 return 0 unless $ka[$_] eq $kb[$_];
1059 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1060 }
1061
1062 } elsif ("ARRAY" eq ref $a) {
1063
1064 return 0 if @$a != @$b;
1065
1066 for (0 .. $#$a) {
1067 return 0 unless _object_equal $a->[$_], $b->[$_];
1068 }
1069
1070 } elsif ($a ne $b) {
1071 return 0;
1072 }
1073
1074 1
1075}
1076
1077our $SLOW_MERGES;#d#
973sub _can_merge { 1078sub _can_merge {
974 my ($ob1, $ob2) = @_; 1079 my ($ob1, $ob2) = @_;
975 1080
976 local $Storable::canonical = 1; 1081 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1082
980 $fob1 eq $fob2 1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
981} 1085}
982 1086
983sub reattach { 1087sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1089 my ($obj) = @_;
1007cf::attachable->attach ( 1111cf::attachable->attach (
1008 prio => -1000000, 1112 prio => -1000000,
1009 on_instantiate => sub { 1113 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
1011 1115
1012 $data = from_json $data; 1116 $data = decode_json $data;
1013 1117
1014 for (@$data) { 1118 for (@$data) {
1015 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
1016 1120
1017 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1038 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1041 1145
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1046 close $fh; 1150 aio_close $fh;
1047 1151
1048 if (@$objs) { 1152 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1051 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1158 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1160 }
1057 } else { 1161 } else {
1058 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1059 } 1163 }
1087 1191
1088 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1194 or return;
1091 1195
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1093 } 1198 }
1094 1199
1095 utf8::decode (my $decname = $filename); 1200 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1253 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1254 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1255 1360
1256 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1257 warn $msg; 1362 warn $msg;
1258 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1259 exit 1;
1260 } 1364 }
1261 1365
1262 warn $msg; 1366 warn $msg;
1263 } 1367 }
1264 1368
1353 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1354 or return; 1458 or return;
1355 1459
1356 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1357 or return; 1461 or return;
1462
1358 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1360 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1361 } 1466 }
1362 } 1467 }
1372 1477
1373 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1374 1479
1375 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1376 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1377 1484
1378 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1379 cf::cede_to_tick; 1486 cf::cede_to_tick;
1380} 1487}
1381 1488
1417 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1418 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1419 1526
1420 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1421 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1422 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1423 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1424 1533
1425 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1426 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1465 1574
1466 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1467 my $path = path $login; 1576 my $path = path $login;
1468 1577
1469 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1472 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1473 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 } 1584 }
1475 1585
1512 1622
1513Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1514 1624
1515=cut 1625=cut
1516 1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1517sub expand_cfpod { 1638sub expand_cfpod {
1518 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1519 1640
1520 # escape & and < 1641 my $xml;
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523 1642
1524 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1525 1646
1526 1 while 1647 $group =~ s/&/&amp;/g;
1527 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1528 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1529 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1530 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1652 ([BCGHITU])
1532 # replace G<male|female> tags 1653 <
1533 || s{G<([^>|]*)\|([^>]*)>}{ 1654 (?:
1534 $self->gender ? $2 : $1 1655 ([^<>]*) (?{ $group = $^N })
1535 }ge 1656 | < $interior >
1536 # replace H<hint text> 1657 )
1537 || s{H<([^\>]*)>} 1658 >
1659 %gcsx
1538 { 1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "") 1680 "")
1542 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1543 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1544 1692
1693 for ($xml) {
1545 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1547 1696
1548 # compress some whitespace 1697 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1553 1703
1554 $_ 1704 $xml
1555} 1705}
1706
1707no re 'eval';
1556 1708
1557sub hintmode { 1709sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode} 1711 $_[0]{hintmode}
1560} 1712}
1632our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1633our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1634 1786
1635sub generate_random_map { 1787sub generate_random_map {
1636 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1637 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1638 $self->_create_random_map ( 1793 $self->_create_random_map (
1639 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1640 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1641 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1763 1918
1764# the temporary/swap location 1919# the temporary/swap location
1765sub save_path { 1920sub save_path {
1766 my ($self) = @_; 1921 my ($self) = @_;
1767 1922
1768 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1769 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1770} 1925}
1771 1926
1772# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1773sub uniq_path { 1928sub uniq_path {
1774 my ($self) = @_; 1929 my ($self) = @_;
1775 1930
1776 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1777 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1778} 1933}
1779 1934
1780# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1781# all maps in C++... 1936# all maps in C++...
1879 2034
1880 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1881 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1882 2037
1883 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
1886 2041
1887 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1888 or return; 2043 or return;
1889 2044
1890 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1893 or return; 2048 or return;
1894 2049
1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1896 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1897 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1898 undef $guard1; 2054 undef $guard1;
1899 undef $guard2;
1900 $map->reset; 2055 $map->reset;
1901 return find $path; 2056 return find $path;
1902 } 2057 }
1903 2058
1904 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1967 } 2122 }
1968 2123
1969 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
1971 2126
1972 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1973 } 2128 }
1974 2129
1975 $self->post_load; 2130 $self->post_load;
1976} 2131}
1977 2132
2035 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2036 2191
2037 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2038 2193
2039 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2041 } 2196 }
2042 2197
2043 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2044 2199
2045 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2082 cf::async { 2237 cf::async {
2083 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2085 }; 2240 };
2086 2241
2242 cf::get_slot 0.02;
2243
2087 if ($uniq) { 2244 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2247 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2099 $self->save; 2256 $self->save;
2100 2257
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2259
2103 return if $self->players; 2260 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2106 2263
2107 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2108 2265
2109 $self->deactivate; 2266 $self->deactivate;
2227 2384
2228sub unique_maps() { 2385sub unique_maps() {
2229 [ 2386 [
2230 map { 2387 map {
2231 utf8::decode $_; 2388 utf8::decode $_;
2232 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2233 ? normalise $_ 2392 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2394 ]
2237} 2395}
2238 2396
2239package cf;
2240
2241=back 2397=back
2242 2398
2243=head3 cf::object 2399=head3 cf::object
2244 2400
2245=cut 2401=cut
2248 2404
2249=over 4 2405=over 4
2250 2406
2251=item $ob->inv_recursive 2407=item $ob->inv_recursive
2252 2408
2253Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2254 2411
2255=cut 2412=cut
2256 2413
2257sub inv_recursive_; 2414sub inv_recursive_;
2258sub inv_recursive_ { 2415sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2264} 2421}
2265 2422
2266=item $ref = $ob->ref 2423=item $ref = $ob->ref
2267 2424
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2269 2426
2270=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2271 2428
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2430even if the object actually exists. May block.
2305can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2306dialogue with the given NPC character. 2463dialogue with the given NPC character.
2307 2464
2308=cut 2465=cut
2309 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2310# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2311# with dialog boxes. 2482# with dialog boxes.
2312#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2313sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2314 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2325 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2326 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2327 2498
2328 } else { 2499 } else {
2329 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2330 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2331 } 2502 }
2332 } 2503 }
2333} 2504}
2334 2505
2335=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2442Moves the player to the given map-path and coordinates by first freezing 2613Moves the player to the given map-path and coordinates by first freezing
2443her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2444that has to return the map if sucecssful, and then unfreezes the player on 2615that has to return the map if sucecssful, and then unfreezes the player on
2445the new (success) or old (failed) map position. In either case, $done will 2616the new (success) or old (failed) map position. In either case, $done will
2446be called at the end of this process. 2617be called at the end of this process.
2618
2619Note that $check will be called with a potentially non-loaded map, so if
2620it needs a loaded map it has to call C<< ->load >>.
2447 2621
2448=cut 2622=cut
2449 2623
2450our $GOTOGEN; 2624our $GOTOGEN;
2451 2625
2530} 2704}
2531 2705
2532sub prepare_random_map { 2706sub prepare_random_map {
2533 my ($exit) = @_; 2707 my ($exit) = @_;
2534 2708
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2711 # that depends on the exit object
2540 2712
2541 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2715 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2548 } 2722 }
2549 2723
2550 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2551 2725
2552 my $data = cf::to_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2555 2729
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2732 undef $fh;
2559 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2560 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2563 } 2741 }
2564} 2742}
2565 2743
2566sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2568 2746
2569 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2570 2748
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2749 $self->enter_link;
2583 2750
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2751 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2752 $Coro::current->{desc} = "enter_exit";
2590 2753
2591 $self->deactivate_recursive; # just to be sure
2592 unless (eval { 2754 unless (eval {
2755 $self->deactivate_recursive; # just to be sure
2756
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2766 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp;
2768
2593 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2594 2770
2771 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED);
2774
2595 1; 2775 1
2596 }) { 2776 }) {
2597 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2598 . "I'll try to bring you back to the map you were before. " 2778 . "I'll try to bring you back to the map you were before. "
2599 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2600 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
2630the message, with C<log> being the default. If C<$color> is negative, suppress 2810the message, with C<log> being the default. If C<$color> is negative, suppress
2631the message unless the client supports the msg packet. 2811the message unless the client supports the msg packet.
2632 2812
2633=cut 2813=cut
2634 2814
2815# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2816our %CHANNEL = (
2636 "c/identify" => { 2817 "c/identify" => {
2637 id => "infobox", 2818 id => "infobox",
2638 title => "Identify", 2819 title => "Identify",
2639 reply => undef, 2820 reply => undef,
2643 id => "infobox", 2824 id => "infobox",
2644 title => "Examine", 2825 title => "Examine",
2645 reply => undef, 2826 reply => undef,
2646 tooltip => "Signs and other items you examined", 2827 tooltip => "Signs and other items you examined",
2647 }, 2828 },
2829 "c/book" => {
2830 id => "infobox",
2831 title => "Book",
2832 reply => undef,
2833 tooltip => "The contents of a note or book",
2834 },
2648 "c/lookat" => { 2835 "c/lookat" => {
2649 id => "infobox", 2836 id => "infobox",
2650 title => "Look", 2837 title => "Look",
2651 reply => undef, 2838 reply => undef,
2652 tooltip => "What you saw there", 2839 tooltip => "What you saw there",
2840 },
2841 "c/who" => {
2842 id => "infobox",
2843 title => "Players",
2844 reply => undef,
2845 tooltip => "Shows players who are currently online",
2846 },
2847 "c/body" => {
2848 id => "infobox",
2849 title => "Body Parts",
2850 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available",
2852 },
2853 "c/uptime" => {
2854 id => "infobox",
2855 title => "Uptime",
2856 reply => undef,
2857 tooltip => "How long the server has been running since last restart",
2858 },
2859 "c/mapinfo" => {
2860 id => "infobox",
2861 title => "Map Info",
2862 reply => undef,
2863 tooltip => "Information related to the maps",
2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2653 }, 2870 },
2654); 2871);
2655 2872
2656sub cf::client::send_msg { 2873sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2894=pod 3111=pod
2895 3112
2896The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
2897 3114
2898 cf::object 3115 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3116 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3117 insert remove name archname title slaying race decrease split
2901 3118
2902 cf::object::player 3119 cf::object::player
2903 player 3120 player
2904 3121
2905 cf::player 3122 cf::player
2910 3127
2911=cut 3128=cut
2912 3129
2913for ( 3130for (
2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race 3132 insert remove inv nrof name archname title slaying race
2916 decrease_ob_nr)], 3133 decrease split destroy)],
2917 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
2919 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
2920) { 3137) {
2921 no strict 'refs'; 3138 no strict 'refs';
3026 { 3243 {
3027 my $faces = $facedata->{faceinfo}; 3244 my $faces = $facedata->{faceinfo};
3028 3245
3029 while (my ($face, $info) = each %$faces) { 3246 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3247 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248
3031 cf::face::set_visibility $idx, $info->{visibility}; 3249 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3250 cf::face::set_magicmap $idx, $info->{magicmap};
3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3035 3253
3036 cf::cede_to_tick; 3254 cf::cede_to_tick;
3037 } 3255 }
3038 3256
3039 while (my ($face, $info) = each %$faces) { 3257 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3258 next unless $info->{smooth};
3259
3041 my $idx = cf::face::find $face 3260 my $idx = cf::face::find $face
3042 or next; 3261 or next;
3262
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3263 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3264 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3266 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3267 warn "smooth face '$info->{smooth}' not found for face '$face'";
3065 { 3285 {
3066 # TODO: for gcfclient pleasure, we should give resources 3286 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index. 3287 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3288 my $res = $facedata->{resource};
3069 3289
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3290 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3292 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data; 3293 my $data;
3075 3294
3076 if ($info->{type} & 1) { 3295 if ($info->{type} & 1) {
3077 # prepend meta info 3296 # prepend meta info
3078 3297
3079 my $meta = $enc->encode ({ 3298 my $meta = $enc->encode ({
3080 name => $name, 3299 name => $name,
3081 %{ $info->{meta} || {} }, 3300 %{ $info->{meta} || {} },
3082 }); 3301 });
3083 3302
3084 $data = pack "(w/a*)*", $meta, $info->{data}; 3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type};
3085 } else { 3310 } else {
3086 $data = $info->{data}; 3311 $RESOURCE{$name} = $info;
3087 } 3312 }
3088 3313
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
3092 cf::cede_to_tick; 3314 cf::cede_to_tick;
3093 } 3315 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
3112 } 3316 }
3317
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3319
3114 1 3320 1
3115} 3321}
3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3116 3342
3117register_exticmd fx_want => sub { 3343register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_; 3344 my ($ns, $want) = @_;
3119 3345
3120 while (my ($k, $v) = each %$want) { 3346 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v); 3347 $ns->fx_want ($k, $v);
3122 } 3348 }
3123}; 3349};
3350
3351sub load_resource_file($) {
3352 my $guard = lock_acquire "load_resource_file";
3353
3354 my $status = load_resource_file_ $_[0];
3355 get_slot 0.1, 100;
3356 cf::arch::commit_load;
3357
3358 $status
3359}
3124 3360
3125sub reload_regions { 3361sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework 3362 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?) 3363 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3142} 3378}
3143 3379
3144sub reload_archetypes { 3380sub reload_archetypes {
3145 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
3146 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
3147 #d# NEED to laod twice to resolve forward references
3148 # this really needs to be done in an extra post-pass
3149 # (which needs to be synchronous, so solve it differently)
3150 load_resource_file "$DATADIR/archetypes"
3151 or die "unable to load archetypes\n";
3152} 3383}
3153 3384
3154sub reload_treasures { 3385sub reload_treasures {
3155 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
3156 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
3157} 3388}
3158 3389
3159sub reload_resources { 3390sub reload_resources {
3160 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
3161 3392
3393 reload_facedata;
3394 reload_archetypes;
3162 reload_regions; 3395 reload_regions;
3163 reload_facedata;
3164 #reload_archetypes;#d#
3165 reload_archetypes;
3166 reload_treasures; 3396 reload_treasures;
3167 3397
3168 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
3169} 3399}
3170 3400
3171sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3172 reload_resources; 3406 reload_resources;
3173} 3407}
3174 3408
3175sub reload_config { 3409sub reload_config {
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3411 or return;
3178 3412
3179 local $/; 3413 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3414 *CFG = YAML::Load <$fh>;
3181 3415
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3183 3417
3184 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3185 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3197 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3200 (async { 3434 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3436 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3204 }; 3438 };
3205 3439
3440 {
3441 my $guard = freeze_mainloop;
3206 reload_config; 3442 reload_config;
3207 db_init; 3443 db_init;
3208 load_extensions; 3444 load_extensions;
3209 3445
3210 $TICK_WATCHER->start; 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 }
3448
3211 Event::loop; 3449 EV::loop;
3212} 3450}
3213 3451
3214############################################################################# 3452#############################################################################
3215# initialisation and cleanup 3453# initialisation and cleanup
3216 3454
3217# install some emergency cleanup handlers 3455# install some emergency cleanup handlers
3218BEGIN { 3456BEGIN {
3457 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3458 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3459 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
3227 },
3228 ); 3461 };
3229 } 3462 }
3230} 3463}
3231 3464
3232sub write_runtime { 3465sub write_runtime_sync {
3233 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
3234 3467
3235 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3236 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3237 3470
3263 and return; 3496 and return;
3264 3497
3265 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3266 3499
3267 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3518 $uuid_skip = 0;
3519
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return;
3522
3523 # always fsync - this file is important
3524 aio_fsync $fh
3525 and return;
3526
3527 close $fh
3528 or return;
3529
3530 aio_rename "$uuid~", $uuid
3531 and return;
3532
3533 warn "uuid file written ($value).\n";
3534
3535 1
3536
3537}
3538
3539sub write_uuid($$) {
3540 my ($skip, $sync) = @_;
3541
3542 $sync ? write_uuid_sync $skip
3543 : async { write_uuid_sync $skip };
3268} 3544}
3269 3545
3270sub emergency_save() { 3546sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
3272 3548
3278 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3555 warn "begin emergency player save\n";
3280 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3558 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3560 $pl->save;
3284 } 3561 }
3285 warn "end emergency player save\n"; 3562 warn "end emergency player save\n";
3286 3563
3287 warn "begin emergency map save\n"; 3564 warn "begin emergency map save\n";
3293 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
3294 3571
3295 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3297 warn "end emergency database checkpoint\n"; 3574 warn "end emergency database checkpoint\n";
3575
3576 warn "begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "end write uuid\n";
3298 }; 3579 };
3299 3580
3300 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
3301} 3582}
3302 3583
3317 warn "reloading..."; 3598 warn "reloading...";
3318 3599
3319 warn "entering sync_job"; 3600 warn "entering sync_job";
3320 3601
3321 cf::sync_job { 3602 cf::sync_job {
3322 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
3323 cf::emergency_save; 3604 cf::emergency_save;
3324 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3325 3606
3326 warn "syncing database to disk"; 3607 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3609
3329 # if anything goes wrong in here, we should simply crash as we already saved 3610 # if anything goes wrong in here, we should simply crash as we already saved
3330
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335 3611
3336 warn "flushing outstanding aio requests"; 3612 warn "flushing outstanding aio requests";
3337 for (;;) { 3613 for (;;) {
3338 BDB::flush; 3614 BDB::flush;
3339 IO::AIO::flush; 3615 IO::AIO::flush;
3340 Coro::cede; 3616 Coro::cede_notself;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3617 last unless IO::AIO::nreqs || BDB::nreqs;
3342 warn "iterate..."; 3618 warn "iterate...";
3343 } 3619 }
3344 3620
3345 ++$RELOAD; 3621 ++$RELOAD;
3421 warn "leaving sync_job"; 3697 warn "leaving sync_job";
3422 3698
3423 1 3699 1
3424 } or do { 3700 } or do {
3425 warn $@; 3701 warn $@;
3426 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
3427 exit 1;
3428 }; 3703 };
3429 3704
3430 warn "reloaded"; 3705 warn "reloaded";
3431}; 3706};
3432 3707
3434 3709
3435sub reload_perl() { 3710sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3711 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3712 # coro crashes during coro_state_free->destroy here.
3438 3713
3439 $RELOAD_WATCHER ||= Event->timer ( 3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3440 reentrant => 0,
3441 after => 0,
3442 data => WF_AUTOCANCEL,
3443 cb => sub {
3444 do_reload_perl; 3715 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3716 undef $RELOAD_WATCHER;
3446 },
3447 ); 3717 };
3448} 3718}
3449 3719
3450register_command "reload" => sub { 3720register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3721 my ($who, $arg) = @_;
3452 3722
3465 3735
3466our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3468 3738
3469sub wait_for_tick { 3739sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active;
3471 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3472 3741
3473 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 3744 $signal->wait;
3476} 3745}
3477 3746
3478sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active;
3480 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3481 3749
3482 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3752 $signal->wait;
3485} 3753}
3486 3754
3487$TICK_WATCHER = Event->timer ( 3755sub tick {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3757 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
3497 return; 3759 return;
3498 } 3760 }
3499 3761
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
3503 3763
3504 $RUNTIME += $TICK;
3505 $NEXT_TICK += $TICK;
3506
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 3766 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3767 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3768 write_runtime_sync
3512 or warn "ERROR: unable to write runtime file: $!"; 3769 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3770 };
3771 }
3515 3772
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3774 $sig->send;
3518 } 3775 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3777 $sig->send;
3521 } 3778 }
3522 3779
3523 $NOW = Event::time; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3782
3534 _post_tick; 3783 if (0) {
3784 if ($NEXT_TICK) {
3785 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d#
3788 }
3535 }, 3789 }
3536); 3790}
3537 3791
3538{ 3792{
3793 # configure BDB
3794
3539 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3540 BDB::max_poll_time $TICK * 0.1; 3796 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 3797 $AnyEvent::BDB::WATCHER->priority (1);
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 3798
3565 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3568 | BDB::LOG_AUTOREMOVE, 1); 3802 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3803 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3571 3806
3572 cf::sync_job { 3807 cf::sync_job {
3573 eval { 3808 eval {
3583 3818
3584 cf::cleanup "db_env_open(db): $@" if $@; 3819 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 3820 };
3586 } 3821 }
3587 3822
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 3823 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3824 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 3825 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3826 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3827 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 3828 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 3829 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3830 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 3831 };
3618} 3832}
3619 3833
3620{ 3834{
3835 # configure IO::AIO
3836
3621 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 3839 undef $AnyEvent::AIO::WATCHER;
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 3840}
3634 3841
3635my $_log_backtrace; 3842my $_log_backtrace;
3636 3843
3637sub _log_backtrace { 3844sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines