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.390 by root, Thu Oct 25 09:01:24 2007 UTC vs.
Revision 1.433 by root, Sat May 10 22:38:52 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::EV;
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;
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::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 }
… …
1289 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1291 1360
1292 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1362 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1364 }
1297 1365
1298 warn $msg; 1366 warn $msg;
1299 } 1367 }
1300 1368
… …
1389 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1458 or return;
1391 1459
1392 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1393 or return; 1461 or return;
1462
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1397 } 1466 }
1398 } 1467 }
… …
1408 1477
1409 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1410 1479
1411 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1413 1484
1414 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1486 cf::cede_to_tick;
1416} 1487}
1417 1488
… …
1453 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1454 $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
1455 1526
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1460 1533
1461 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1501 1574
1502 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1503 my $path = path $login; 1576 my $path = path $login;
1504 1577
1505 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1584 }
1511 1585
… …
1548 1622
1549Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1550 1624
1551=cut 1625=cut
1552 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
1553sub expand_cfpod { 1638sub expand_cfpod {
1554 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1555 1640
1556 # escape & and < 1641 my $xml;
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559 1642
1560 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1561 1646
1562 1 while 1647 $group =~ s/&/&amp;/g;
1563 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1564 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1565 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1566 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1652 ([BCGHITU])
1568 # replace G<male|female> tags 1653 <
1569 || s{G<([^>|]*)\|([^>]*)>}{ 1654 (?:
1570 $self->gender ? $2 : $1 1655 ([^<>]*) (?{ $group = $^N })
1571 }ge 1656 | < $interior >
1572 # replace H<hint text> 1657 )
1573 || s{H<([^\>]*)>} 1658 >
1659 %gcsx
1574 { 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") {
1575 ("<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>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "") 1680 "")
1578 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1579 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1580 1692
1693 for ($xml) {
1581 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1583 1696
1584 # compress some whitespace 1697 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1589 1703
1590 $_ 1704 $xml
1591} 1705}
1706
1707no re 'eval';
1592 1708
1593sub hintmode { 1709sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode} 1711 $_[0]{hintmode}
1596} 1712}
… …
1668our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1670 1786
1671sub generate_random_map { 1787sub generate_random_map {
1672 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
1673 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1793 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1799 1918
1800# the temporary/swap location 1919# the temporary/swap location
1801sub save_path { 1920sub save_path {
1802 my ($self) = @_; 1921 my ($self) = @_;
1803 1922
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1806} 1925}
1807 1926
1808# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1809sub uniq_path { 1928sub uniq_path {
1810 my ($self) = @_; 1929 my ($self) = @_;
1811 1930
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1814} 1933}
1815 1934
1816# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1817# all maps in C++... 1936# all maps in C++...
… …
1915 2034
1916 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1918 2037
1919 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 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";
1922 2041
1923 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1924 or return; 2043 or return;
1925 2044
1926 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
1929 or return; 2048 or return;
1930 2049
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1934 undef $guard1; 2054 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2055 $map->reset;
1937 return find $path; 2056 return find $path;
1938 } 2057 }
1939 2058
1940 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2003 } 2122 }
2004 2123
2005 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2007 2126
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2128 }
2010 2129
2011 $self->post_load; 2130 $self->post_load;
2012} 2131}
2013 2132
… …
2071 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2072 2191
2073 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2074 2193
2075 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2196 }
2078 2197
2079 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2080 2199
2081 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2118 cf::async { 2237 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2121 }; 2240 };
2122 2241
2242 cf::get_slot 0.02;
2243
2123 if ($uniq) { 2244 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2247 } else {
2127 $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);
… …
2135 $self->save; 2256 $self->save;
2136 2257
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2259
2139 return if $self->players; 2260 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2141 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2142 2263
2143 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2144 2265
2145 $self->deactivate; 2266 $self->deactivate;
… …
2263 2384
2264sub unique_maps() { 2385sub unique_maps() {
2265 [ 2386 [
2266 map { 2387 map {
2267 utf8::decode $_; 2388 utf8::decode $_;
2268 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2269 ? normalise $_ 2392 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2394 ]
2273} 2395}
2274 2396
2275package cf;
2276
2277=back 2397=back
2278 2398
2279=head3 cf::object 2399=head3 cf::object
2280 2400
2281=cut 2401=cut
… …
2284 2404
2285=over 4 2405=over 4
2286 2406
2287=item $ob->inv_recursive 2407=item $ob->inv_recursive
2288 2408
2289Returns 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.
2290 2411
2291=cut 2412=cut
2292 2413
2293sub inv_recursive_; 2414sub inv_recursive_;
2294sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2299 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2300} 2421}
2301 2422
2302=item $ref = $ob->ref 2423=item $ref = $ob->ref
2303 2424
2304creates 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.
2305 2426
2306=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2307 2428
2308returns 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,
2309even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2341can 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
2342dialogue with the given NPC character. 2463dialogue with the given NPC character.
2343 2464
2344=cut 2465=cut
2345 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
2346# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2482# with dialog boxes.
2348#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
2349sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2361 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2362 $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));
2363 2498
2364 } else { 2499 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2502 }
2368 } 2503 }
2369} 2504}
2370 2505
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2566} 2701}
2567 2702
2568sub prepare_random_map { 2703sub prepare_random_map {
2569 my ($exit) = @_; 2704 my ($exit) = @_;
2570 2705
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2708 # that depends on the exit object
2576 2709
2577 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
… …
2579 if ($exit->map) { 2712 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2584 } 2719 }
2585 2720
2586 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2587 2722
2588 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2591 2726
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2729 undef $fh;
2595 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2596 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2599 } 2738 }
2600} 2739}
2601 2740
2602sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2604 2743
2605 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2606 2745
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2746 $self->enter_link;
2619 2747
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2748 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2626 2750
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2629 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2630 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2631 1; 2772 1
2632 }) { 2773 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2634 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2807the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2808the message unless the client supports the msg packet.
2668 2809
2669=cut 2810=cut
2670 2811
2812# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2813our %CHANNEL = (
2672 "c/identify" => { 2814 "c/identify" => {
2673 id => "infobox", 2815 id => "infobox",
2674 title => "Identify", 2816 title => "Identify",
2675 reply => undef, 2817 reply => undef,
… …
2707 }, 2849 },
2708 "c/uptime" => { 2850 "c/uptime" => {
2709 id => "infobox", 2851 id => "infobox",
2710 title => "Uptime", 2852 title => "Uptime",
2711 reply => undef, 2853 reply => undef,
2712 tooltip => "How long the server has been running sicne last restart", 2854 tooltip => "How long the server has been running since last restart",
2713 }, 2855 },
2714 "c/mapinfo" => { 2856 "c/mapinfo" => {
2715 id => "infobox", 2857 id => "infobox",
2716 title => "Map Info", 2858 title => "Map Info",
2717 reply => undef, 2859 reply => undef,
2718 tooltip => "Information related to the maps", 2860 tooltip => "Information related to the maps",
2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2719 }, 2867 },
2720); 2868);
2721 2869
2722sub cf::client::send_msg { 2870sub cf::client::send_msg {
2723 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
… …
2961 3109
2962The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
2963 3111
2964 cf::object 3112 cf::object
2965 contr pay_amount pay_player map x y force_find force_add destroy 3113 contr pay_amount pay_player map x y force_find force_add destroy
2966 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
2967 3115
2968 cf::object::player 3116 cf::object::player
2969 player 3117 player
2970 3118
2971 cf::player 3119 cf::player
… …
2976 3124
2977=cut 3125=cut
2978 3126
2979for ( 3127for (
2980 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2981 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
2982 decrease_ob_nr destroy)], 3130 decrease split destroy)],
2983 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
2984 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
2985 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
2986) { 3134) {
2987 no strict 'refs'; 3135 no strict 'refs';
… …
3092 { 3240 {
3093 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
3094 3242
3095 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
3096 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
3097 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
3098 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
3099 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3100 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3101 3250
3102 cf::cede_to_tick; 3251 cf::cede_to_tick;
3103 } 3252 }
3104 3253
3105 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
3106 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
3107 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
3108 or next; 3258 or next;
3259
3109 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3110 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
3111 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3112 } else { 3263 } else {
3113 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3131 { 3282 {
3132 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
3133 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
3134 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
3135 3286
3136 my $soundconf = delete $res->{"res/sound.conf"};
3137
3138 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
3139 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3140 my $data; 3290 my $data;
3141 3291
3142 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3143 # prepend meta info 3293 # prepend meta info
3144 3294
3145 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3146 name => $name, 3296 name => $name,
3147 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3148 }); 3298 });
3149 3299
3150 $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
3151 } else { 3307 } else {
3152 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3153 } 3309 }
3154 3310
3155 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3156 cf::face::set_type $idx, $info->{type};
3157
3158 cf::cede_to_tick; 3311 cf::cede_to_tick;
3159 } 3312 }
3160
3161 if ($soundconf) {
3162 $soundconf = $enc->decode (delete $soundconf->{data});
3163
3164 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3165 my $sound = $soundconf->{compat}[$_]
3166 or next;
3167
3168 my $face = cf::face::find "sound/$sound->[1]";
3169 cf::sound::set $sound->[0] => $face;
3170 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3171 }
3172
3173 while (my ($k, $v) = each %{$soundconf->{event}}) {
3174 my $face = cf::face::find "sound/$v";
3175 cf::sound::set $k => $face;
3176 }
3177 }
3178 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3179 3316
3180 1 3317 1
3181} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3182 3339
3183register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3184 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3185 3342
3186 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3187 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3188 } 3345 }
3189}; 3346};
3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3190 3357
3191sub reload_regions { 3358sub reload_regions {
3192 # HACK to clear player env face cache, we need some signal framework 3359 # HACK to clear player env face cache, we need some signal framework
3193 # for this (global event?) 3360 # for this (global event?)
3194 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3208} 3375}
3209 3376
3210sub reload_archetypes { 3377sub reload_archetypes {
3211 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3212 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3213 #d# NEED to laod twice to resolve forward references
3214 # this really needs to be done in an extra post-pass
3215 # (which needs to be synchronous, so solve it differently)
3216 load_resource_file "$DATADIR/archetypes"
3217 or die "unable to load archetypes\n";
3218} 3380}
3219 3381
3220sub reload_treasures { 3382sub reload_treasures {
3221 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3222 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3223} 3385}
3224 3386
3225sub reload_resources { 3387sub reload_resources {
3226 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3227 3389
3390 reload_facedata;
3391 reload_archetypes;
3228 reload_regions; 3392 reload_regions;
3229 reload_facedata;
3230 #reload_archetypes;#d#
3231 reload_archetypes;
3232 reload_treasures; 3393 reload_treasures;
3233 3394
3234 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3235} 3396}
3236 3397
3237sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3238 reload_resources; 3401 reload_resources;
3239} 3402}
3240 3403
3241sub reload_config { 3404sub reload_config {
3242 open my $fh, "<:utf8", "$CONFDIR/config" 3405 open my $fh, "<:utf8", "$CONFDIR/config"
3243 or return; 3406 or return;
3244 3407
3245 local $/; 3408 local $/;
3246 *CFG = YAML::Syck::Load <$fh>; 3409 *CFG = YAML::Load <$fh>;
3247 3410
3248 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3411 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3249 3412
3250 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3413 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3251 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3414 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3263 # we must not ever block the main coroutine 3426 # we must not ever block the main coroutine
3264 local $Coro::idle = sub { 3427 local $Coro::idle = sub {
3265 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3428 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3266 (async { 3429 (async {
3267 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3430 $Coro::current->{desc} = "IDLE BUG HANDLER";
3268 Event::one_event; 3431 EV::loop EV::LOOP_ONESHOT;
3269 })->prio (Coro::PRIO_MAX); 3432 })->prio (Coro::PRIO_MAX);
3270 }; 3433 };
3271 3434
3435 {
3436 my $guard = freeze_mainloop;
3272 reload_config; 3437 reload_config;
3273 db_init; 3438 db_init;
3274 load_extensions; 3439 load_extensions;
3275 3440
3276 $TICK_WATCHER->start; 3441 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3442 evthread_start IO::AIO::poll_fileno;
3443 }
3444
3277 Event::loop; 3445 EV::loop;
3278} 3446}
3279 3447
3280############################################################################# 3448#############################################################################
3281# initialisation and cleanup 3449# initialisation and cleanup
3282 3450
3283# install some emergency cleanup handlers 3451# install some emergency cleanup handlers
3284BEGIN { 3452BEGIN {
3453 our %SIGWATCHER = ();
3285 for my $signal (qw(INT HUP TERM)) { 3454 for my $signal (qw(INT HUP TERM)) {
3286 Event->signal ( 3455 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 signal => $signal,
3290 prio => 0,
3291 cb => sub {
3292 cf::cleanup "SIG$signal"; 3456 cf::cleanup "SIG$signal";
3293 },
3294 ); 3457 };
3295 } 3458 }
3296} 3459}
3297 3460
3298sub write_runtime { 3461sub write_runtime_sync {
3299 my $runtime = "$LOCALDIR/runtime"; 3462 my $runtime = "$LOCALDIR/runtime";
3300 3463
3301 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
3302 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
3303 3466
… …
3329 and return; 3492 and return;
3330 3493
3331 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
3332 3495
3333 1 3496 1
3497}
3498
3499our $uuid_lock;
3500our $uuid_skip;
3501
3502sub write_uuid_sync($) {
3503 $uuid_skip ||= $_[0];
3504
3505 return if $uuid_lock;
3506 local $uuid_lock = 1;
3507
3508 my $uuid = "$LOCALDIR/uuid";
3509
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return;
3512
3513 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3514 $uuid_skip = 0;
3515
3516 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3517 and return;
3518
3519 # always fsync - this file is important
3520 aio_fsync $fh
3521 and return;
3522
3523 close $fh
3524 or return;
3525
3526 aio_rename "$uuid~", $uuid
3527 and return;
3528
3529 warn "uuid file written ($value).\n";
3530
3531 1
3532
3533}
3534
3535sub write_uuid($$) {
3536 my ($skip, $sync) = @_;
3537
3538 $sync ? write_uuid_sync $skip
3539 : async { write_uuid_sync $skip };
3334} 3540}
3335 3541
3336sub emergency_save() { 3542sub emergency_save() {
3337 my $freeze_guard = cf::freeze_mainloop; 3543 my $freeze_guard = cf::freeze_mainloop;
3338 3544
… …
3360 warn "end emergency map save\n"; 3566 warn "end emergency map save\n";
3361 3567
3362 warn "begin emergency database checkpoint\n"; 3568 warn "begin emergency database checkpoint\n";
3363 BDB::db_env_txn_checkpoint $DB_ENV; 3569 BDB::db_env_txn_checkpoint $DB_ENV;
3364 warn "end emergency database checkpoint\n"; 3570 warn "end emergency database checkpoint\n";
3571
3572 warn "begin write uuid\n";
3573 write_uuid_sync 1;
3574 warn "end write uuid\n";
3365 }; 3575 };
3366 3576
3367 warn "leave emergency perl save\n"; 3577 warn "leave emergency perl save\n";
3368} 3578}
3369 3579
… …
3384 warn "reloading..."; 3594 warn "reloading...";
3385 3595
3386 warn "entering sync_job"; 3596 warn "entering sync_job";
3387 3597
3388 cf::sync_job { 3598 cf::sync_job {
3389 cf::write_runtime; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
3390 cf::emergency_save; 3600 cf::emergency_save;
3391 cf::write_runtime; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
3392 3602
3393 warn "syncing database to disk"; 3603 warn "syncing database to disk";
3394 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3395 3605
3396 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
3397
3398 warn "cancelling all WF_AUTOCANCEL watchers";
3399 for (Event::all_watchers) {
3400 $_->cancel if $_->data & WF_AUTOCANCEL;
3401 }
3402 3607
3403 warn "flushing outstanding aio requests"; 3608 warn "flushing outstanding aio requests";
3404 for (;;) { 3609 for (;;) {
3405 BDB::flush; 3610 BDB::flush;
3406 IO::AIO::flush; 3611 IO::AIO::flush;
… …
3488 warn "leaving sync_job"; 3693 warn "leaving sync_job";
3489 3694
3490 1 3695 1
3491 } or do { 3696 } or do {
3492 warn $@; 3697 warn $@;
3493 warn "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
3494 exit 1;
3495 }; 3699 };
3496 3700
3497 warn "reloaded"; 3701 warn "reloaded";
3498}; 3702};
3499 3703
… …
3501 3705
3502sub reload_perl() { 3706sub reload_perl() {
3503 # doing reload synchronously and two reloads happen back-to-back, 3707 # doing reload synchronously and two reloads happen back-to-back,
3504 # coro crashes during coro_state_free->destroy here. 3708 # coro crashes during coro_state_free->destroy here.
3505 3709
3506 $RELOAD_WATCHER ||= Event->timer ( 3710 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3507 reentrant => 0,
3508 after => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => sub {
3511 do_reload_perl; 3711 do_reload_perl;
3512 undef $RELOAD_WATCHER; 3712 undef $RELOAD_WATCHER;
3513 },
3514 ); 3713 };
3515} 3714}
3516 3715
3517register_command "reload" => sub { 3716register_command "reload" => sub {
3518 my ($who, $arg) = @_; 3717 my ($who, $arg) = @_;
3519 3718
… …
3532 3731
3533our @WAIT_FOR_TICK; 3732our @WAIT_FOR_TICK;
3534our @WAIT_FOR_TICK_BEGIN; 3733our @WAIT_FOR_TICK_BEGIN;
3535 3734
3536sub wait_for_tick { 3735sub wait_for_tick {
3537 return unless $TICK_WATCHER->is_active;
3538 return if $Coro::current == $Coro::main; 3736 return if tick_inhibit || $Coro::current == $Coro::main;
3539 3737
3540 my $signal = new Coro::Signal; 3738 my $signal = new Coro::Signal;
3541 push @WAIT_FOR_TICK, $signal; 3739 push @WAIT_FOR_TICK, $signal;
3542 $signal->wait; 3740 $signal->wait;
3543} 3741}
3544 3742
3545sub wait_for_tick_begin { 3743sub wait_for_tick_begin {
3546 return unless $TICK_WATCHER->is_active;
3547 return if $Coro::current == $Coro::main; 3744 return if tick_inhibit || $Coro::current == $Coro::main;
3548 3745
3549 my $signal = new Coro::Signal; 3746 my $signal = new Coro::Signal;
3550 push @WAIT_FOR_TICK_BEGIN, $signal; 3747 push @WAIT_FOR_TICK_BEGIN, $signal;
3551 $signal->wait; 3748 $signal->wait;
3552} 3749}
3553 3750
3554$TICK_WATCHER = Event->timer ( 3751sub tick {
3555 reentrant => 0,
3556 parked => 1,
3557 prio => 0,
3558 at => $NEXT_TICK || $TICK,
3559 data => WF_AUTOCANCEL,
3560 cb => sub {
3561 if ($Coro::current != $Coro::main) { 3752 if ($Coro::current != $Coro::main) {
3562 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3753 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3563 unless ++$bug_warning > 10; 3754 unless ++$bug_warning > 10;
3564 return; 3755 return;
3565 } 3756 }
3566 3757
3567 $NOW = $tick_start = Event::time;
3568
3569 cf::server_tick; # one server iteration 3758 cf::server_tick; # one server iteration
3570 3759
3571 $RUNTIME += $TICK;
3572 $NEXT_TICK += $TICK;
3573
3574 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3760 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3575 $NEXT_RUNTIME_WRITE = $NOW + 10; 3761 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3576 Coro::async_pool { 3762 Coro::async_pool {
3577 $Coro::current->{desc} = "runtime saver"; 3763 $Coro::current->{desc} = "runtime saver";
3578 write_runtime 3764 write_runtime_sync
3579 or warn "ERROR: unable to write runtime file: $!"; 3765 or warn "ERROR: unable to write runtime file: $!";
3580 };
3581 } 3766 };
3767 }
3582 3768
3583 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3769 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3584 $sig->send; 3770 $sig->send;
3585 } 3771 }
3586 while (my $sig = shift @WAIT_FOR_TICK) { 3772 while (my $sig = shift @WAIT_FOR_TICK) {
3587 $sig->send; 3773 $sig->send;
3588 } 3774 }
3589 3775
3590 $NOW = Event::time; 3776 $LOAD = ($NOW - $TICK_START) / $TICK;
3591
3592 # if we are delayed by four ticks or more, skip them all
3593 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3594
3595 $TICK_WATCHER->at ($NEXT_TICK);
3596 $TICK_WATCHER->start;
3597
3598 $LOAD = ($NOW - $tick_start) / $TICK;
3599 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3777 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3600 3778
3601 _post_tick; 3779 if (0) {
3780 if ($NEXT_TICK) {
3781 my $jitter = $TICK_START - $NEXT_TICK;
3782 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3783 warn "jitter $JITTER\n";#d#
3784 }
3602 }, 3785 }
3603); 3786}
3604 3787
3605{ 3788{
3789 # configure BDB
3790
3606 BDB::min_parallel 8; 3791 BDB::min_parallel 8;
3607 BDB::max_poll_time $TICK * 0.1; 3792 BDB::max_poll_reqs $TICK * 0.1;
3608 $BDB_POLL_WATCHER = Event->io ( 3793 $AnyEvent::BDB::WATCHER->priority (1);
3609 reentrant => 0,
3610 fd => BDB::poll_fileno,
3611 poll => 'r',
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => \&BDB::poll_cb,
3615 );
3616
3617 BDB::set_sync_prepare {
3618 my $status;
3619 my $current = $Coro::current;
3620 (
3621 sub {
3622 $status = $!;
3623 $current->ready; undef $current;
3624 },
3625 sub {
3626 Coro::schedule while defined $current;
3627 $! = $status;
3628 },
3629 )
3630 };
3631 3794
3632 unless ($DB_ENV) { 3795 unless ($DB_ENV) {
3633 $DB_ENV = BDB::db_env_create; 3796 $DB_ENV = BDB::db_env_create;
3634 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3797 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3635 | BDB::LOG_AUTOREMOVE, 1); 3798 | BDB::LOG_AUTOREMOVE, 1);
… …
3650 3813
3651 cf::cleanup "db_env_open(db): $@" if $@; 3814 cf::cleanup "db_env_open(db): $@" if $@;
3652 }; 3815 };
3653 } 3816 }
3654 3817
3655 $BDB_DEADLOCK_WATCHER = Event->timer ( 3818 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3656 after => 3,
3657 interval => 1,
3658 hard => 1,
3659 prio => 0,
3660 data => WF_AUTOCANCEL,
3661 cb => sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3819 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 },
3664 ); 3820 };
3665 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3821 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3666 after => 11,
3667 interval => 60,
3668 hard => 1,
3669 prio => 0,
3670 data => WF_AUTOCANCEL,
3671 cb => sub {
3672 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3822 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3673 },
3674 ); 3823 };
3675 $BDB_TRICKLE_WATCHER = Event->timer ( 3824 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3676 after => 5,
3677 interval => 10,
3678 hard => 1,
3679 prio => 0,
3680 data => WF_AUTOCANCEL,
3681 cb => sub {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3825 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 },
3684 ); 3826 };
3685} 3827}
3686 3828
3687{ 3829{
3830 # configure IO::AIO
3831
3688 IO::AIO::min_parallel 8; 3832 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3833 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = Event->io ( 3834 $AnyEvent::AIO::WATCHER->priority (1);
3693 reentrant => 0,
3694 data => WF_AUTOCANCEL,
3695 fd => IO::AIO::poll_fileno,
3696 poll => 'r',
3697 prio => 0,
3698 cb => \&IO::AIO::poll_cb,
3699 );
3700} 3835}
3701 3836
3702my $_log_backtrace; 3837my $_log_backtrace;
3703 3838
3704sub _log_backtrace { 3839sub _log_backtrace {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines