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.431 by elmex, Sun May 4 19:27:27 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Event; 30use EV 3.2;
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 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.51 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 101our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
… …
89 105
90our %CFG; 106our %CFG;
91 107
92our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 109our $RUNTIME;
110our $NOW;
94 111
95our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
98 115
99# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
… …
162 180
163The raw value load value from the last tick. 181The raw value load value from the last tick.
164 182
165=item %cf::CFG 183=item %cf::CFG
166 184
167Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 186from wherever your confdir points to.
169 187
170=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
171 189
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 248)) {
216 no strict 'refs'; 249 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 251}
219 252
220$Event::DIED = sub { 253$EV::DIED = sub {
221 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
222}; 255};
223 256
224############################################################################# 257#############################################################################
225 258
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 282 $d
250 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
251} 284}
252 285
253=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
254 287
255Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
256 289
257=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
258 291
259Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
260 293
261=cut 294=cut
262 295
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 297
265sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
267 300
268=item cf::lock_wait $string 301=item cf::lock_wait $string
269 302
270Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
271 304
… …
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 368}
336 }; 369
337 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
338 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
339} 383}
340 384
341=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
342 386
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
383 } 427 }
384 } 428 }
385}; 429};
386 430
387sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
388 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
389 435
390 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
392 438
… …
406 452
407BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
408 454
409=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
410 456
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 458is 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 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 460acceptable.
415 461
416If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
… …
422 468
423sub sync_job(&) { 469sub sync_job(&) {
424 my ($job) = @_; 470 my ($job) = @_;
425 471
426 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 473 my $time = EV::time;
428 474
429 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
431 477
432 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
433 479
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
437 481
438 my $busy = 1; 482 my $busy = 1;
439 my @res; 483 my @res;
440 484
… …
447 491
448 while ($busy) { 492 while ($busy) {
449 if (Coro::nready) { 493 if (Coro::nready) {
450 Coro::cede_notself; 494 Coro::cede_notself;
451 } else { 495 } else {
452 Event::one_event; 496 EV::loop EV::LOOP_ONESHOT;
453 } 497 }
454 } 498 }
455 499
456 $time = Event::time - $time; 500 my $time = EV::time - $time;
457 501
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 502 $TICK_START += $time; # do not account sync jobs to server load
462 503
463 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
464 } else { 505 } else {
465 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
466 507
… …
491=item fork_call { }, $args 532=item fork_call { }, $args
492 533
493Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
497 538
498=cut 539=cut
499 540
500sub fork_call(&@) { 541sub fork_call(&@) {
501 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
… …
508 reset_signals; 549 reset_signals;
509 &$cb 550 &$cb
510 }, @args; 551 }, @args;
511 552
512 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
554}
555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
513} 581}
514 582
515=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
516 584
517Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
662attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
664 732
665In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 735Deliantra).
668 736
669=over 4 737=over 4
670 738
671=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
672 740
… …
954 } 1022 }
955 1023
956 0 1024 0
957} 1025}
958 1026
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1028
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1030
963Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
964 1032
… …
1042cf::attachable->attach ( 1110cf::attachable->attach (
1043 prio => -1000000, 1111 prio => -1000000,
1044 on_instantiate => sub { 1112 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1046 1114
1047 $data = from_json $data; 1115 $data = decode_json $data;
1048 1116
1049 for (@$data) { 1117 for (@$data) {
1050 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1051 1119
1052 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
… …
1073 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1076 1144
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1149 aio_close $fh;
1082 1150
1083 if (@$objs) { 1151 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1157 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1159 }
1092 } else { 1160 } else {
1093 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1094 } 1162 }
… …
1289 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1291 1359
1292 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1361 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1363 }
1297 1364
1298 warn $msg; 1365 warn $msg;
1299 } 1366 }
1300 1367
… …
1389 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1457 or return;
1391 1458
1392 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1393 or return; 1460 or return;
1461
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1397 } 1465 }
1398 } 1466 }
… …
1408 1476
1409 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1410 1478
1411 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1413 1483
1414 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1485 cf::cede_to_tick;
1416} 1486}
1417 1487
… …
1501 1571
1502 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1503 my $path = path $login; 1573 my $path = path $login;
1504 1574
1505 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1581 }
1511 1582
… …
1548 1619
1549Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1550 1621
1551=cut 1622=cut
1552 1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1553sub expand_cfpod { 1635sub expand_cfpod {
1554 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1555 1637
1556 # escape & and < 1638 my $xml;
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559 1639
1560 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1561 1643
1562 1 while 1644 $group =~ s/&/&amp;/g;
1563 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1564 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1565 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1566 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1649 ([BCGHITU])
1568 # replace G<male|female> tags 1650 <
1569 || s{G<([^>|]*)\|([^>]*)>}{ 1651 (?:
1570 $self->gender ? $2 : $1 1652 ([^<>]*) (?{ $group = $^N })
1571 }ge 1653 | < $interior >
1572 # replace H<hint text> 1654 )
1573 || s{H<([^\>]*)>} 1655 >
1656 %gcsx
1574 { 1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "") 1677 "")
1578 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1579 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1580 1689
1690 for ($xml) {
1581 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1583 1693
1584 # compress some whitespace 1694 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1589 1700
1590 $_ 1701 $xml
1591} 1702}
1703
1704no re 'eval';
1592 1705
1593sub hintmode { 1706sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode} 1708 $_[0]{hintmode}
1596} 1709}
… …
1668our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1670 1783
1671sub generate_random_map { 1784sub generate_random_map {
1672 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1673 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1790 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1799 1915
1800# the temporary/swap location 1916# the temporary/swap location
1801sub save_path { 1917sub save_path {
1802 my ($self) = @_; 1918 my ($self) = @_;
1803 1919
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1806} 1922}
1807 1923
1808# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1809sub uniq_path { 1925sub uniq_path {
1810 my ($self) = @_; 1926 my ($self) = @_;
1811 1927
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1814} 1930}
1815 1931
1816# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1817# all maps in C++... 1933# all maps in C++...
… …
1915 2031
1916 cf::lock_wait "map_data:$path";#d#remove 2032 cf::lock_wait "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1918 2034
1919 $cf::MAP{$path} || do { 2035 $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 2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
1922 2038
1923 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1924 or return; 2040 or return;
1925 2041
1926 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
… …
1929 or return; 2045 or return;
1930 2046
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1934 undef $guard1; 2051 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2052 $map->reset;
1937 return find $path; 2053 return find $path;
1938 } 2054 }
1939 2055
1940 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
… …
2003 } 2119 }
2004 2120
2005 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
2007 2123
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2125 }
2010 2126
2011 $self->post_load; 2127 $self->post_load;
2012} 2128}
2013 2129
… …
2071 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2072 2188
2073 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2074 2190
2075 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2193 }
2078 2194
2079 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2080 2196
2081 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
… …
2118 cf::async { 2234 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2121 }; 2237 };
2122 2238
2239 cf::get_slot 0.02;
2240
2123 if ($uniq) { 2241 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2244 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2135 $self->save; 2253 $self->save;
2136 2254
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2256
2139 return if $self->players; 2257 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2141 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2142 2260
2143 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2144 2262
2145 $self->deactivate; 2263 $self->deactivate;
… …
2263 2381
2264sub unique_maps() { 2382sub unique_maps() {
2265 [ 2383 [
2266 map { 2384 map {
2267 utf8::decode $_; 2385 utf8::decode $_;
2268 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2269 ? normalise $_ 2389 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2391 ]
2273} 2392}
2274 2393
2275package cf;
2276
2277=back 2394=back
2278 2395
2279=head3 cf::object 2396=head3 cf::object
2280 2397
2281=cut 2398=cut
… …
2284 2401
2285=over 4 2402=over 4
2286 2403
2287=item $ob->inv_recursive 2404=item $ob->inv_recursive
2288 2405
2289Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2290 2408
2291=cut 2409=cut
2292 2410
2293sub inv_recursive_; 2411sub inv_recursive_;
2294sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2299 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2300} 2418}
2301 2419
2302=item $ref = $ob->ref 2420=item $ref = $ob->ref
2303 2421
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2305 2423
2306=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2307 2425
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2427even if the object actually exists. May block.
… …
2341can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2460dialogue with the given NPC character.
2343 2461
2344=cut 2462=cut
2345 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2346# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2479# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
… …
2361 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2495
2364 } else { 2496 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2499 }
2368 } 2500 }
2369} 2501}
2370 2502
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2566} 2698}
2567 2699
2568sub prepare_random_map { 2700sub prepare_random_map {
2569 my ($exit) = @_; 2701 my ($exit) = @_;
2570 2702
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2703 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2704 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2705 # that depends on the exit object
2576 2706
2577 my $rmp = parse_random_map_params $exit->msg; 2707 my $rmp = parse_random_map_params $exit->msg;
… …
2579 if ($exit->map) { 2709 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2710 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2711 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2712 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2713 $rmp->{origin_y} = $exit->y;
2714
2715 $exit->map->touch;
2584 } 2716 }
2585 2717
2586 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2587 2719
2588 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2591 2723
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2726 undef $fh;
2595 aio_rename "$meta~", $meta; 2727 aio_rename "$meta~", $meta;
2596 2728
2729 my $slaying = "?random/$md5";
2730
2731 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2732 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2733 $exit->msg (undef);
2734 }
2599 } 2735 }
2600} 2736}
2601 2737
2602sub cf::object::player::enter_exit { 2738sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2739 my ($self, $exit) = @_;
2604 2740
2605 return unless $self->type == cf::PLAYER; 2741 return unless $self->type == cf::PLAYER;
2606 2742
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; 2743 $self->enter_link;
2619 2744
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 { 2745 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2746 $Coro::current->{desc} = "enter_exit";
2626 2747
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2748 unless (eval {
2749 $self->deactivate_recursive; # just to be sure
2750
2751 # random map handling
2752 {
2753 my $guard = cf::lock_acquire "exit_prepare:$exit";
2754
2755 prepare_random_map $exit
2756 if $exit->slaying eq "/!";
2757 }
2758
2759 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2760 my $x = $exit->stats->hp;
2761 my $y = $exit->stats->sp;
2762
2629 $self->goto ($slaying, $hp, $sp); 2763 $self->goto ($map, $x, $y);
2630 2764
2765 # if exit is damned, update players death & WoR home-position
2766 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED);
2768
2631 1; 2769 1
2632 }) { 2770 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2771 $self->message ("Something went wrong deep within the crossfire server. "
2634 . "I'll try to bring you back to the map you were before. " 2772 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2773 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2774 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2804the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2805the message unless the client supports the msg packet.
2668 2806
2669=cut 2807=cut
2670 2808
2809# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2810our %CHANNEL = (
2672 "c/identify" => { 2811 "c/identify" => {
2673 id => "infobox", 2812 id => "infobox",
2674 title => "Identify", 2813 title => "Identify",
2675 reply => undef, 2814 reply => undef,
… …
2707 }, 2846 },
2708 "c/uptime" => { 2847 "c/uptime" => {
2709 id => "infobox", 2848 id => "infobox",
2710 title => "Uptime", 2849 title => "Uptime",
2711 reply => undef, 2850 reply => undef,
2712 tooltip => "How long the server has been running sicne last restart", 2851 tooltip => "How long the server has been running since last restart",
2713 }, 2852 },
2714 "c/mapinfo" => { 2853 "c/mapinfo" => {
2715 id => "infobox", 2854 id => "infobox",
2716 title => "Map Info", 2855 title => "Map Info",
2717 reply => undef, 2856 reply => undef,
2718 tooltip => "Information related to the maps", 2857 tooltip => "Information related to the maps",
2858 },
2859 "c/party" => {
2860 id => "party",
2861 title => "Party",
2862 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party",
2719 }, 2864 },
2720); 2865);
2721 2866
2722sub cf::client::send_msg { 2867sub cf::client::send_msg {
2723 my ($self, $channel, $msg, $color, @extra) = @_; 2868 my ($self, $channel, $msg, $color, @extra) = @_;
… …
2961 3106
2962The following functions and methods are available within a safe environment: 3107The following functions and methods are available within a safe environment:
2963 3108
2964 cf::object 3109 cf::object
2965 contr pay_amount pay_player map x y force_find force_add destroy 3110 contr pay_amount pay_player map x y force_find force_add destroy
2966 insert remove name archname title slaying race decrease_ob_nr 3111 insert remove name archname title slaying race decrease split
2967 3112
2968 cf::object::player 3113 cf::object::player
2969 player 3114 player
2970 3115
2971 cf::player 3116 cf::player
… …
2976 3121
2977=cut 3122=cut
2978 3123
2979for ( 3124for (
2980 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2981 insert remove inv name archname title slaying race 3126 insert remove inv nrof name archname title slaying race
2982 decrease_ob_nr destroy)], 3127 decrease split destroy)],
2983 ["cf::object::player" => qw(player)], 3128 ["cf::object::player" => qw(player)],
2984 ["cf::player" => qw(peaceful)], 3129 ["cf::player" => qw(peaceful)],
2985 ["cf::map" => qw(trigger)], 3130 ["cf::map" => qw(trigger)],
2986) { 3131) {
2987 no strict 'refs'; 3132 no strict 'refs';
… …
3092 { 3237 {
3093 my $faces = $facedata->{faceinfo}; 3238 my $faces = $facedata->{faceinfo};
3094 3239
3095 while (my ($face, $info) = each %$faces) { 3240 while (my ($face, $info) = each %$faces) {
3096 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3241 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242
3097 cf::face::set_visibility $idx, $info->{visibility}; 3243 cf::face::set_visibility $idx, $info->{visibility};
3098 cf::face::set_magicmap $idx, $info->{magicmap}; 3244 cf::face::set_magicmap $idx, $info->{magicmap};
3099 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3245 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}; 3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3101 3247
3102 cf::cede_to_tick; 3248 cf::cede_to_tick;
3103 } 3249 }
3104 3250
3105 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
3106 next unless $info->{smooth}; 3252 next unless $info->{smooth};
3253
3107 my $idx = cf::face::find $face 3254 my $idx = cf::face::find $face
3108 or next; 3255 or next;
3256
3109 if (my $smooth = cf::face::find $info->{smooth}) { 3257 if (my $smooth = cf::face::find $info->{smooth}) {
3110 cf::face::set_smooth $idx, $smooth; 3258 cf::face::set_smooth $idx, $smooth;
3111 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3259 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3112 } else { 3260 } else {
3113 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3261 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3131 { 3279 {
3132 # TODO: for gcfclient pleasure, we should give resources 3280 # TODO: for gcfclient pleasure, we should give resources
3133 # that gcfclient doesn't grok a >10000 face index. 3281 # that gcfclient doesn't grok a >10000 face index.
3134 my $res = $facedata->{resource}; 3282 my $res = $facedata->{resource};
3135 3283
3136 my $soundconf = delete $res->{"res/sound.conf"};
3137
3138 while (my ($name, $info) = each %$res) { 3284 while (my ($name, $info) = each %$res) {
3285 if (defined $info->{type}) {
3139 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3286 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3140 my $data; 3287 my $data;
3141 3288
3142 if ($info->{type} & 1) { 3289 if ($info->{type} & 1) {
3143 # prepend meta info 3290 # prepend meta info
3144 3291
3145 my $meta = $enc->encode ({ 3292 my $meta = $enc->encode ({
3146 name => $name, 3293 name => $name,
3147 %{ $info->{meta} || {} }, 3294 %{ $info->{meta} || {} },
3148 }); 3295 });
3149 3296
3150 $data = pack "(w/a*)*", $meta, $info->{data}; 3297 $data = pack "(w/a*)*", $meta, $info->{data};
3298 } else {
3299 $data = $info->{data};
3300 }
3301
3302 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3303 cf::face::set_type $idx, $info->{type};
3151 } else { 3304 } else {
3152 $data = $info->{data}; 3305 $RESOURCE{$name} = $info;
3153 } 3306 }
3154 3307
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; 3308 cf::cede_to_tick;
3159 } 3309 }
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 } 3310 }
3311
3312 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3179 3313
3180 1 3314 1
3181} 3315}
3316
3317cf::global->attach (on_resource_update => sub {
3318 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3319 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3320
3321 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3322 my $sound = $soundconf->{compat}[$_]
3323 or next;
3324
3325 my $face = cf::face::find "sound/$sound->[1]";
3326 cf::sound::set $sound->[0] => $face;
3327 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3328 }
3329
3330 while (my ($k, $v) = each %{$soundconf->{event}}) {
3331 my $face = cf::face::find "sound/$v";
3332 cf::sound::set $k => $face;
3333 }
3334 }
3335});
3182 3336
3183register_exticmd fx_want => sub { 3337register_exticmd fx_want => sub {
3184 my ($ns, $want) = @_; 3338 my ($ns, $want) = @_;
3185 3339
3186 while (my ($k, $v) = each %$want) { 3340 while (my ($k, $v) = each %$want) {
3187 $ns->fx_want ($k, $v); 3341 $ns->fx_want ($k, $v);
3188 } 3342 }
3189}; 3343};
3344
3345sub load_resource_file($) {
3346 my $guard = lock_acquire "load_resource_file";
3347
3348 my $status = load_resource_file_ $_[0];
3349 get_slot 0.1, 100;
3350 cf::arch::commit_load;
3351
3352 $status
3353}
3190 3354
3191sub reload_regions { 3355sub reload_regions {
3192 # HACK to clear player env face cache, we need some signal framework 3356 # HACK to clear player env face cache, we need some signal framework
3193 # for this (global event?) 3357 # for this (global event?)
3194 %ext::player_env::MUSIC_FACE_CACHE = (); 3358 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3208} 3372}
3209 3373
3210sub reload_archetypes { 3374sub reload_archetypes {
3211 load_resource_file "$DATADIR/archetypes" 3375 load_resource_file "$DATADIR/archetypes"
3212 or die "unable to load archetypes\n"; 3376 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} 3377}
3219 3378
3220sub reload_treasures { 3379sub reload_treasures {
3221 load_resource_file "$DATADIR/treasures" 3380 load_resource_file "$DATADIR/treasures"
3222 or die "unable to load treasurelists\n"; 3381 or die "unable to load treasurelists\n";
3223} 3382}
3224 3383
3225sub reload_resources { 3384sub reload_resources {
3226 warn "reloading resource files...\n"; 3385 warn "reloading resource files...\n";
3227 3386
3387 reload_facedata;
3388 reload_archetypes;
3228 reload_regions; 3389 reload_regions;
3229 reload_facedata;
3230 #reload_archetypes;#d#
3231 reload_archetypes;
3232 reload_treasures; 3390 reload_treasures;
3233 3391
3234 warn "finished reloading resource files\n"; 3392 warn "finished reloading resource files\n";
3235} 3393}
3236 3394
3237sub init { 3395sub init {
3396 my $guard = freeze_mainloop;
3397
3238 reload_resources; 3398 reload_resources;
3239} 3399}
3240 3400
3241sub reload_config { 3401sub reload_config {
3242 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3243 or return; 3403 or return;
3244 3404
3245 local $/; 3405 local $/;
3246 *CFG = YAML::Syck::Load <$fh>; 3406 *CFG = YAML::Load <$fh>;
3247 3407
3248 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3249 3409
3250 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $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}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3263 # we must not ever block the main coroutine 3423 # we must not ever block the main coroutine
3264 local $Coro::idle = sub { 3424 local $Coro::idle = sub {
3265 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3266 (async { 3426 (async {
3267 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3427 $Coro::current->{desc} = "IDLE BUG HANDLER";
3268 Event::one_event; 3428 EV::loop EV::LOOP_ONESHOT;
3269 })->prio (Coro::PRIO_MAX); 3429 })->prio (Coro::PRIO_MAX);
3270 }; 3430 };
3271 3431
3432 {
3433 my $guard = freeze_mainloop;
3272 reload_config; 3434 reload_config;
3273 db_init; 3435 db_init;
3274 load_extensions; 3436 load_extensions;
3275 3437
3276 $TICK_WATCHER->start; 3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3439 evthread_start IO::AIO::poll_fileno;
3440 }
3441
3277 Event::loop; 3442 EV::loop;
3278} 3443}
3279 3444
3280############################################################################# 3445#############################################################################
3281# initialisation and cleanup 3446# initialisation and cleanup
3282 3447
3283# install some emergency cleanup handlers 3448# install some emergency cleanup handlers
3284BEGIN { 3449BEGIN {
3450 our %SIGWATCHER = ();
3285 for my $signal (qw(INT HUP TERM)) { 3451 for my $signal (qw(INT HUP TERM)) {
3286 Event->signal ( 3452 $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"; 3453 cf::cleanup "SIG$signal";
3293 },
3294 ); 3454 };
3295 } 3455 }
3296} 3456}
3297 3457
3298sub write_runtime { 3458sub write_runtime_sync {
3299 my $runtime = "$LOCALDIR/runtime"; 3459 my $runtime = "$LOCALDIR/runtime";
3300 3460
3301 # first touch the runtime file to show we are still running: 3461 # first touch the runtime file to show we are still running:
3302 # the fsync below can take a very very long time. 3462 # the fsync below can take a very very long time.
3303 3463
… …
3329 and return; 3489 and return;
3330 3490
3331 warn "runtime file written.\n"; 3491 warn "runtime file written.\n";
3332 3492
3333 1 3493 1
3494}
3495
3496our $uuid_lock;
3497our $uuid_skip;
3498
3499sub write_uuid_sync($) {
3500 $uuid_skip ||= $_[0];
3501
3502 return if $uuid_lock;
3503 local $uuid_lock = 1;
3504
3505 my $uuid = "$LOCALDIR/uuid";
3506
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return;
3509
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3511 $uuid_skip = 0;
3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return;
3515
3516 # always fsync - this file is important
3517 aio_fsync $fh
3518 and return;
3519
3520 close $fh
3521 or return;
3522
3523 aio_rename "$uuid~", $uuid
3524 and return;
3525
3526 warn "uuid file written ($value).\n";
3527
3528 1
3529
3530}
3531
3532sub write_uuid($$) {
3533 my ($skip, $sync) = @_;
3534
3535 $sync ? write_uuid_sync $skip
3536 : async { write_uuid_sync $skip };
3334} 3537}
3335 3538
3336sub emergency_save() { 3539sub emergency_save() {
3337 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3338 3541
… …
3360 warn "end emergency map save\n"; 3563 warn "end emergency map save\n";
3361 3564
3362 warn "begin emergency database checkpoint\n"; 3565 warn "begin emergency database checkpoint\n";
3363 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3364 warn "end emergency database checkpoint\n"; 3567 warn "end emergency database checkpoint\n";
3568
3569 warn "begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "end write uuid\n";
3365 }; 3572 };
3366 3573
3367 warn "leave emergency perl save\n"; 3574 warn "leave emergency perl save\n";
3368} 3575}
3369 3576
… …
3384 warn "reloading..."; 3591 warn "reloading...";
3385 3592
3386 warn "entering sync_job"; 3593 warn "entering sync_job";
3387 3594
3388 cf::sync_job { 3595 cf::sync_job {
3389 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3390 cf::emergency_save; 3597 cf::emergency_save;
3391 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3392 3599
3393 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3394 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3395 3602
3396 # if anything goes wrong in here, we should simply crash as we already saved 3603 # 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 3604
3403 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
3404 for (;;) { 3606 for (;;) {
3405 BDB::flush; 3607 BDB::flush;
3406 IO::AIO::flush; 3608 IO::AIO::flush;
… …
3488 warn "leaving sync_job"; 3690 warn "leaving sync_job";
3489 3691
3490 1 3692 1
3491 } or do { 3693 } or do {
3492 warn $@; 3694 warn $@;
3493 warn "error while reloading, exiting."; 3695 cf::cleanup "error while reloading, exiting.";
3494 exit 1;
3495 }; 3696 };
3496 3697
3497 warn "reloaded"; 3698 warn "reloaded";
3498}; 3699};
3499 3700
… …
3501 3702
3502sub reload_perl() { 3703sub reload_perl() {
3503 # doing reload synchronously and two reloads happen back-to-back, 3704 # doing reload synchronously and two reloads happen back-to-back,
3504 # coro crashes during coro_state_free->destroy here. 3705 # coro crashes during coro_state_free->destroy here.
3505 3706
3506 $RELOAD_WATCHER ||= Event->timer ( 3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3507 reentrant => 0,
3508 after => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => sub {
3511 do_reload_perl; 3708 do_reload_perl;
3512 undef $RELOAD_WATCHER; 3709 undef $RELOAD_WATCHER;
3513 },
3514 ); 3710 };
3515} 3711}
3516 3712
3517register_command "reload" => sub { 3713register_command "reload" => sub {
3518 my ($who, $arg) = @_; 3714 my ($who, $arg) = @_;
3519 3715
… …
3532 3728
3533our @WAIT_FOR_TICK; 3729our @WAIT_FOR_TICK;
3534our @WAIT_FOR_TICK_BEGIN; 3730our @WAIT_FOR_TICK_BEGIN;
3535 3731
3536sub wait_for_tick { 3732sub wait_for_tick {
3537 return unless $TICK_WATCHER->is_active;
3538 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3539 3734
3540 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3541 push @WAIT_FOR_TICK, $signal; 3736 push @WAIT_FOR_TICK, $signal;
3542 $signal->wait; 3737 $signal->wait;
3543} 3738}
3544 3739
3545sub wait_for_tick_begin { 3740sub wait_for_tick_begin {
3546 return unless $TICK_WATCHER->is_active;
3547 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3548 3742
3549 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3550 push @WAIT_FOR_TICK_BEGIN, $signal; 3744 push @WAIT_FOR_TICK_BEGIN, $signal;
3551 $signal->wait; 3745 $signal->wait;
3552} 3746}
3553 3747
3554$TICK_WATCHER = Event->timer ( 3748sub 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) { 3749 if ($Coro::current != $Coro::main) {
3562 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3750 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3563 unless ++$bug_warning > 10; 3751 unless ++$bug_warning > 10;
3564 return; 3752 return;
3565 } 3753 }
3566 3754
3567 $NOW = $tick_start = Event::time;
3568
3569 cf::server_tick; # one server iteration 3755 cf::server_tick; # one server iteration
3570 3756
3571 $RUNTIME += $TICK;
3572 $NEXT_TICK += $TICK;
3573
3574 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3757 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3575 $NEXT_RUNTIME_WRITE = $NOW + 10; 3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3576 Coro::async_pool { 3759 Coro::async_pool {
3577 $Coro::current->{desc} = "runtime saver"; 3760 $Coro::current->{desc} = "runtime saver";
3578 write_runtime 3761 write_runtime_sync
3579 or warn "ERROR: unable to write runtime file: $!"; 3762 or warn "ERROR: unable to write runtime file: $!";
3580 };
3581 } 3763 };
3764 }
3582 3765
3583 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3584 $sig->send; 3767 $sig->send;
3585 } 3768 }
3586 while (my $sig = shift @WAIT_FOR_TICK) { 3769 while (my $sig = shift @WAIT_FOR_TICK) {
3587 $sig->send; 3770 $sig->send;
3588 } 3771 }
3589 3772
3590 $NOW = Event::time; 3773 $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; 3774 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3600 3775
3601 _post_tick; 3776 if (0) {
3777 if ($NEXT_TICK) {
3778 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d#
3781 }
3602 }, 3782 }
3603); 3783}
3604 3784
3605{ 3785{
3786 # configure BDB
3787
3606 BDB::min_parallel 8; 3788 BDB::min_parallel 8;
3607 BDB::max_poll_time $TICK * 0.1; 3789 BDB::max_poll_reqs $TICK * 0.1;
3608 $BDB_POLL_WATCHER = Event->io ( 3790 $Coro::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 3791
3632 unless ($DB_ENV) { 3792 unless ($DB_ENV) {
3633 $DB_ENV = BDB::db_env_create; 3793 $DB_ENV = BDB::db_env_create;
3634 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3635 | BDB::LOG_AUTOREMOVE, 1); 3795 | BDB::LOG_AUTOREMOVE, 1);
… …
3650 3810
3651 cf::cleanup "db_env_open(db): $@" if $@; 3811 cf::cleanup "db_env_open(db): $@" if $@;
3652 }; 3812 };
3653 } 3813 }
3654 3814
3655 $BDB_DEADLOCK_WATCHER = Event->timer ( 3815 $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 { }; 3816 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 },
3664 ); 3817 };
3665 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3818 $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 { }; 3819 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3673 },
3674 ); 3820 };
3675 $BDB_TRICKLE_WATCHER = Event->timer ( 3821 $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 { }; 3822 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 },
3684 ); 3823 };
3685} 3824}
3686 3825
3687{ 3826{
3827 # configure IO::AIO
3828
3688 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = Event->io ( 3831 $Coro::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} 3832}
3701 3833
3702my $_log_backtrace; 3834my $_log_backtrace;
3703 3835
3704sub _log_backtrace { 3836sub _log_backtrace {

Diff Legend

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