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.391 by root, Fri Oct 26 04:22:05 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.51 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::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 68Compress::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 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 107our $DB_ENV;
89 108
90our %CFG; 109our %CFG;
91 110
92our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 112our $RUNTIME;
113our $NOW;
94 114
95our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
98 118
99# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
162 183
163The raw value load value from the last tick. 184The raw value load value from the last tick.
164 185
165=item %cf::CFG 186=item %cf::CFG
166 187
167Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 189from wherever your confdir points to.
169 190
170=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
171 192
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These 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; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 245for my $pkg (qw(
210 cf::global cf::attachable 246 cf::global cf::attachable
211 cf::object cf::object::player 247 cf::object cf::object::player
212 cf::client cf::player 248 cf::client cf::player
213 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
214 cf::map cf::party cf::region 251 cf::party cf::region
215)) { 252)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$Event::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
222}; 258};
223 259
224############################################################################# 260#############################################################################
225 261
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 285 $d
250 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
251} 287}
252 288
253=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
254 290
255Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
256 292
257=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
258 294
259Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
260 296
261=cut 297=cut
262 298
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 300
265sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
267 303
268=item cf::lock_wait $string 304=item cf::lock_wait $string
269 305
270Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
271 307
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 430 }
384 } 431 }
385}; 432};
386 433
387sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
388 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
389 438
390 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
392 441
406 455
407BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
408 457
409=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
410 459
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 461is 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 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 463acceptable.
415 464
416If it must be done, put the blocking parts into C<sync_job>. This will run 465If 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 466the given BLOCK in another coroutine while waiting for the result. The
422 471
423sub sync_job(&) { 472sub sync_job(&) {
424 my ($job) = @_; 473 my ($job) = @_;
425 474
426 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 476 my $time = EV::time;
428 477
429 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
431 480
432 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
433 482
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
437 484
438 my $busy = 1; 485 my $busy = 1;
439 my @res; 486 my @res;
440 487
447 494
448 while ($busy) { 495 while ($busy) {
449 if (Coro::nready) { 496 if (Coro::nready) {
450 Coro::cede_notself; 497 Coro::cede_notself;
451 } else { 498 } else {
452 Event::one_event; 499 EV::loop EV::LOOP_ONESHOT;
453 } 500 }
454 } 501 }
455 502
456 $time = Event::time - $time; 503 my $time = EV::time - $time;
457 504
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 505 $TICK_START += $time; # do not account sync jobs to server load
462 506
463 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
464 } else { 508 } else {
465 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
466 510
491=item fork_call { }, $args 535=item fork_call { }, $args
492 536
493Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
497 541
498=cut 542=cut
499 543
500sub fork_call(&@) { 544sub fork_call(&@) {
501 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
508 reset_signals; 552 reset_signals;
509 &$cb 553 &$cb
510 }, @args; 554 }, @args;
511 555
512 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
513} 584}
514 585
515=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
516 587
517Returns a single value from the environment database. 588Returns a single value from the environment database.
662attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
664 735
665In the following description, CLASS can be any of C<global>, C<object> 736In 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 737C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 738Deliantra).
668 739
669=over 4 740=over 4
670 741
671=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
672 743
954 } 1025 }
955 1026
956 0 1027 0
957} 1028}
958 1029
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1031
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1033
963Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
964 1035
1017 1088
1018sub reattach { 1089sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1091 my ($obj) = @_;
1021 1092
1093 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1095
1024 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1025 1097
1026 @$registry = (); 1098 @$registry = ();
1027 1099
1042cf::attachable->attach ( 1114cf::attachable->attach (
1043 prio => -1000000, 1115 prio => -1000000,
1044 on_instantiate => sub { 1116 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1046 1118
1047 $data = from_json $data; 1119 $data = decode_json $data;
1048 1120
1049 for (@$data) { 1121 for (@$data) {
1050 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1051 1123
1052 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1076 1148
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1153 aio_close $fh;
1082 1154
1083 if (@$objs) { 1155 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1161 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1163 }
1092 } else { 1164 } else {
1093 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1094 } 1166 }
1263 1335
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1338
1267 $ext{source} = 1339 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1270 . $source 1342 . $source
1271 . "\n};\n1"; 1343 . "\n};\n1";
1272 1344
1273 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1291 1363
1292 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1365 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1367 }
1297 1368
1298 warn $msg; 1369 warn $msg;
1299 } 1370 }
1300 1371
1389 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1461 or return;
1391 1462
1392 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1393 or return; 1464 or return;
1465
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1397 } 1469 }
1398 } 1470 }
1408 1480
1409 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1410 1482
1411 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1413 1487
1414 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1489 cf::cede_to_tick;
1416} 1490}
1417 1491
1453 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1455 1529
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1460 1536
1461 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1577
1502 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1503 my $path = path $login; 1579 my $path = path $login;
1504 1580
1505 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1587 }
1511 1588
1548 1625
1549Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1550 1627
1551=cut 1628=cut
1552 1629
1553 use re 'eval'; 1630use re 'eval';
1554 1631
1555my $group; 1632my $group;
1556my $interior; $interior = qr{ 1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1557 (?: 1635 (?:
1558 \ (.*?)\ (?{ $group = $^N }) 1636 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) > 1637 | < (??{$interior}) >
1560 ) 1638 )
1561}x; 1639}x;
1564 my ($self, $pod) = @_; 1642 my ($self, $pod) = @_;
1565 1643
1566 my $xml; 1644 my $xml;
1567 1645
1568 while () { 1646 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) { 1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1570 $group = $1; 1648 $group = $1;
1571 1649
1572 $group =~ s/&/&amp;/g; 1650 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g; 1651 $group =~ s/</&lt;/g;
1574 1652
1627 } 1705 }
1628 1706
1629 $xml 1707 $xml
1630} 1708}
1631 1709
1710no re 'eval';
1711
1632sub hintmode { 1712sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1; 1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode} 1714 $_[0]{hintmode}
1635} 1715}
1636 1716
1707our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1709 1789
1710sub generate_random_map { 1790sub generate_random_map {
1711 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1712 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1796 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1838 1921
1839# the temporary/swap location 1922# the temporary/swap location
1840sub save_path { 1923sub save_path {
1841 my ($self) = @_; 1924 my ($self) = @_;
1842 1925
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1845} 1928}
1846 1929
1847# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1848sub uniq_path { 1931sub uniq_path {
1849 my ($self) = @_; 1932 my ($self) = @_;
1850 1933
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1853} 1936}
1854 1937
1855# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1856# all maps in C++... 1939# all maps in C++...
1954 2037
1955 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1957 2040
1958 $cf::MAP{$path} || do { 2041 $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 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
1961 2044
1962 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1963 or return; 2046 or return;
1964 2047
1965 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
1968 or return; 2051 or return;
1969 2052
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
1973 undef $guard1; 2057 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 2058 $map->reset;
1976 return find $path; 2059 return find $path;
1977 } 2060 }
1978 2061
1979 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2090 $f->skip_block;
2008 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2009 or return; 2092 or return;
2010 2093
2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2012 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2013 2096
2014 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2098 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
2042 } 2125 }
2043 2126
2044 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2046 2129
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2131 }
2049 2132
2050 $self->post_load; 2133 $self->post_load;
2051} 2134}
2052 2135
2110 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2111 2194
2112 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2113 2196
2114 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2199 }
2117 2200
2118 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2119 2202
2120 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2157 cf::async { 2240 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2160 }; 2243 };
2161 2244
2245 cf::get_slot 0.02;
2246
2162 if ($uniq) { 2247 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2250 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2251 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2174 $self->save; 2259 $self->save;
2175 2260
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2262
2178 return if $self->players; 2263 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2181 2266
2182 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2183 2268
2184 $self->deactivate; 2269 $self->deactivate;
2302 2387
2303sub unique_maps() { 2388sub unique_maps() {
2304 [ 2389 [
2305 map { 2390 map {
2306 utf8::decode $_; 2391 utf8::decode $_;
2307 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2308 ? normalise $_ 2395 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2397 ]
2312} 2398}
2313 2399
2314package cf;
2315
2316=back 2400=back
2317 2401
2318=head3 cf::object 2402=head3 cf::object
2319 2403
2320=cut 2404=cut
2323 2407
2324=over 4 2408=over 4
2325 2409
2326=item $ob->inv_recursive 2410=item $ob->inv_recursive
2327 2411
2328Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2329 2414
2330=cut 2415=cut
2331 2416
2332sub inv_recursive_; 2417sub inv_recursive_;
2333sub inv_recursive_ { 2418sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2339} 2424}
2340 2425
2341=item $ref = $ob->ref 2426=item $ref = $ob->ref
2342 2427
2343creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2344 2429
2345=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2346 2431
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block. 2433even if the object actually exists. May block.
2380can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2381dialogue with the given NPC character. 2466dialogue with the given NPC character.
2382 2467
2383=cut 2468=cut
2384 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2385# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2485# with dialog boxes.
2387#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2388sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
2400 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2402 2501
2403 } else { 2502 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2505 }
2407 } 2506 }
2408} 2507}
2409 2508
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
2517Moves the player to the given map-path and coordinates by first freezing 2616Moves the player to the given map-path and coordinates by first freezing
2518her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2519that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2520the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2521be called at the end of this process. 2620be called at the end of this process.
2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2522 2624
2523=cut 2625=cut
2524 2626
2525our $GOTOGEN; 2627our $GOTOGEN;
2526 2628
2605} 2707}
2606 2708
2607sub prepare_random_map { 2709sub prepare_random_map {
2608 my ($exit) = @_; 2710 my ($exit) = @_;
2609 2711
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2714 # that depends on the exit object
2615 2715
2616 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
2618 if ($exit->map) { 2718 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2623 } 2725 }
2624 2726
2625 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2626 2728
2627 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2630 2732
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2735 undef $fh;
2634 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2635 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2638 } 2744 }
2639} 2745}
2640 2746
2641sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2643 2749
2644 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2645 2751
2646 if ($exit->slaying eq "/!") {
2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
2650 cf::sync_job { prepare_random_map $exit };
2651 }
2652
2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654 my $hp = $exit->stats->hp;
2655 my $sp = $exit->stats->sp;
2656
2657 $self->enter_link; 2752 $self->enter_link;
2658 2753
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2663 (async { 2754 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2665 2756
2666 $self->deactivate_recursive; # just to be sure
2667 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2668 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2669 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2670 1; 2778 1
2671 }) { 2779 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2673 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2674 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
2755 id => "infobox", 2863 id => "infobox",
2756 title => "Map Info", 2864 title => "Map Info",
2757 reply => undef, 2865 reply => undef,
2758 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2759 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2760); 2874);
2761 2875
2762sub cf::client::send_msg { 2876sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2764 2878
3001 3115
3002The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3003 3117
3004 cf::object 3118 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3119 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3007 3121
3008 cf::object::player 3122 cf::object::player
3009 player 3123 player
3010 3124
3011 cf::player 3125 cf::player
3016 3130
3017=cut 3131=cut
3018 3132
3019for ( 3133for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3023 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3025 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3026) { 3140) {
3027 no strict 'refs'; 3141 no strict 'refs';
3132 { 3246 {
3133 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
3134 3248
3135 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
3137 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3254 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}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3141 3256
3142 cf::cede_to_tick; 3257 cf::cede_to_tick;
3143 } 3258 }
3144 3259
3145 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
3147 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
3148 or next; 3264 or next;
3265
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3269 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
3171 { 3288 {
3172 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
3175 3292
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3296 my $data;
3181 3297
3182 if ($info->{type} & 1) { 3298 if ($info->{type} & 1) {
3183 # prepend meta info 3299 # prepend meta info
3184 3300
3185 my $meta = $enc->encode ({ 3301 my $meta = $enc->encode ({
3186 name => $name, 3302 name => $name,
3187 %{ $info->{meta} || {} }, 3303 %{ $info->{meta} || {} },
3188 }); 3304 });
3189 3305
3190 $data = pack "(w/a*)*", $meta, $info->{data}; 3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
3191 } else { 3313 } else {
3192 $data = $info->{data}; 3314 $RESOURCE{$name} = $info;
3193 } 3315 }
3194 3316
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; 3317 cf::cede_to_tick;
3199 } 3318 }
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 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3322
3220 1 3323 1
3221} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3222 3345
3223register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
3225 3348
3226 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3228 } 3351 }
3229}; 3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3230 3363
3231sub reload_regions { 3364sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3366 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3381}
3249 3382
3250sub reload_archetypes { 3383sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3385 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} 3386}
3259 3387
3260sub reload_treasures { 3388sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3263} 3391}
3264 3392
3265sub reload_resources { 3393sub reload_resources {
3266 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3267 3395
3396 reload_facedata;
3397 reload_archetypes;
3268 reload_regions; 3398 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3399 reload_treasures;
3273 3400
3274 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3275} 3402}
3276 3403
3277sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3278 reload_resources; 3409 reload_resources;
3279} 3410}
3280 3411
3281sub reload_config { 3412sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3414 or return;
3284 3415
3285 local $/; 3416 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3287 3418
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3420
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $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}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3303 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3437 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3439 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3310 }; 3441 };
3311 3442
3443 {
3444 my $guard = freeze_mainloop;
3312 reload_config; 3445 reload_config;
3313 db_init; 3446 db_init;
3314 load_extensions; 3447 load_extensions;
3315 3448
3316 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3317 Event::loop; 3452 EV::loop;
3318} 3453}
3319 3454
3320############################################################################# 3455#############################################################################
3321# initialisation and cleanup 3456# initialisation and cleanup
3322 3457
3323# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
3324BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3462 $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"; 3463 cf::cleanup "SIG$signal";
3333 },
3334 ); 3464 };
3335 } 3465 }
3336} 3466}
3337 3467
3338sub write_runtime { 3468sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3340 3470
3341 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3343 3473
3369 and return; 3499 and return;
3370 3500
3371 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3372 3502
3373 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3374} 3547}
3375 3548
3376sub emergency_save() { 3549sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3378 3551
3400 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3401 3574
3402 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3405 }; 3582 };
3406 3583
3407 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3408} 3585}
3409 3586
3411 my ($make_core) = @_; 3588 my ($make_core) = @_;
3412 3589
3413 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3414 if $make_core; 3591 if $make_core;
3415} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3416 3621
3417sub do_reload_perl() { 3622sub do_reload_perl() {
3418 # can/must only be called in main 3623 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3420 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3421 return; 3626 return;
3422 } 3627 }
3423 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3424 warn "reloading..."; 3632 warn "reloading...";
3425 3633
3426 warn "entering sync_job"; 3634 warn "entering sync_job";
3427 3635
3428 cf::sync_job { 3636 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3638 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3432 3640
3433 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3643
3436 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3437 3645
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442
3443 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3444 for (;;) {
3445 BDB::flush;
3446 IO::AIO::flush;
3447 Coro::cede_notself;
3448 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3449 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3450 }
3451
3452 ++$RELOAD;
3453
3454 warn "cancelling all extension coros";
3455 $_->cancel for values %EXT_CORO;
3456 %EXT_CORO = ();
3457
3458 warn "removing commands";
3459 %COMMAND = ();
3460
3461 warn "removing ext/exti commands";
3462 %EXTCMD = ();
3463 %EXTICMD = ();
3464
3465 warn "unloading/nuking all extensions";
3466 for my $pkg (@EXTS) {
3467 warn "... unloading $pkg";
3468
3469 if (my $cb = $pkg->can ("unload")) {
3470 eval {
3471 $cb->($pkg);
3472 1
3473 } or warn "$pkg unloaded, but with errors: $@";
3474 } 3649 }
3475 3650
3476 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3477 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3478 } 3653 %EXT_CORO = ();
3479 3654
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3481 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3484 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3485 delete $INC{$k};
3486 3665
3487 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g;
3489
3490 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3491 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3492 } 3675 }
3493 3676
3494 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3495 } 3692 }
3496 3693
3497 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3499 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3500 3697
3501 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3504 3701
3505 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3703 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3508 3705
3509 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3510 3707
3511 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3512 require cf; 3709 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3514 3711
3515 warn "loading config and database again"; 3712 warn "loading config and database again";
3516 cf::reload_config; 3713 cf::reload_config;
3517 3714
3518 warn "loading extensions"; 3715 warn "loading extensions";
3519 cf::load_extensions; 3716 cf::load_extensions;
3520 3717
3521 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3527 3724
3528 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3529 3726
3530 1 3727 1
3531 } or do { 3728 } or do {
3532 warn $@; 3729 warn $@;
3533 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3731 };
3536 3732
3537 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3538}; 3736};
3539 3737
3540our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3541 3739
3542sub reload_perl() { 3740sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3545 3743
3546 $RELOAD_WATCHER ||= Event->timer ( 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3547 reentrant => 0,
3548 after => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => sub {
3551 do_reload_perl; 3745 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3553 },
3554 ); 3747 };
3555} 3748}
3556 3749
3557register_command "reload" => sub { 3750register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
3559 3752
3572 3765
3573our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3575 3768
3576sub wait_for_tick { 3769sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3579 3771
3580 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3774 $signal->wait;
3583} 3775}
3584 3776
3585sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3779
3589 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3782 $signal->wait;
3592} 3783}
3593 3784
3594$TICK_WATCHER = Event->timer ( 3785sub 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) { 3786 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3604 return; 3789 return;
3605 } 3790 }
3606 3791
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3610 3793
3611 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK;
3613
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3796 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3798 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3800 };
3801 }
3622 3802
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3804 $sig->send;
3625 } 3805 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3807 $sig->send;
3628 } 3808 }
3629 3809
3630 $NOW = Event::time; 3810 $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; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3812
3641 _post_tick; 3813 if (0) {
3814 if ($NEXT_TICK) {
3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3642 }, 3819 }
3643); 3820}
3644 3821
3645{ 3822{
3823 # configure BDB
3824
3646 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3827 $AnyEvent::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 3828
3672 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | BDB::LOG_AUTOREMOVE, 1); 3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 3836
3679 cf::sync_job { 3837 cf::sync_job {
3680 eval { 3838 eval {
3690 3848
3691 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3850 };
3693 } 3851 }
3694 3852
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3853 $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 { }; 3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 3855 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3856 $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 { }; 3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3858 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3859 $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 { }; 3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3861 };
3725} 3862}
3726 3863
3727{ 3864{
3865 # configure IO::AIO
3866
3728 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3869 undef $AnyEvent::AIO::WATCHER;
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} 3870}
3741 3871
3742my $_log_backtrace; 3872my $_log_backtrace;
3743 3873
3744sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines