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.387 by root, Mon Oct 15 23:49:10 2007 UTC vs.
Revision 1.439 by root, Mon Jul 14 16:42:49 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 Event; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.1 (); 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.51 (); 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>:
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, 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
447 492
448 while ($busy) { 493 while ($busy) {
449 if (Coro::nready) { 494 if (Coro::nready) {
450 Coro::cede_notself; 495 Coro::cede_notself;
451 } else { 496 } else {
452 Event::one_event; 497 EV::loop EV::LOOP_ONESHOT;
453 } 498 }
454 } 499 }
455 500
456 $time = Event::time - $time; 501 my $time = EV::time - $time;
457 502
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
462 504
463 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
464 } else { 506 } else {
465 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
466 508
491=item fork_call { }, $args 533=item fork_call { }, $args
492 534
493Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
497 539
498=cut 540=cut
499 541
500sub fork_call(&@) { 542sub fork_call(&@) {
501 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
508 reset_signals; 550 reset_signals;
509 &$cb 551 &$cb
510 }, @args; 552 }, @args;
511 553
512 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
513} 582}
514 583
515=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
516 585
517Returns a single value from the environment database. 586Returns a single value from the environment database.
662attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
664 733
665In 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>
666C<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
667Crossfire TRT). 736Deliantra).
668 737
669=over 4 738=over 4
670 739
671=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
672 741
954 } 1023 }
955 1024
956 0 1025 0
957} 1026}
958 1027
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1029
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1031
963Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
964 1033
1042cf::attachable->attach ( 1111cf::attachable->attach (
1043 prio => -1000000, 1112 prio => -1000000,
1044 on_instantiate => sub { 1113 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
1046 1115
1047 $data = from_json $data; 1116 $data = decode_json $data;
1048 1117
1049 for (@$data) { 1118 for (@$data) {
1050 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
1051 1120
1052 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1076 1145
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1150 aio_close $fh;
1082 1151
1083 if (@$objs) { 1152 if (@$objs) {
1084 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) {
1085 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1158 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1160 }
1092 } else { 1161 } else {
1093 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1094 } 1163 }
1122 1191
1123 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1124 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1125 or return; 1194 or return;
1126 1195
1127 my $st = eval { Coro::Storable::thaw $av } 1196 my $st = eval { Coro::Storable::thaw $av };
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs}; 1197 $av = $st->{objs};
1130 } 1198 }
1131 1199
1132 utf8::decode (my $decname = $filename); 1200 utf8::decode (my $decname = $filename);
1133 warn sprintf "loading %s (%d,%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1290 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1291 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1292 1360
1293 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1294 warn $msg; 1362 warn $msg;
1295 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1296 exit 1;
1297 } 1364 }
1298 1365
1299 warn $msg; 1366 warn $msg;
1300 } 1367 }
1301 1368
1390 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1391 or return; 1458 or return;
1392 1459
1393 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1394 or return; 1461 or return;
1462
1395 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1397 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1398 } 1466 }
1399 } 1467 }
1409 1477
1410 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1411 1479
1412 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1413 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1414 1484
1415 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1416 cf::cede_to_tick; 1486 cf::cede_to_tick;
1417} 1487}
1418 1488
1454 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1455 $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
1456 1526
1457 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1458 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1459 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1460 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1461 1533
1462 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1463 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1502 1574
1503 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1504 my $path = path $login; 1576 my $path = path $login;
1505 1577
1506 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1509 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1510 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 } 1584 }
1512 1585
1549 1622
1550Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1551 1624
1552=cut 1625=cut
1553 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
1554sub expand_cfpod { 1638sub expand_cfpod {
1555 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1556 1640
1557 # escape & and < 1641 my $xml;
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560 1642
1561 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1562 1646
1563 1 while 1647 $group =~ s/&/&amp;/g;
1564 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1565 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1566 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1567 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1652 ([BCGHITU])
1569 # replace G<male|female> tags 1653 <
1570 || s{G<([^>|]*)\|([^>]*)>}{ 1654 (?:
1571 $self->gender ? $2 : $1 1655 ([^<>]*) (?{ $group = $^N })
1572 }ge 1656 | < $interior >
1573 # replace H<hint text> 1657 )
1574 || s{H<([^\>]*)>} 1658 >
1659 %gcsx
1575 { 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") {
1576 ("<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>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "") 1680 "")
1579 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1580 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1581 1692
1693 for ($xml) {
1582 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1584 1696
1585 # compress some whitespace 1697 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1590 1703
1591 $_ 1704 $xml
1592} 1705}
1706
1707no re 'eval';
1593 1708
1594sub hintmode { 1709sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode} 1711 $_[0]{hintmode}
1597} 1712}
1669our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1670our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1671 1786
1672sub generate_random_map { 1787sub generate_random_map {
1673 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
1674 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1675 $self->_create_random_map ( 1793 $self->_create_random_map (
1676 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1677 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1678 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1800 1918
1801# the temporary/swap location 1919# the temporary/swap location
1802sub save_path { 1920sub save_path {
1803 my ($self) = @_; 1921 my ($self) = @_;
1804 1922
1805 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1806 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1807} 1925}
1808 1926
1809# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1810sub uniq_path { 1928sub uniq_path {
1811 my ($self) = @_; 1929 my ($self) = @_;
1812 1930
1813 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1814 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1815} 1933}
1816 1934
1817# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1818# all maps in C++... 1936# all maps in C++...
1916 2034
1917 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1918 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1919 2037
1920 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 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";
1923 2041
1924 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1925 or return; 2043 or return;
1926 2044
1927 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1930 or return; 2048 or return;
1931 2049
1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1933 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1934 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1935 undef $guard1; 2054 undef $guard1;
1936 undef $guard2;
1937 $map->reset; 2055 $map->reset;
1938 return find $path; 2056 return find $path;
1939 } 2057 }
1940 2058
1941 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1968 my $f = new_from_file cf::object::thawer $self->{load_path}; 2086 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block; 2087 $f->skip_block;
1970 $self->_load_objects ($f) 2088 $self->_load_objects ($f)
1971 or return; 2089 or return;
1972 2090
1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
1974 if delete $self->{load_original}; 2092 if delete $self->{load_original};
1975 2093
1976 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
1977 utf8::encode $uniq; 2095 utf8::encode $uniq;
1978 unless (aio_stat $uniq) { 2096 unless (aio_stat $uniq) {
2004 } 2122 }
2005 2123
2006 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2008 2126
2009 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2010 } 2128 }
2011 2129
2012 $self->post_load; 2130 $self->post_load;
2013} 2131}
2014 2132
2072 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2073 2191
2074 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2075 2193
2076 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2078 } 2196 }
2079 2197
2080 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2081 2199
2082 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2119 cf::async { 2237 cf::async {
2120 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2121 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2122 }; 2240 };
2123 2241
2242 cf::get_slot 0.02;
2243
2124 if ($uniq) { 2244 if ($uniq) {
2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2126 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2127 } else { 2247 } else {
2128 $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);
2136 $self->save; 2256 $self->save;
2137 2257
2138 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139 2259
2140 return if $self->players; 2260 return if $self->players;
2141 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2142 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2143 2263
2144 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2145 2265
2146 $self->deactivate; 2266 $self->deactivate;
2264 2384
2265sub unique_maps() { 2385sub unique_maps() {
2266 [ 2386 [
2267 map { 2387 map {
2268 utf8::decode $_; 2388 utf8::decode $_;
2269 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2270 ? normalise $_ 2392 : normalise $_
2271 : ()
2272 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2273 ] 2394 ]
2274} 2395}
2275 2396
2276package cf;
2277
2278=back 2397=back
2279 2398
2280=head3 cf::object 2399=head3 cf::object
2281 2400
2282=cut 2401=cut
2285 2404
2286=over 4 2405=over 4
2287 2406
2288=item $ob->inv_recursive 2407=item $ob->inv_recursive
2289 2408
2290Returns 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.
2291 2411
2292=cut 2412=cut
2293 2413
2294sub inv_recursive_; 2414sub inv_recursive_;
2295sub inv_recursive_ { 2415sub inv_recursive_ {
2300 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2301} 2421}
2302 2422
2303=item $ref = $ob->ref 2423=item $ref = $ob->ref
2304 2424
2305creates 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.
2306 2426
2307=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2308 2428
2309returns 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,
2310even if the object actually exists. May block. 2430even if the object actually exists. May block.
2342can 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
2343dialogue with the given NPC character. 2463dialogue with the given NPC character.
2344 2464
2345=cut 2465=cut
2346 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
2347# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2348# with dialog boxes. 2482# with dialog boxes.
2349#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
2350sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2351 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2362 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2363 $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));
2364 2498
2365 } else { 2499 } else {
2366 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2367 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2368 } 2502 }
2369 } 2503 }
2370} 2504}
2371 2505
2372=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2479Moves 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
2480her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2481that 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
2482the 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
2483be 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 >>.
2484 2621
2485=cut 2622=cut
2486 2623
2487our $GOTOGEN; 2624our $GOTOGEN;
2488 2625
2567} 2704}
2568 2705
2569sub prepare_random_map { 2706sub prepare_random_map {
2570 my ($exit) = @_; 2707 my ($exit) = @_;
2571 2708
2572 my $guard = cf::lock_acquire "exit_prepare:$exit";
2573
2574 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2575 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2576 # that depends on the exit object 2711 # that depends on the exit object
2577 2712
2578 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
2580 if ($exit->map) { 2715 if ($exit->map) {
2581 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2582 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2583 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2584 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2585 } 2722 }
2586 2723
2587 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2588 2725
2589 my $data = cf::to_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2590 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2591 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2592 2729
2593 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2594 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2595 undef $fh; 2732 undef $fh;
2596 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2597 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2598 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2599 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2600 } 2741 }
2601} 2742}
2602 2743
2603sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2604 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2605 2746
2606 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2607 2748
2608 if ($exit->slaying eq "/!") {
2609 #TODO: this should de-fi-ni-te-ly not be a sync-job
2610 # the problem is that $exit might not survive long enough
2611 # so it needs to be done right now, right here
2612 cf::sync_job { prepare_random_map $exit };
2613 }
2614
2615 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2616 my $hp = $exit->stats->hp;
2617 my $sp = $exit->stats->sp;
2618
2619 $self->enter_link; 2749 $self->enter_link;
2620 2750
2621 # if exit is damned, update players death & WoR home-position
2622 $self->contr->savebed ($slaying, $hp, $sp)
2623 if $exit->flag (FLAG_DAMNED);
2624
2625 (async { 2751 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2752 $Coro::current->{desc} = "enter_exit";
2627 2753
2628 $self->deactivate_recursive; # just to be sure
2629 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
2630 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2631 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
2632 1; 2775 1
2633 }) { 2776 }) {
2634 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2635 . "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. "
2636 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2637 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
2667the 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
2668the message unless the client supports the msg packet. 2811the message unless the client supports the msg packet.
2669 2812
2670=cut 2813=cut
2671 2814
2815# non-persistent channels (usually the info channel)
2672our %CHANNEL = ( 2816our %CHANNEL = (
2673 "c/identify" => { 2817 "c/identify" => {
2674 id => "infobox", 2818 id => "infobox",
2675 title => "Identify", 2819 title => "Identify",
2676 reply => undef, 2820 reply => undef,
2680 id => "infobox", 2824 id => "infobox",
2681 title => "Examine", 2825 title => "Examine",
2682 reply => undef, 2826 reply => undef,
2683 tooltip => "Signs and other items you examined", 2827 tooltip => "Signs and other items you examined",
2684 }, 2828 },
2829 "c/book" => {
2830 id => "infobox",
2831 title => "Book",
2832 reply => undef,
2833 tooltip => "The contents of a note or book",
2834 },
2685 "c/lookat" => { 2835 "c/lookat" => {
2686 id => "infobox", 2836 id => "infobox",
2687 title => "Look", 2837 title => "Look",
2688 reply => undef, 2838 reply => undef,
2689 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",
2690 }, 2870 },
2691); 2871);
2692 2872
2693sub cf::client::send_msg { 2873sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2932 3112
2933The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
2934 3114
2935 cf::object 3115 cf::object
2936 contr pay_amount pay_player map x y force_find force_add destroy 3116 contr pay_amount pay_player map x y force_find force_add destroy
2937 insert remove name archname title slaying race decrease_ob_nr 3117 insert remove name archname title slaying race decrease split
2938 3118
2939 cf::object::player 3119 cf::object::player
2940 player 3120 player
2941 3121
2942 cf::player 3122 cf::player
2947 3127
2948=cut 3128=cut
2949 3129
2950for ( 3130for (
2951 ["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
2952 insert remove inv name archname title slaying race 3132 insert remove inv nrof name archname title slaying race
2953 decrease_ob_nr destroy)], 3133 decrease split destroy change_exp)],
2954 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
2955 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
2956 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
2957) { 3137) {
2958 no strict 'refs'; 3138 no strict 'refs';
3063 { 3243 {
3064 my $faces = $facedata->{faceinfo}; 3244 my $faces = $facedata->{faceinfo};
3065 3245
3066 while (my ($face, $info) = each %$faces) { 3246 while (my ($face, $info) = each %$faces) {
3067 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3247 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248
3068 cf::face::set_visibility $idx, $info->{visibility}; 3249 cf::face::set_visibility $idx, $info->{visibility};
3069 cf::face::set_magicmap $idx, $info->{magicmap}; 3250 cf::face::set_magicmap $idx, $info->{magicmap};
3070 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};
3071 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};
3072 3253
3073 cf::cede_to_tick; 3254 cf::cede_to_tick;
3074 } 3255 }
3075 3256
3076 while (my ($face, $info) = each %$faces) { 3257 while (my ($face, $info) = each %$faces) {
3077 next unless $info->{smooth}; 3258 next unless $info->{smooth};
3259
3078 my $idx = cf::face::find $face 3260 my $idx = cf::face::find $face
3079 or next; 3261 or next;
3262
3080 if (my $smooth = cf::face::find $info->{smooth}) { 3263 if (my $smooth = cf::face::find $info->{smooth}) {
3081 cf::face::set_smooth $idx, $smooth; 3264 cf::face::set_smooth $idx, $smooth;
3082 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3083 } else { 3266 } else {
3084 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3267 warn "smooth face '$info->{smooth}' not found for face '$face'";
3102 { 3285 {
3103 # TODO: for gcfclient pleasure, we should give resources 3286 # TODO: for gcfclient pleasure, we should give resources
3104 # that gcfclient doesn't grok a >10000 face index. 3287 # that gcfclient doesn't grok a >10000 face index.
3105 my $res = $facedata->{resource}; 3288 my $res = $facedata->{resource};
3106 3289
3107 my $soundconf = delete $res->{"res/sound.conf"};
3108
3109 while (my ($name, $info) = each %$res) { 3290 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) {
3110 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3292 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data; 3293 my $data;
3112 3294
3113 if ($info->{type} & 1) { 3295 if ($info->{type} & 1) {
3114 # prepend meta info 3296 # prepend meta info
3115 3297
3116 my $meta = $enc->encode ({ 3298 my $meta = $enc->encode ({
3117 name => $name, 3299 name => $name,
3118 %{ $info->{meta} || {} }, 3300 %{ $info->{meta} || {} },
3119 }); 3301 });
3120 3302
3121 $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};
3122 } else { 3310 } else {
3123 $data = $info->{data}; 3311 $RESOURCE{$name} = $info;
3124 } 3312 }
3125 3313
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
3129 cf::cede_to_tick; 3314 cf::cede_to_tick;
3130 } 3315 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
3149 } 3316 }
3317
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3150 3319
3151 1 3320 1
3152} 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});
3153 3342
3154register_exticmd fx_want => sub { 3343register_exticmd fx_want => sub {
3155 my ($ns, $want) = @_; 3344 my ($ns, $want) = @_;
3156 3345
3157 while (my ($k, $v) = each %$want) { 3346 while (my ($k, $v) = each %$want) {
3158 $ns->fx_want ($k, $v); 3347 $ns->fx_want ($k, $v);
3159 } 3348 }
3160}; 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}
3161 3360
3162sub reload_regions { 3361sub reload_regions {
3163 # 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
3164 # for this (global event?) 3363 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3179} 3378}
3180 3379
3181sub reload_archetypes { 3380sub reload_archetypes {
3182 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
3183 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
3184 #d# NEED to laod twice to resolve forward references
3185 # this really needs to be done in an extra post-pass
3186 # (which needs to be synchronous, so solve it differently)
3187 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n";
3189} 3383}
3190 3384
3191sub reload_treasures { 3385sub reload_treasures {
3192 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
3193 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
3194} 3388}
3195 3389
3196sub reload_resources { 3390sub reload_resources {
3197 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
3198 3392
3393 reload_facedata;
3394 reload_archetypes;
3199 reload_regions; 3395 reload_regions;
3200 reload_facedata;
3201 #reload_archetypes;#d#
3202 reload_archetypes;
3203 reload_treasures; 3396 reload_treasures;
3204 3397
3205 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
3206} 3399}
3207 3400
3208sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3209 reload_resources; 3406 reload_resources;
3210} 3407}
3211 3408
3212sub reload_config { 3409sub reload_config {
3213 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
3214 or return; 3411 or return;
3215 3412
3216 local $/; 3413 local $/;
3217 *CFG = YAML::Syck::Load <$fh>; 3414 *CFG = YAML::Load <$fh>;
3218 3415
3219 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3220 3417
3221 $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};
3222 $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};
3234 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3235 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3236 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#
3237 (async { 3434 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3239 Event::one_event; 3436 EV::loop EV::LOOP_ONESHOT;
3240 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3241 }; 3438 };
3242 3439
3440 {
3441 my $guard = freeze_mainloop;
3243 reload_config; 3442 reload_config;
3244 db_init; 3443 db_init;
3245 load_extensions; 3444 load_extensions;
3246 3445
3247 $TICK_WATCHER->start; 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 }
3448
3248 Event::loop; 3449 EV::loop;
3249} 3450}
3250 3451
3251############################################################################# 3452#############################################################################
3252# initialisation and cleanup 3453# initialisation and cleanup
3253 3454
3254# install some emergency cleanup handlers 3455# install some emergency cleanup handlers
3255BEGIN { 3456BEGIN {
3457 our %SIGWATCHER = ();
3256 for my $signal (qw(INT HUP TERM)) { 3458 for my $signal (qw(INT HUP TERM)) {
3257 Event->signal ( 3459 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3258 reentrant => 0,
3259 data => WF_AUTOCANCEL,
3260 signal => $signal,
3261 prio => 0,
3262 cb => sub {
3263 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
3264 },
3265 ); 3461 };
3266 } 3462 }
3267} 3463}
3268 3464
3269sub write_runtime { 3465sub write_runtime_sync {
3270 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
3271 3467
3272 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3273 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3274 3470
3300 and return; 3496 and return;
3301 3497
3302 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3303 3499
3304 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 };
3305} 3544}
3306 3545
3307sub emergency_save() { 3546sub emergency_save() {
3308 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
3309 3548
3331 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
3332 3571
3333 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
3334 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3335 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";
3336 }; 3579 };
3337 3580
3338 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
3339} 3582}
3340 3583
3355 warn "reloading..."; 3598 warn "reloading...";
3356 3599
3357 warn "entering sync_job"; 3600 warn "entering sync_job";
3358 3601
3359 cf::sync_job { 3602 cf::sync_job {
3360 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
3361 cf::emergency_save; 3604 cf::emergency_save;
3362 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3363 3606
3364 warn "syncing database to disk"; 3607 warn "syncing database to disk";
3365 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
3366 3609
3367 # 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
3368
3369 warn "cancelling all WF_AUTOCANCEL watchers";
3370 for (Event::all_watchers) {
3371 $_->cancel if $_->data & WF_AUTOCANCEL;
3372 }
3373 3611
3374 warn "flushing outstanding aio requests"; 3612 warn "flushing outstanding aio requests";
3375 for (;;) { 3613 for (;;) {
3376 BDB::flush; 3614 BDB::flush;
3377 IO::AIO::flush; 3615 IO::AIO::flush;
3459 warn "leaving sync_job"; 3697 warn "leaving sync_job";
3460 3698
3461 1 3699 1
3462 } or do { 3700 } or do {
3463 warn $@; 3701 warn $@;
3464 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
3465 exit 1;
3466 }; 3703 };
3467 3704
3468 warn "reloaded"; 3705 warn "reloaded";
3469}; 3706};
3470 3707
3472 3709
3473sub reload_perl() { 3710sub reload_perl() {
3474 # doing reload synchronously and two reloads happen back-to-back, 3711 # doing reload synchronously and two reloads happen back-to-back,
3475 # coro crashes during coro_state_free->destroy here. 3712 # coro crashes during coro_state_free->destroy here.
3476 3713
3477 $RELOAD_WATCHER ||= Event->timer ( 3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3478 reentrant => 0,
3479 after => 0,
3480 data => WF_AUTOCANCEL,
3481 cb => sub {
3482 do_reload_perl; 3715 do_reload_perl;
3483 undef $RELOAD_WATCHER; 3716 undef $RELOAD_WATCHER;
3484 },
3485 ); 3717 };
3486} 3718}
3487 3719
3488register_command "reload" => sub { 3720register_command "reload" => sub {
3489 my ($who, $arg) = @_; 3721 my ($who, $arg) = @_;
3490 3722
3503 3735
3504our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3505our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3506 3738
3507sub wait_for_tick { 3739sub wait_for_tick {
3508 return unless $TICK_WATCHER->is_active;
3509 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3510 3741
3511 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3512 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3513 $signal->wait; 3744 $signal->wait;
3514} 3745}
3515 3746
3516sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3517 return unless $TICK_WATCHER->is_active;
3518 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3519 3749
3520 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3521 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3522 $signal->wait; 3752 $signal->wait;
3523} 3753}
3524 3754
3525$TICK_WATCHER = Event->timer ( 3755sub tick {
3526 reentrant => 0,
3527 parked => 1,
3528 prio => 0,
3529 at => $NEXT_TICK || $TICK,
3530 data => WF_AUTOCANCEL,
3531 cb => sub {
3532 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
3533 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"
3534 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
3535 return; 3759 return;
3536 } 3760 }
3537 3761
3538 $NOW = $tick_start = Event::time;
3539
3540 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
3541 3763
3542 $RUNTIME += $TICK;
3543 $NEXT_TICK += $TICK;
3544
3545 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3546 $NEXT_RUNTIME_WRITE = $NOW + 10; 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3547 Coro::async_pool { 3766 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver"; 3767 $Coro::current->{desc} = "runtime saver";
3549 write_runtime 3768 write_runtime_sync
3550 or warn "ERROR: unable to write runtime file: $!"; 3769 or warn "ERROR: unable to write runtime file: $!";
3551 };
3552 } 3770 };
3771 }
3553 3772
3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3555 $sig->send; 3774 $sig->send;
3556 } 3775 }
3557 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
3558 $sig->send; 3777 $sig->send;
3559 } 3778 }
3560 3779
3561 $NOW = Event::time; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
3562
3563 # if we are delayed by four ticks or more, skip them all
3564 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3565
3566 $TICK_WATCHER->at ($NEXT_TICK);
3567 $TICK_WATCHER->start;
3568
3569 $LOAD = ($NOW - $tick_start) / $TICK;
3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3571 3782
3572 _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 }
3573 }, 3789 }
3574); 3790}
3575 3791
3576{ 3792{
3793 # configure BDB
3794
3577 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3578 BDB::max_poll_time $TICK * 0.1; 3796 BDB::max_poll_reqs $TICK * 0.1;
3579 $BDB_POLL_WATCHER = Event->io ( 3797 $AnyEvent::BDB::WATCHER->priority (1);
3580 reentrant => 0,
3581 fd => BDB::poll_fileno,
3582 poll => 'r',
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => \&BDB::poll_cb,
3586 );
3587
3588 BDB::set_sync_prepare {
3589 my $status;
3590 my $current = $Coro::current;
3591 (
3592 sub {
3593 $status = $!;
3594 $current->ready; undef $current;
3595 },
3596 sub {
3597 Coro::schedule while defined $current;
3598 $! = $status;
3599 },
3600 )
3601 };
3602 3798
3603 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3604 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3606 | 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;
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3609 3806
3610 cf::sync_job { 3807 cf::sync_job {
3611 eval { 3808 eval {
3621 3818
3622 cf::cleanup "db_env_open(db): $@" if $@; 3819 cf::cleanup "db_env_open(db): $@" if $@;
3623 }; 3820 };
3624 } 3821 }
3625 3822
3626 $BDB_DEADLOCK_WATCHER = Event->timer ( 3823 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 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 { };
3634 },
3635 ); 3825 };
3636 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3826 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3827 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 ); 3828 };
3646 $BDB_TRICKLE_WATCHER = Event->timer ( 3829 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3830 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 ); 3831 };
3656} 3832}
3657 3833
3658{ 3834{
3835 # configure IO::AIO
3836
3659 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3660
3661 undef $Coro::AIO::WATCHER;
3662 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3663 $AIO_POLL_WATCHER = Event->io ( 3839 undef $AnyEvent::AIO::WATCHER;
3664 reentrant => 0,
3665 data => WF_AUTOCANCEL,
3666 fd => IO::AIO::poll_fileno,
3667 poll => 'r',
3668 prio => 0,
3669 cb => \&IO::AIO::poll_cb,
3670 );
3671} 3840}
3672 3841
3673my $_log_backtrace; 3842my $_log_backtrace;
3674 3843
3675sub _log_backtrace { 3844sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines