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.392 by root, Fri Oct 26 04:44:54 2007 UTC vs.
Revision 1.429 by root, Sat May 3 15:17:13 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
1553 use re 'eval'; 1624use re 'eval';
1554 1625
1555my $group; 1626my $group;
1556my $interior; $interior = qr{ 1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1557 (?: 1629 (?:
1558 \ (.*?)\ (?{ $group = $^N }) 1630 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) > 1631 | < (??{$interior}) >
1560 ) 1632 )
1561}x; 1633}x;
… …
1627 } 1699 }
1628 1700
1629 $xml 1701 $xml
1630} 1702}
1631 1703
1704no re 'eval';
1705
1632sub hintmode { 1706sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode} 1708 $_[0]{hintmode}
1635} 1709}
1636 1710
… …
1707our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1709 1783
1710sub generate_random_map { 1784sub generate_random_map {
1711 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
1712 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1790 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1838 1915
1839# the temporary/swap location 1916# the temporary/swap location
1840sub save_path { 1917sub save_path {
1841 my ($self) = @_; 1918 my ($self) = @_;
1842 1919
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1845} 1922}
1846 1923
1847# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1848sub uniq_path { 1925sub uniq_path {
1849 my ($self) = @_; 1926 my ($self) = @_;
1850 1927
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1853} 1930}
1854 1931
1855# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1856# all maps in C++... 1933# all maps in C++...
… …
1954 2031
1955 cf::lock_wait "map_data:$path";#d#remove 2032 cf::lock_wait "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1957 2034
1958 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 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";
1961 2038
1962 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1963 or return; 2040 or return;
1964 2041
1965 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
… …
1968 or return; 2045 or return;
1969 2046
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1973 undef $guard1; 2051 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 2052 $map->reset;
1976 return find $path; 2053 return find $path;
1977 } 2054 }
1978 2055
1979 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
… …
2042 } 2119 }
2043 2120
2044 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
2046 2123
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2125 }
2049 2126
2050 $self->post_load; 2127 $self->post_load;
2051} 2128}
2052 2129
… …
2110 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2111 2188
2112 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2113 2190
2114 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2193 }
2117 2194
2118 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2119 2196
2120 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
… …
2157 cf::async { 2234 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2160 }; 2237 };
2161 2238
2239 cf::get_slot 0.02;
2240
2162 if ($uniq) { 2241 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2244 } else {
2166 $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);
… …
2174 $self->save; 2253 $self->save;
2175 2254
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2256
2178 return if $self->players; 2257 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2181 2260
2182 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2183 2262
2184 $self->deactivate; 2263 $self->deactivate;
… …
2302 2381
2303sub unique_maps() { 2382sub unique_maps() {
2304 [ 2383 [
2305 map { 2384 map {
2306 utf8::decode $_; 2385 utf8::decode $_;
2307 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2308 ? normalise $_ 2389 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2391 ]
2312} 2392}
2313 2393
2314package cf;
2315
2316=back 2394=back
2317 2395
2318=head3 cf::object 2396=head3 cf::object
2319 2397
2320=cut 2398=cut
… …
2323 2401
2324=over 4 2402=over 4
2325 2403
2326=item $ob->inv_recursive 2404=item $ob->inv_recursive
2327 2405
2328Returns 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.
2329 2408
2330=cut 2409=cut
2331 2410
2332sub inv_recursive_; 2411sub inv_recursive_;
2333sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2338 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2339} 2418}
2340 2419
2341=item $ref = $ob->ref 2420=item $ref = $ob->ref
2342 2421
2343creates 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.
2344 2423
2345=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2346 2425
2347returns 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,
2348even if the object actually exists. May block. 2427even if the object actually exists. May block.
… …
2380can 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
2381dialogue with the given NPC character. 2460dialogue with the given NPC character.
2382 2461
2383=cut 2462=cut
2384 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
2385# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2479# with dialog boxes.
2387#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
2388sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
… …
2400 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2401 $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));
2402 2495
2403 } else { 2496 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2499 }
2407 } 2500 }
2408} 2501}
2409 2502
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2622 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2623 } 2716 }
2624 2717
2625 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2626 2719
2627 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2630 2723
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
… …
2755 id => "infobox", 2848 id => "infobox",
2756 title => "Map Info", 2849 title => "Map Info",
2757 reply => undef, 2850 reply => undef,
2758 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2759 }, 2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2760); 2859);
2761 2860
2762sub cf::client::send_msg { 2861sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 2862 my ($self, $channel, $msg, $color, @extra) = @_;
2764 2863
… …
3001 3100
3002The following functions and methods are available within a safe environment: 3101The following functions and methods are available within a safe environment:
3003 3102
3004 cf::object 3103 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3104 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3105 insert remove name archname title slaying race decrease split
3007 3106
3008 cf::object::player 3107 cf::object::player
3009 player 3108 player
3010 3109
3011 cf::player 3110 cf::player
… …
3017=cut 3116=cut
3018 3117
3019for ( 3118for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3120 insert remove inv name archname title slaying race
3022 decrease_ob_nr destroy)], 3121 decrease split destroy)],
3023 ["cf::object::player" => qw(player)], 3122 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3123 ["cf::player" => qw(peaceful)],
3025 ["cf::map" => qw(trigger)], 3124 ["cf::map" => qw(trigger)],
3026) { 3125) {
3027 no strict 'refs'; 3126 no strict 'refs';
… …
3132 { 3231 {
3133 my $faces = $facedata->{faceinfo}; 3232 my $faces = $facedata->{faceinfo};
3134 3233
3135 while (my ($face, $info) = each %$faces) { 3234 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3235 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3236
3137 cf::face::set_visibility $idx, $info->{visibility}; 3237 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3238 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3239 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3240 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3141 3241
3142 cf::cede_to_tick; 3242 cf::cede_to_tick;
3143 } 3243 }
3144 3244
3145 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3246 next unless $info->{smooth};
3247
3147 my $idx = cf::face::find $face 3248 my $idx = cf::face::find $face
3148 or next; 3249 or next;
3250
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3251 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3252 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3253 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3254 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3255 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3171 { 3273 {
3172 # TODO: for gcfclient pleasure, we should give resources 3274 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3275 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3276 my $res = $facedata->{resource};
3175 3277
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3278 while (my ($name, $info) = each %$res) {
3279 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3280 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3281 my $data;
3181 3282
3182 if ($info->{type} & 1) { 3283 if ($info->{type} & 1) {
3183 # prepend meta info 3284 # prepend meta info
3184 3285
3185 my $meta = $enc->encode ({ 3286 my $meta = $enc->encode ({
3186 name => $name, 3287 name => $name,
3187 %{ $info->{meta} || {} }, 3288 %{ $info->{meta} || {} },
3188 }); 3289 });
3189 3290
3190 $data = pack "(w/a*)*", $meta, $info->{data}; 3291 $data = pack "(w/a*)*", $meta, $info->{data};
3292 } else {
3293 $data = $info->{data};
3294 }
3295
3296 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3297 cf::face::set_type $idx, $info->{type};
3191 } else { 3298 } else {
3192 $data = $info->{data}; 3299 $RESOURCE{$name} = $info;
3193 } 3300 }
3194 3301
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3302 cf::cede_to_tick;
3199 } 3303 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3304 }
3305
3306 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3307
3220 1 3308 1
3221} 3309}
3310
3311cf::global->attach (on_resource_update => sub {
3312 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3313 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3314
3315 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3316 my $sound = $soundconf->{compat}[$_]
3317 or next;
3318
3319 my $face = cf::face::find "sound/$sound->[1]";
3320 cf::sound::set $sound->[0] => $face;
3321 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3322 }
3323
3324 while (my ($k, $v) = each %{$soundconf->{event}}) {
3325 my $face = cf::face::find "sound/$v";
3326 cf::sound::set $k => $face;
3327 }
3328 }
3329});
3222 3330
3223register_exticmd fx_want => sub { 3331register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3332 my ($ns, $want) = @_;
3225 3333
3226 while (my ($k, $v) = each %$want) { 3334 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3335 $ns->fx_want ($k, $v);
3228 } 3336 }
3229}; 3337};
3338
3339sub load_resource_file($) {
3340 my $guard = lock_acquire "load_resource_file";
3341
3342 my $status = load_resource_file_ $_[0];
3343 get_slot 0.1, 100;
3344 cf::arch::commit_load;
3345
3346 $status
3347}
3230 3348
3231sub reload_regions { 3349sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3350 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3351 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3352 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3248} 3366}
3249 3367
3250sub reload_archetypes { 3368sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3369 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3370 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3371}
3259 3372
3260sub reload_treasures { 3373sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3374 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3375 or die "unable to load treasurelists\n";
3263} 3376}
3264 3377
3265sub reload_resources { 3378sub reload_resources {
3266 warn "reloading resource files...\n"; 3379 warn "reloading resource files...\n";
3267 3380
3381 reload_facedata;
3382 reload_archetypes;
3268 reload_regions; 3383 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3384 reload_treasures;
3273 3385
3274 warn "finished reloading resource files\n"; 3386 warn "finished reloading resource files\n";
3275} 3387}
3276 3388
3277sub init { 3389sub init {
3390 my $guard = freeze_mainloop;
3391
3278 reload_resources; 3392 reload_resources;
3279} 3393}
3280 3394
3281sub reload_config { 3395sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3396 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3397 or return;
3284 3398
3285 local $/; 3399 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3400 *CFG = YAML::Load <$fh>;
3287 3401
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3403
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3291 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3303 # we must not ever block the main coroutine 3417 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3418 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3420 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3421 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3422 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3423 })->prio (Coro::PRIO_MAX);
3310 }; 3424 };
3311 3425
3426 {
3427 my $guard = freeze_mainloop;
3312 reload_config; 3428 reload_config;
3313 db_init; 3429 db_init;
3314 load_extensions; 3430 load_extensions;
3315 3431
3316 $TICK_WATCHER->start; 3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 evthread_start IO::AIO::poll_fileno;
3434 }
3435
3317 Event::loop; 3436 EV::loop;
3318} 3437}
3319 3438
3320############################################################################# 3439#############################################################################
3321# initialisation and cleanup 3440# initialisation and cleanup
3322 3441
3323# install some emergency cleanup handlers 3442# install some emergency cleanup handlers
3324BEGIN { 3443BEGIN {
3444 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3445 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3446 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3447 cf::cleanup "SIG$signal";
3333 },
3334 ); 3448 };
3335 } 3449 }
3336} 3450}
3337 3451
3338sub write_runtime { 3452sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime"; 3453 my $runtime = "$LOCALDIR/runtime";
3340 3454
3341 # first touch the runtime file to show we are still running: 3455 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3456 # the fsync below can take a very very long time.
3343 3457
… …
3369 and return; 3483 and return;
3370 3484
3371 warn "runtime file written.\n"; 3485 warn "runtime file written.\n";
3372 3486
3373 1 3487 1
3488}
3489
3490our $uuid_lock;
3491our $uuid_skip;
3492
3493sub write_uuid_sync($) {
3494 $uuid_skip ||= $_[0];
3495
3496 return if $uuid_lock;
3497 local $uuid_lock = 1;
3498
3499 my $uuid = "$LOCALDIR/uuid";
3500
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return;
3503
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3505 $uuid_skip = 0;
3506
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return;
3509
3510 # always fsync - this file is important
3511 aio_fsync $fh
3512 and return;
3513
3514 close $fh
3515 or return;
3516
3517 aio_rename "$uuid~", $uuid
3518 and return;
3519
3520 warn "uuid file written ($value).\n";
3521
3522 1
3523
3524}
3525
3526sub write_uuid($$) {
3527 my ($skip, $sync) = @_;
3528
3529 $sync ? write_uuid_sync $skip
3530 : async { write_uuid_sync $skip };
3374} 3531}
3375 3532
3376sub emergency_save() { 3533sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3534 my $freeze_guard = cf::freeze_mainloop;
3378 3535
… …
3400 warn "end emergency map save\n"; 3557 warn "end emergency map save\n";
3401 3558
3402 warn "begin emergency database checkpoint\n"; 3559 warn "begin emergency database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3560 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3561 warn "end emergency database checkpoint\n";
3562
3563 warn "begin write uuid\n";
3564 write_uuid_sync 1;
3565 warn "end write uuid\n";
3405 }; 3566 };
3406 3567
3407 warn "leave emergency perl save\n"; 3568 warn "leave emergency perl save\n";
3408} 3569}
3409 3570
… …
3424 warn "reloading..."; 3585 warn "reloading...";
3425 3586
3426 warn "entering sync_job"; 3587 warn "entering sync_job";
3427 3588
3428 cf::sync_job { 3589 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3590 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3591 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3432 3593
3433 warn "syncing database to disk"; 3594 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3595 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3596
3436 # if anything goes wrong in here, we should simply crash as we already saved 3597 # if anything goes wrong in here, we should simply crash as we already saved
3437
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442 3598
3443 warn "flushing outstanding aio requests"; 3599 warn "flushing outstanding aio requests";
3444 for (;;) { 3600 for (;;) {
3445 BDB::flush; 3601 BDB::flush;
3446 IO::AIO::flush; 3602 IO::AIO::flush;
… …
3528 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3529 3685
3530 1 3686 1
3531 } or do { 3687 } or do {
3532 warn $@; 3688 warn $@;
3533 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3690 };
3536 3691
3537 warn "reloaded"; 3692 warn "reloaded";
3538}; 3693};
3539 3694
… …
3541 3696
3542sub reload_perl() { 3697sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3698 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3699 # coro crashes during coro_state_free->destroy here.
3545 3700
3546 $RELOAD_WATCHER ||= Event->timer ( 3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3547 reentrant => 0,
3548 after => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => sub {
3551 do_reload_perl; 3702 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3703 undef $RELOAD_WATCHER;
3553 },
3554 ); 3704 };
3555} 3705}
3556 3706
3557register_command "reload" => sub { 3707register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3708 my ($who, $arg) = @_;
3559 3709
… …
3572 3722
3573our @WAIT_FOR_TICK; 3723our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3724our @WAIT_FOR_TICK_BEGIN;
3575 3725
3576sub wait_for_tick { 3726sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3727 return if tick_inhibit || $Coro::current == $Coro::main;
3579 3728
3580 my $signal = new Coro::Signal; 3729 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3730 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3731 $signal->wait;
3583} 3732}
3584 3733
3585sub wait_for_tick_begin { 3734sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3736
3589 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3738 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3739 $signal->wait;
3592} 3740}
3593 3741
3594$TICK_WATCHER = Event->timer ( 3742sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 3743 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3744 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 3745 unless ++$bug_warning > 10;
3604 return; 3746 return;
3605 } 3747 }
3606 3748
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3749 cf::server_tick; # one server iteration
3610 3750
3611 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK;
3613
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3753 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3754 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3755 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3756 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3757 };
3758 }
3622 3759
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3760 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3761 $sig->send;
3625 } 3762 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3763 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3764 $sig->send;
3628 } 3765 }
3629 3766
3630 $NOW = Event::time; 3767 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3768 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3769
3641 _post_tick; 3770 if (0) {
3771 if ($NEXT_TICK) {
3772 my $jitter = $TICK_START - $NEXT_TICK;
3773 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3774 warn "jitter $JITTER\n";#d#
3775 }
3642 }, 3776 }
3643); 3777}
3644 3778
3645{ 3779{
3780 # configure BDB
3781
3646 BDB::min_parallel 8; 3782 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3783 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3784 $Coro::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 3785
3672 unless ($DB_ENV) { 3786 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3787 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3675 | BDB::LOG_AUTOREMOVE, 1); 3789 | BDB::LOG_AUTOREMOVE, 1);
… …
3690 3804
3691 cf::cleanup "db_env_open(db): $@" if $@; 3805 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3806 };
3693 } 3807 }
3694 3808
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3809 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3810 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 3811 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3812 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3813 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3814 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3815 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3816 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3817 };
3725} 3818}
3726 3819
3727{ 3820{
3821 # configure IO::AIO
3822
3728 IO::AIO::min_parallel 8; 3823 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3824 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3825 $Coro::AIO::WATCHER->priority (1);
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 3826}
3741 3827
3742my $_log_backtrace; 3828my $_log_backtrace;
3743 3829
3744sub _log_backtrace { 3830sub _log_backtrace {

Diff Legend

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