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.501 by root, Sat Jan 16 23:27:21 2010 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
60use IO::AIO (); 62use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 63use Compress::LZF;
63use Digest::MD5 (); 64use Digest::MD5 ();
64 65
65AnyEvent::detect; 66AnyEvent::detect;
66 67
78# strictly for debugging 79# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 81
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 83
84our @ORIG_INC;
85
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
94our @REFLECT; # set by XS 99our @REFLECT; # set by XS
95our %REFLECT; # set by us 100our %REFLECT; # set by us
96 101
97our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
98our $DATADIR = datadir; 104our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
102our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 117
111our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
112 125
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 128our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
118our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 134our $DB_ENV;
122 135
123our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 137
125our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126 140
127our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
129our $NOW; 144our $NOW;
130 145
131our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
142 157
143our @POST_INIT; 158our @POST_INIT;
144 159
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
147 165
148binmode STDOUT; 166binmode STDOUT;
149binmode STDERR; 167binmode STDERR;
150 168
151# read virtual server time, if available 169# read virtual server time, if available
162 180
163our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
164 182
165sub cf::map::normalise; 183sub cf::map::normalise;
166 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
167############################################################################# 189#############################################################################
168 190
169%REFLECT = (); 191%REFLECT = ();
170for (@REFLECT) { 192for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 193 my $reflect = JSON::XS::decode_json $_;
181 203
182=over 4 204=over 4
183 205
184=item $cf::UPTIME 206=item $cf::UPTIME
185 207
186The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
187 224
188=item $cf::RUNTIME 225=item $cf::RUNTIME
189 226
190The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
191every server tick. 228every server tick.
192 229
193=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196 233
197Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
200database environment. 237database environment.
201 238
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 239=item $cf::LOADAVG
211 240
212The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
213(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
214objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
223from wherever your confdir points to. 252from wherever your confdir points to.
224 253
225=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
226 255
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 257returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 258per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
259
260Note that cf::Wait_for_tick will immediately return when the server is not
261ticking, making it suitable for small pauses in threads that need to run
262when the server is paused. If that is not applicable (i.e. you I<really>
263want to wait, use C<$cf::WAIT_FOR_TICK>).
264
265=item $cf::WAIT_FOR_TICK
266
267Note that C<cf::wait_for_tick> is probably the correct thing to use. This
268variable contains a L<Coro::Signal> that is broadcats after every server
269tick. Calling C<< ->wait >> on it will suspend the caller until after the
270next server tick.
271
272=cut
273
274sub wait_for_tick();
275sub wait_for_tick_begin();
230 276
231=item @cf::INVOKE_RESULTS 277=item @cf::INVOKE_RESULTS
232 278
233This array contains the results of the last C<invoke ()> call. When 279This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 280C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
242 288
243=back 289=back
244 290
245=cut 291=cut
246 292
293sub error(@) { LOG llevError, join "", @_ }
294sub warn (@) { LOG llevWarn , join "", @_ }
295sub info (@) { LOG llevInfo , join "", @_ }
296sub debug(@) { LOG llevDebug, join "", @_ }
297sub trace(@) { LOG llevTrace, join "", @_ }
298
247$Coro::State::WARNHOOK = sub { 299$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 300 my $msg = join "", @_;
249 301
250 $msg .= "\n" 302 $msg .= "\n"
251 unless $msg =~ /\n$/; 303 unless $msg =~ /\n$/;
252 304
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 305 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 306
255 LOG llevError, $msg; 307 LOG llevWarn, $msg;
256}; 308};
257 309
258$Coro::State::DIEHOOK = sub { 310$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 311 return unless $^S eq 0; # "eq", not "=="
260 312
261 warn Carp::longmess $_[0]; 313 error Carp::longmess $_[0];
262 314
263 if ($Coro::current == $Coro::main) {#d# 315 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 316 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 317 return;#d#
266 }#d# 318 }#d#
267 319
268 # kill coroutine otherwise 320 # kill coroutine otherwise
269 Coro::terminate 321 Coro::terminate
289)) { 341)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 342 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 343}
292 344
293$EV::DIED = sub { 345$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 346 warn "error in event callback: $@";
295}; 347};
348
349#############################################################################
350
351sub fork_call(&@);
352sub get_slot($;$$);
296 353
297############################################################################# 354#############################################################################
298 355
299=head2 UTILITY FUNCTIONS 356=head2 UTILITY FUNCTIONS
300 357
321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 378 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322 $d 379 $d
323 } || "[unable to dump $_[0]: '$@']"; 380 } || "[unable to dump $_[0]: '$@']";
324} 381}
325 382
383=item $scalar = cf::load_file $path
384
385Loads the given file from path and returns its contents. Croaks on error
386and can block.
387
388=cut
389
390sub load_file($) {
391 0 <= aio_load $_[0], my $data
392 or Carp::croak "$_[0]: $!";
393
394 $data
395}
396
397=item $success = cf::replace_file $path, $data, $sync
398
399Atomically replaces the file at the given $path with new $data, and
400optionally $sync the data to disk before replacing the file.
401
402=cut
403
404sub replace_file($$;$) {
405 my ($path, $data, $sync) = @_;
406
407 my $lock = cf::lock_acquire ("replace_file:$path");
408
409 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
410 or return;
411
412 $data = $data->() if ref $data;
413
414 length $data == aio_write $fh, 0, (length $data), $data, 0
415 or return;
416
417 !$sync
418 or !aio_fsync $fh
419 or return;
420
421 aio_close $fh
422 and return;
423
424 aio_rename "$path~", $path
425 and return;
426
427 if ($sync) {
428 $path =~ s%/[^/]*$%%;
429 aio_pathsync $path;
430 }
431
432 1
433}
434
326=item $ref = cf::decode_json $json 435=item $ref = cf::decode_json $json
327 436
328Converts a JSON string into the corresponding perl data structure. 437Converts a JSON string into the corresponding perl data structure.
329 438
330=item $json = cf::encode_json $ref 439=item $json = cf::encode_json $ref
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 445our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 446
338sub encode_json($) { $json_coder->encode ($_[0]) } 447sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 448sub decode_json($) { $json_coder->decode ($_[0]) }
340 449
450=item $ref = cf::decode_storable $scalar
451
452Same as Coro::Storable::thaw, so blocks.
453
454=cut
455
456BEGIN { *decode_storable = \&Coro::Storable::thaw }
457
458=item $ref = cf::decode_yaml $scalar
459
460Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
461
462=cut
463
464sub decode_yaml($) {
465 fork_call { YAML::XS::Load $_[0] } @_
466}
467
468=item $scalar = cf::unlzf $scalar
469
470Same as Compress::LZF::compress, but takes server ticks into account, so
471blocks.
472
473=cut
474
475sub unlzf($) {
476 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
477 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
478 Compress::LZF::decompress $_[0]
479}
480
341=item cf::post_init { BLOCK } 481=item cf::post_init { BLOCK }
342 482
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 483Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 484but I<before> the server starts ticking again.
345 485
346The cdoeblock will have a single boolean argument to indicate whether this 486The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 487is a reload or not.
348 488
349=cut 489=cut
350 490
351sub post_init(&) { 491sub post_init(&) {
352 push @POST_INIT, shift; 492 push @POST_INIT, shift;
493}
494
495sub _post_init {
496 trace "running post_init jobs";
497
498 # run them in parallel...
499
500 my @join;
501
502 while () {
503 push @join, map &Coro::async ($_, 0), @POST_INIT;
504 @POST_INIT = ();
505
506 @join or last;
507
508 (pop @join)->join;
509 }
353} 510}
354 511
355=item cf::lock_wait $string 512=item cf::lock_wait $string
356 513
357Wait until the given lock is available. See cf::lock_acquire. 514Wait until the given lock is available. See cf::lock_acquire.
396} 553}
397 554
398=item cf::periodic $interval, $cb 555=item cf::periodic $interval, $cb
399 556
400Like EV::periodic, but randomly selects a starting point so that the actions 557Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 558get spread over time.
402 559
403=cut 560=cut
404 561
405sub periodic($$) { 562sub periodic($$) {
406 my ($interval, $cb) = @_; 563 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 567 EV::periodic $start, $interval, 0, $cb
411} 568}
412 569
413=item cf::get_slot $time[, $priority[, $name]] 570=item cf::get_slot $time[, $priority[, $name]]
414 571
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 572Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 573(default: 0): This call blocks and returns only when you have at least
417of cpu time till the next tick. The slot is only valid till the next cede. 574C<$time> seconds of cpu time till the next tick. The slot is only valid
575till the next cede.
576
577Background jobs should use a priority les than zero, interactive jobs
578should use 100 or more.
418 579
419The optional C<$name> can be used to identify the job to run. It might be 580The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class. 581used for statistical purposes and should identify the same time-class.
421 582
422Useful for short background jobs. 583Useful for short background jobs.
423 584
424=cut 585=cut
425 586
426our @SLOT_QUEUE; 587our @SLOT_QUEUE;
427our $SLOT_QUEUE; 588our $SLOT_QUEUE;
589our $SLOT_DECAY = 0.9;
428 590
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 591$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 592$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 593 $Coro::current->desc ("timeslot manager");
432 594
433 my $signal = new Coro::Signal; 595 my $signal = new Coro::Signal;
596 my $busy;
434 597
435 while () { 598 while () {
436 next_job: 599 next_job:
600
437 my $avail = cf::till_tick; 601 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 602
439 for (0 .. $#SLOT_QUEUE) { 603 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 604 if ($SLOT_QUEUE[$_][0] <= $avail) {
605 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 606 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 607 $job->[2]->send;
443 Coro::cede; 608 Coro::cede;
444 goto next_job; 609 goto next_job;
445 } 610 } else {
611 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 612 }
447 } 613 }
448 614
449 if (@SLOT_QUEUE) { 615 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 616 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 617 $WAIT_FOR_TICK->wait;
452 $signal->wait;
453 } else { 618 } else {
619 $busy = 0;
454 Coro::schedule; 620 Coro::schedule;
455 } 621 }
456 } 622 }
457}; 623};
458 624
459sub get_slot($;$$) { 625sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 626 return if tick_inhibit || $Coro::current == $Coro::main;
461 627
462 my ($time, $pri, $name) = @_; 628 my ($time, $pri, $name) = @_;
463 629
464 $time = $TICK * .6 if $time > $TICK * .6; 630 $time = clamp $time, 0.01, $TICK * .6;
631
465 my $sig = new Coro::Signal; 632 my $sig = new Coro::Signal;
466 633
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 634 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 635 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 636 $SLOT_QUEUE->ready;
495=cut 662=cut
496 663
497sub sync_job(&) { 664sub sync_job(&) {
498 my ($job) = @_; 665 my ($job) = @_;
499 666
500 if ($Coro::current == $Coro::main) { 667 if (in_main) {
501 my $time = EV::time; 668 my $time = AE::time;
502 669
503 # this is the main coro, too bad, we have to block 670 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 671 # till the operation succeeds, freezing the server :/
505 672
506 LOG llevError, Carp::longmess "sync job";#d# 673 #LOG llevError, Carp::longmess "sync job";#d#
507 674
508 my $freeze_guard = freeze_mainloop; 675 my $freeze_guard = freeze_mainloop;
509 676
510 my $busy = 1; 677 my $busy = 1;
511 my @res; 678 my @res;
512 679
513 (async { 680 (async {
514 $Coro::current->desc ("sync job coro"); 681 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 682 @res = eval { $job->() };
516 warn $@ if $@; 683 error $@ if $@;
517 undef $busy; 684 undef $busy;
518 })->prio (Coro::PRIO_MAX); 685 })->prio (Coro::PRIO_MAX);
519 686
520 while ($busy) { 687 while ($busy) {
521 if (Coro::nready) { 688 if (Coro::nready) {
523 } else { 690 } else {
524 EV::loop EV::LOOP_ONESHOT; 691 EV::loop EV::LOOP_ONESHOT;
525 } 692 }
526 } 693 }
527 694
528 my $time = EV::time - $time; 695 my $time = AE::time - $time;
529 696
530 $TICK_START += $time; # do not account sync jobs to server load 697 $TICK_START += $time; # do not account sync jobs to server load
531 698
532 wantarray ? @res : $res[0] 699 wantarray ? @res : $res[0]
533 } else { 700 } else {
555 $EXT_CORO{$coro+0} = $coro; 722 $EXT_CORO{$coro+0} = $coro;
556 723
557 $coro 724 $coro
558} 725}
559 726
560=item fork_call { }, $args 727=item fork_call { }, @args
561 728
562Executes the given code block with the given arguments in a seperate 729Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 730process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 731Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 732never block itself or use any form of event handling.
566 733
567=cut 734=cut
568 735
736sub post_fork {
737 reset_signals;
738}
739
569sub fork_call(&@) { 740sub fork_call(&@) {
570 my ($cb, @args) = @_; 741 my ($cb, @args) = @_;
571 742
572 # we seemingly have to make a local copy of the whole thing, 743 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 744 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 745 # TODO: investigate and fix (likely this will be rather laborious)
575 746
576 my @res = Coro::Util::fork_eval { 747 my @res = Coro::Util::fork_eval {
577 reset_signals; 748 cf::post_fork;
578 &$cb 749 &$cb
579 }, @args; 750 } @args;
580 751
581 wantarray ? @res : $res[-1] 752 wantarray ? @res : $res[-1]
753}
754
755sub objinfo {
756 (
757 "counter value" => cf::object::object_count,
758 "objects created" => cf::object::create_count,
759 "objects destroyed" => cf::object::destroy_count,
760 "freelist size" => cf::object::free_count,
761 "allocated objects" => cf::object::objects_size,
762 "active objects" => cf::object::actives_size,
763 )
582} 764}
583 765
584=item $coin = coin_from_name $name 766=item $coin = coin_from_name $name
585 767
586=cut 768=cut
623within each server. 805within each server.
624 806
625=cut 807=cut
626 808
627sub db_table($) { 809sub db_table($) {
810 cf::error "db_get called from main context"
811 if $Coro::current == $Coro::main;
812
628 my ($name) = @_; 813 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 814 my $db = BDB::db_create $DB_ENV;
630 815
631 eval { 816 eval {
632 $db->set_flags (BDB::CHKSUM); 817 $db->set_flags (BDB::CHKSUM);
642} 827}
643 828
644our $DB; 829our $DB;
645 830
646sub db_init { 831sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 832 $DB ||= db_table "db";
649 };
650} 833}
651 834
652sub db_get($$) { 835sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 836 my $key = "$_[0]/$_[1]";
654 837
655 cf::sync_job { 838 cf::error "db_get called from main context"
839 if $Coro::current == $Coro::main;
840
656 BDB::db_get $DB, undef, $key, my $data; 841 BDB::db_get $DB, undef, $key, my $data;
657 842
658 $! ? () 843 $! ? ()
659 : $data 844 : $data
660 }
661} 845}
662 846
663sub db_put($$$) { 847sub db_put($$$) {
664 BDB::dbreq_pri 4; 848 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 849 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 877
694 my @data; 878 my @data;
695 my $md5; 879 my $md5;
696 880
697 for (0 .. $#$src) { 881 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 882 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 883 }
701 884
702 # if processing is expensive, check 885 # if processing is expensive, check
703 # checksum first 886 # checksum first
704 if (1) { 887 if (1) {
717 900
718 return db_get cache => "$id/data"; 901 return db_get cache => "$id/data";
719 } 902 }
720 } 903 }
721 904
722 my $t1 = Time::HiRes::time; 905 my $t1 = EV::time;
723 my $data = $process->(\@data); 906 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 907 my $t2 = EV::time;
725 908
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 909 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 910
728 db_put cache => "$id/data", $data; 911 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 912 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 913 db_put cache => "$id/meta", $meta;
731 914
741 924
742=cut 925=cut
743 926
744sub datalog($@) { 927sub datalog($@) {
745 my ($type, %kv) = @_; 928 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 929 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 930}
748 931
749=back 932=back
750 933
751=cut 934=cut
946 1129
947 } elsif (exists $cb_id{$type}) { 1130 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1131 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1132
950 } elsif (ref $type) { 1133 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1134 error "attaching objects not supported, ignoring.\n";
952 1135
953 } else { 1136 } else {
954 shift @arg; 1137 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1138 error "attach argument '$type' not supported, ignoring.\n";
956 } 1139 }
957 } 1140 }
958} 1141}
959 1142
960sub _object_attach { 1143sub _object_attach {
970 _attach $registry, $klass, @attach; 1153 _attach $registry, $klass, @attach;
971 } 1154 }
972 1155
973 $obj->{$name} = \%arg; 1156 $obj->{$name} = \%arg;
974 } else { 1157 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1158 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1159 }
977 1160
978 $obj->{_attachment}{$name} = undef; 1161 $obj->{_attachment}{$name} = undef;
979} 1162}
980 1163
1039 1222
1040 for (@$callbacks) { 1223 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1224 eval { &{$_->[1]} };
1042 1225
1043 if ($@) { 1226 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1227 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1228 override;
1047 } 1229 }
1048 1230
1049 return 1 if $override; 1231 return 1 if $override;
1050 } 1232 }
1129 for (@$attach) { 1311 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1312 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1313 _attach $registry, $klass, @attach;
1132 } 1314 }
1133 } else { 1315 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1316 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1317 }
1136 } 1318 }
1137} 1319}
1138 1320
1139cf::attachable->attach ( 1321cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1348 my ($filename, $rdata, $objs) = @_;
1167 1349
1168 sync_job { 1350 sync_job {
1169 if (length $$rdata) { 1351 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1352 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1353 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1354 $decname, length $$rdata, scalar @$objs
1355 if $VERBOSE_IO;
1173 1356
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1357 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1358 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1359 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1360 if ($cf::USE_FSYNC) {
1199 aio_rename "$filename~", $filename; 1382 aio_rename "$filename~", $filename;
1200 1383
1201 $filename =~ s%/[^/]+$%%; 1384 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1385 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1386 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1387 error "unable to save objects: $filename~: $!\n";
1205 } 1388 }
1206 } else { 1389 } else {
1207 aio_unlink $filename; 1390 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1209 } 1392 }
1233 my $st = eval { Coro::Storable::thaw $av }; 1416 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1417 $av = $st->{objs};
1235 } 1418 }
1236 1419
1237 utf8::decode (my $decname = $filename); 1420 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1421 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1422 $decname, length $data, scalar @{$av || []}
1423 if $VERBOSE_IO;
1240 1424
1241 ($data, $av) 1425 ($data, $av)
1242} 1426}
1243 1427
1244=head2 COMMAND CALLBACKS 1428=head2 COMMAND CALLBACKS
1248=cut 1432=cut
1249 1433
1250############################################################################# 1434#############################################################################
1251# command handling &c 1435# command handling &c
1252 1436
1253=item cf::register_command $name => \&callback($ob,$args); 1437=item cf::register_command $name => \&callback($ob,$args)
1254 1438
1255Register a callback for execution when the client sends the user command 1439Register a callback for execution when the client sends the user command
1256$name. 1440$name.
1257 1441
1258=cut 1442=cut
1264 #warn "registering command '$name/$time' to '$caller'"; 1448 #warn "registering command '$name/$time' to '$caller'";
1265 1449
1266 push @{ $COMMAND{$name} }, [$caller, $cb]; 1450 push @{ $COMMAND{$name} }, [$caller, $cb];
1267} 1451}
1268 1452
1269=item cf::register_extcmd $name => \&callback($pl,$packet); 1453=item cf::register_extcmd $name => \&callback($pl,@args)
1270 1454
1271Register a callback for execution when the client sends an (synchronous) 1455Register a callback for execution when the client sends an (synchronous)
1272extcmd packet. Ext commands will be processed in the order they are 1456extcmd packet. Ext commands will be processed in the order they are
1273received by the server, like other user commands. The first argument is 1457received by the server, like other user commands. The first argument is
1274the logged-in player. Ext commands can only be processed after a player 1458the logged-in player. Ext commands can only be processed after a player
1275has logged in successfully. 1459has logged in successfully.
1276 1460
1277If the callback returns something, it is sent back as if reply was being 1461The values will be sent back to the client.
1278called.
1279 1462
1463=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1464
1465Same as C<cf::register_extcmd>, but instead of returning values, the
1466callback needs to clal the C<$reply> function.
1467
1280=item cf::register_exticmd $name => \&callback($ns,$packet); 1468=item cf::register_exticmd $name => \&callback($ns,@args)
1281 1469
1282Register a callback for execution when the client sends an (asynchronous) 1470Register a callback for execution when the client sends an (asynchronous)
1283exticmd packet. Exti commands are processed by the server as soon as they 1471exticmd packet. Exti commands are processed by the server as soon as they
1284are received, i.e. out of order w.r.t. other commands. The first argument 1472are received, i.e. out of order w.r.t. other commands. The first argument
1285is a client socket. Exti commands can be received anytime, even before 1473is a client socket. Exti commands can be received anytime, even before
1286log-in. 1474log-in.
1287 1475
1288If the callback returns something, it is sent back as if reply was being 1476The values will be sent back to the client.
1289called.
1290 1477
1291=cut 1478=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1292 1479
1480Same as C<cf::register_extcmd>, but instead of returning values, the
1481callback needs to clal the C<$reply> function.
1482
1483=cut
1484
1293sub register_extcmd { 1485sub register_extcmd($$) {
1294 my ($name, $cb) = @_; 1486 my ($name, $cb) = @_;
1295 1487
1296 $EXTCMD{$name} = $cb; 1488 $EXTCMD{$name} = $cb;
1297} 1489}
1298 1490
1299sub register_exticmd { 1491sub register_async_extcmd($$) {
1300 my ($name, $cb) = @_; 1492 my ($name, $cb) = @_;
1301 1493
1494 $EXTACMD{$name} = $cb;
1495}
1496
1497sub register_exticmd($$) {
1498 my ($name, $cb) = @_;
1499
1302 $EXTICMD{$name} = $cb; 1500 $EXTICMD{$name} = $cb;
1303} 1501}
1304 1502
1503sub register_async_exticmd($$) {
1504 my ($name, $cb) = @_;
1505
1506 $EXTIACMD{$name} = $cb;
1507}
1508
1305use File::Glob (); 1509use File::Glob ();
1306 1510
1307cf::player->attach ( 1511cf::player->attach (
1308 on_command => sub { 1512 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1513 my ($pl, $name, $params) = @_;
1310 1514
1311 my $cb = $COMMAND{$name} 1515 my $cb = $COMMAND{$name}
1312 or return; 1516 or return;
1313 1517
1321 my ($pl, $buf) = @_; 1525 my ($pl, $buf) = @_;
1322 1526
1323 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1527 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1324 1528
1325 if (ref $msg) { 1529 if (ref $msg) {
1326 my ($type, $reply, @payload) = 1530 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1327 "ARRAY" eq ref $msg
1328 ? @$msg
1329 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1330 1531
1331 my @reply;
1332
1333 if (my $cb = $EXTCMD{$type}) { 1532 if (my $cb = $EXTACMD{$type}) {
1533 $cb->(
1534 $pl,
1535 sub {
1536 $pl->ext_msg ("reply-$reply", @_)
1537 if $reply;
1538 },
1539 @payload
1540 );
1541 } else {
1542 my @reply;
1543
1544 if (my $cb = $EXTCMD{$type}) {
1334 @reply = $cb->($pl, @payload); 1545 @reply = $cb->($pl, @payload);
1546 }
1547
1548 $pl->ext_msg ("reply-$reply", @reply)
1549 if $reply;
1335 } 1550 }
1336 1551
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1340 } else { 1552 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1553 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1554 }
1343 1555
1344 cf::override; 1556 cf::override;
1345 }, 1557 },
1346); 1558);
1356 }; 1568 };
1357 1569
1358 $grp 1570 $grp
1359} 1571}
1360 1572
1573sub _ext_cfg_reg($$$$) {
1574 my ($rvar, $varname, $cfgname, $default) = @_;
1575
1576 $cfgname = lc $varname
1577 unless length $cfgname;
1578
1579 $EXT_CFG{$cfgname} = [$rvar, $default];
1580
1581 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1582}
1583
1361sub load_extensions { 1584sub load_extensions {
1585 info "loading extensions...";
1586
1587 %EXT_CFG = ();
1588
1362 cf::sync_job { 1589 cf::sync_job {
1363 my %todo; 1590 my %todo;
1364 1591
1365 for my $path (<$LIBDIR/*.ext>) { 1592 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1593 next unless -r $path;
1384 1611
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1612 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1613 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1614
1388 $ext{source} = 1615 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1616 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1617 . "#line 1 \"$path\"\n{\n"
1391 . $source 1618 . $source
1392 . "\n};\n1"; 1619 . "\n};\n1";
1393 1620
1394 $todo{$base} = \%ext; 1621 $todo{$base} = \%ext;
1395 } 1622 }
1396 1623
1624 my $pass = 0;
1397 my %done; 1625 my %done;
1398 while (%todo) { 1626 while (%todo) {
1399 my $progress; 1627 my $progress;
1400 1628
1629 ++$pass;
1630
1631 ext:
1401 while (my ($k, $v) = each %todo) { 1632 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1633 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1634 next ext
1404 unless exists $done{$_}; 1635 unless exists $done{$_};
1405 } 1636 }
1406 1637
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1638 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1639
1409 unless (eval $v->{source}) { 1640 my $source = $v->{source};
1641
1642 # support "CONF varname :confname = default" pseudo-statements
1643 $source =~ s{
1644 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1645 }{
1646 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1647 }gmxe;
1648
1649 my $active = eval $source;
1650
1651 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1652 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1653
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1654 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1655 if exists $v->{meta}{mandatory};
1417 1656
1418 warn $msg; 1657 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1658 delete $todo{$k};
1659 } else {
1660 $done{$k} = delete $todo{$k};
1661 push @EXTS, $v->{pkg};
1662 $progress = 1;
1663
1664 info "$v->{base}: extension inactive.\n"
1665 unless $active;
1419 } 1666 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1667 }
1425 1668
1426 skip: 1669 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1670 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1671
1672 while (my ($k, $v) = each %todo) {
1673 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1674 if exists $v->{meta}{mandatory};
1675 }
1676
1677 last;
1678 }
1429 } 1679 }
1430 }; 1680 };
1431} 1681}
1432 1682
1433############################################################################# 1683#############################################################################
1517 $cf::PLAYER{$login} = $pl 1767 $cf::PLAYER{$login} = $pl
1518 } 1768 }
1519 } 1769 }
1520} 1770}
1521 1771
1772cf::player->attach (
1773 on_load => sub {
1774 my ($pl, $path) = @_;
1775
1776 # restore slots saved in save, below
1777 my $slots = delete $pl->{_slots};
1778
1779 $pl->ob->current_weapon ($slots->[0]);
1780 $pl->combat_ob ($slots->[1]);
1781 $pl->ranged_ob ($slots->[2]);
1782 },
1783);
1784
1522sub save($) { 1785sub save($) {
1523 my ($pl) = @_; 1786 my ($pl) = @_;
1524 1787
1525 return if $pl->{deny_save}; 1788 return if $pl->{deny_save};
1526 1789
1531 1794
1532 aio_mkdir playerdir $pl, 0770; 1795 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1796 $pl->{last_save} = $cf::RUNTIME;
1534 1797
1535 cf::get_slot 0.01; 1798 cf::get_slot 0.01;
1799
1800 # save slots, to be restored later
1801 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1802
1537 $pl->save_pl ($path); 1803 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1804 cf::cede_to_tick;
1539} 1805}
1540 1806
1574 my $name = $pl->ob->name; 1840 my $name = $pl->ob->name;
1575 1841
1576 $pl->{deny_save} = 1; 1842 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1843 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1844
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1845 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1846 $pl->deactivate;
1847
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1848 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1849 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1850 ext::highscore::check ($pl->ob);
1851
1584 $pl->ns->destroy if $pl->ns; 1852 $pl->ns->destroy if $pl->ns;
1585 1853
1586 my $path = playerdir $pl; 1854 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1855 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1856 aio_rename $path, $temp;
1642 \@logins 1910 \@logins
1643} 1911}
1644 1912
1645=item $player->maps 1913=item $player->maps
1646 1914
1915=item cf::player::maps $login
1916
1647Returns an arrayref of map paths that are private for this 1917Returns an arrayref of map paths that are private for this
1648player. May block. 1918player. May block.
1649 1919
1650=cut 1920=cut
1651 1921
1672 1942
1673=item $protocol_xml = $player->expand_cfpod ($cfpod) 1943=item $protocol_xml = $player->expand_cfpod ($cfpod)
1674 1944
1675Expand deliantra pod fragments into protocol xml. 1945Expand deliantra pod fragments into protocol xml.
1676 1946
1677=item $player->ext_reply ($msgid, @msg)
1678
1679Sends an ext reply to the player.
1680
1681=cut
1682
1683sub ext_reply($$@) {
1684 my ($self, $id, @msg) = @_;
1685
1686 $self->ns->ext_reply ($id, @msg)
1687}
1688
1689=item $player->ext_msg ($type, @msg) 1947=item $player->ext_msg ($type, @msg)
1690 1948
1691Sends an ext event to the client. 1949Sends an ext event to the client.
1692 1950
1693=cut 1951=cut
1712 1970
1713=cut 1971=cut
1714 1972
1715sub find_by_path($) { 1973sub find_by_path($) {
1716 my ($path) = @_; 1974 my ($path) = @_;
1975
1976 $path =~ s/^~[^\/]*//; # skip ~login
1717 1977
1718 my ($match, $specificity); 1978 my ($match, $specificity);
1719 1979
1720 for my $region (list) { 1980 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1981 if ($region->{match} && $path =~ $region->{match}) {
1750sub generate_random_map { 2010sub generate_random_map {
1751 my ($self, $rmp) = @_; 2011 my ($self, $rmp) = @_;
1752 2012
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2013 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 2014
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 2015 $self->_create_random_map ($rmp);
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767 (cf::region::find $rmp->{region}), $rmp->{custom}
1768 )
1769} 2016}
1770 2017
1771=item cf::map->register ($regex, $prio) 2018=item cf::map->register ($regex, $prio)
1772 2019
1773Register a handler for the map path matching the given regex at the 2020Register a handler for the map path matching the given regex at the
1778 2025
1779sub register { 2026sub register {
1780 my (undef, $regex, $prio) = @_; 2027 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 2028 my $pkg = caller;
1782 2029
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 2030 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 2031
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2032 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 2033}
1788 2034
1789# also paths starting with '/' 2035# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2036$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 2037
1792sub thawer_merge { 2038sub thawer_merge {
1793 my ($self, $merge) = @_; 2039 my ($self, $merge) = @_;
1794 2040
1795 # we have to keep some variables in memory intact 2041 # we have to keep some variables in memory intact
1800} 2046}
1801 2047
1802sub normalise { 2048sub normalise {
1803 my ($path, $base) = @_; 2049 my ($path, $base) = @_;
1804 2050
1805 $path = "$path"; # make sure its a string 2051 $path = "$path"; # make sure it's a string
1806 2052
1807 $path =~ s/\.map$//; 2053 $path =~ s/\.map$//;
1808 2054
1809 # map plan: 2055 # map plan:
1810 # 2056 #
1825 $base =~ s{[^/]+/?$}{}; 2071 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 2072 $path = "$base/$path";
1827 } 2073 }
1828 2074
1829 for ($path) { 2075 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 2076 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 2077 redo if s{/[^/]+/\.\./}{/};
1833 } 2078 }
1834 2079
1835 $path 2080 $path
1849 $self->init; # pass $1 etc. 2094 $self->init; # pass $1 etc.
1850 return $self; 2095 return $self;
1851 } 2096 }
1852 } 2097 }
1853 2098
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2099 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 2100 ()
1856} 2101}
1857 2102
2103# may re-bless or do other evil things
1858sub init { 2104sub init {
1859 my ($self) = @_; 2105 my ($self) = @_;
1860 2106
1861 $self 2107 $self
1862} 2108}
1927 $self->{load_path} = $path; 2173 $self->{load_path} = $path;
1928 2174
1929 1 2175 1
1930} 2176}
1931 2177
2178# used to laod the header of an original map
1932sub load_header_orig { 2179sub load_header_orig {
1933 my ($self) = @_; 2180 my ($self) = @_;
1934 2181
1935 $self->load_header_from ($self->load_path) 2182 $self->load_header_from ($self->load_path)
1936} 2183}
1937 2184
2185# used to laod the header of an instantiated map
1938sub load_header_temp { 2186sub load_header_temp {
1939 my ($self) = @_; 2187 my ($self) = @_;
1940 2188
1941 $self->load_header_from ($self->save_path) 2189 $self->load_header_from ($self->save_path)
1942} 2190}
1943 2191
2192# called after loading the header from an instantiated map
1944sub prepare_temp { 2193sub prepare_temp {
1945 my ($self) = @_; 2194 my ($self) = @_;
1946 2195
1947 $self->last_access ((delete $self->{last_access}) 2196 $self->last_access ((delete $self->{last_access})
1948 || $cf::RUNTIME); #d# 2197 || $cf::RUNTIME); #d#
1949 # safety 2198 # safety
1950 $self->{instantiate_time} = $cf::RUNTIME 2199 $self->{instantiate_time} = $cf::RUNTIME
1951 if $self->{instantiate_time} > $cf::RUNTIME; 2200 if $self->{instantiate_time} > $cf::RUNTIME;
1952} 2201}
1953 2202
2203# called after loading the header from an original map
1954sub prepare_orig { 2204sub prepare_orig {
1955 my ($self) = @_; 2205 my ($self) = @_;
1956 2206
1957 $self->{load_original} = 1; 2207 $self->{load_original} = 1;
1958 $self->{instantiate_time} = $cf::RUNTIME; 2208 $self->{instantiate_time} = $cf::RUNTIME;
1982 2232
1983sub find; 2233sub find;
1984sub find { 2234sub find {
1985 my ($path, $origin) = @_; 2235 my ($path, $origin) = @_;
1986 2236
2237 cf::cede_to_tick;
2238
1987 $path = normalise $path, $origin && $origin->path; 2239 $path = normalise $path, $origin;
1988 2240
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2241 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2242 my $guard2 = cf::lock_acquire "map_find:$path";
1991 2243
1992 $cf::MAP{$path} || do { 2244 $cf::MAP{$path} || do {
2023 2275
2024 { 2276 {
2025 my $guard = cf::lock_acquire "map_data:$path"; 2277 my $guard = cf::lock_acquire "map_data:$path";
2026 2278
2027 return unless $self->valid; 2279 return unless $self->valid;
2028 return unless $self->in_memory == cf::MAP_SWAPPED; 2280 return unless $self->state == cf::MAP_SWAPPED;
2029
2030 $self->in_memory (cf::MAP_LOADING);
2031 2281
2032 $self->alloc; 2282 $self->alloc;
2033 2283
2034 $self->pre_load; 2284 $self->pre_load;
2035 cf::cede_to_tick; 2285 cf::cede_to_tick;
2036 2286
2287 if (exists $self->{load_path}) {
2037 my $f = new_from_file cf::object::thawer $self->{load_path}; 2288 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block; 2289 $f->skip_block;
2039 $self->_load_objects ($f) 2290 $self->_load_objects ($f)
2040 or return; 2291 or return;
2041 2292
2042 $self->post_load_original 2293 $self->post_load_original
2043 if delete $self->{load_original}; 2294 if delete $self->{load_original};
2044 2295
2045 if (my $uniq = $self->uniq_path) { 2296 if (my $uniq = $self->uniq_path) {
2046 utf8::encode $uniq; 2297 utf8::encode $uniq;
2047 unless (aio_stat $uniq) { 2298 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) { 2299 if (my $f = new_from_file cf::object::thawer $uniq) {
2049 $self->clear_unique_items; 2300 $self->clear_unique_items;
2050 $self->_load_objects ($f); 2301 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs; 2302 $f->resolve_delayed_derefs;
2303 }
2052 } 2304 }
2053 } 2305 }
2054 }
2055 2306
2056 $f->resolve_delayed_derefs; 2307 $f->resolve_delayed_derefs;
2308 } else {
2309 $self->post_load_original
2310 if delete $self->{load_original};
2311 }
2312
2313 $self->state (cf::MAP_INACTIVE);
2057 2314
2058 cf::cede_to_tick; 2315 cf::cede_to_tick;
2059 # now do the right thing for maps 2316 # now do the right thing for maps
2060 $self->link_multipart_objects; 2317 $self->link_multipart_objects;
2061 $self->difficulty ($self->estimate_difficulty) 2318 $self->difficulty ($self->estimate_difficulty)
2065 unless ($self->{deny_activate}) { 2322 unless ($self->{deny_activate}) {
2066 $self->decay_objects; 2323 $self->decay_objects;
2067 $self->fix_auto_apply; 2324 $self->fix_auto_apply;
2068 $self->update_buttons; 2325 $self->update_buttons;
2069 cf::cede_to_tick; 2326 cf::cede_to_tick;
2070 $self->activate; 2327 #$self->activate; # no longer activate maps automatically
2071 } 2328 }
2072 2329
2073 $self->{last_save} = $cf::RUNTIME; 2330 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2331 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2332 }
2078 2333
2079 $self->post_load; 2334 $self->post_load;
2080}
2081 2335
2336 1
2337}
2338
2339# customize the map for a given player, i.e.
2340# return the _real_ map. used by e.g. per-player
2341# maps to change the path to ~playername/mappath
2082sub customise_for { 2342sub customise_for {
2083 my ($self, $ob) = @_; 2343 my ($self, $ob) = @_;
2084 2344
2085 return find "~" . $ob->name . "/" . $self->{path} 2345 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2346 if $self->per_player;
2089# if $self->per_party; 2349# if $self->per_party;
2090 2350
2091 $self 2351 $self
2092} 2352}
2093 2353
2094# find and load all maps in the 3x3 area around a map
2095sub load_neighbours {
2096 my ($map) = @_;
2097
2098 my @neigh; # diagonal neighbours
2099
2100 for (0 .. 3) {
2101 my $neigh = $map->tile_path ($_)
2102 or next;
2103 $neigh = find $neigh, $map
2104 or next;
2105 $neigh->load;
2106
2107 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 }
2111
2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
2114 my $neigh = find $path, $origin
2115 or next;
2116 $neigh->load;
2117 }
2118}
2119
2120sub find_sync { 2354sub find_sync {
2121 my ($path, $origin) = @_; 2355 my ($path, $origin) = @_;
2122 2356
2123 cf::sync_job { find $path, $origin } 2357 # it's a bug to call this from the main context
2358 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2359 if $Coro::current == $Coro::main;
2360
2361 find $path, $origin
2124} 2362}
2125 2363
2126sub do_load_sync { 2364sub do_load_sync {
2127 my ($map) = @_; 2365 my ($map) = @_;
2128 2366
2367 # it's a bug to call this from the main context
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2368 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2369 if $Coro::current == $Coro::main;
2131 2370
2132 cf::sync_job { $map->load }; 2371 $map->load;
2133} 2372}
2134 2373
2135our %MAP_PREFETCH; 2374our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2375our $MAP_PREFETCHER = undef;
2137 2376
2138sub find_async { 2377sub find_async {
2139 my ($path, $origin, $load) = @_; 2378 my ($path, $origin, $load) = @_;
2140 2379
2141 $path = normalise $path, $origin && $origin->{path}; 2380 $path = normalise $path, $origin;
2142 2381
2143 if (my $map = $cf::MAP{$path}) { 2382 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2383 return $map if !$load || $map->linkable;
2145 } 2384 }
2146 2385
2147 $MAP_PREFETCH{$path} |= $load; 2386 $MAP_PREFETCH{$path} |= $load;
2148 2387
2149 $MAP_PREFETCHER ||= cf::async { 2388 $MAP_PREFETCHER ||= cf::async {
2163 $MAP_PREFETCHER->prio (6); 2402 $MAP_PREFETCHER->prio (6);
2164 2403
2165 () 2404 ()
2166} 2405}
2167 2406
2407# common code, used by both ->save and ->swapout
2168sub save { 2408sub _save {
2169 my ($self) = @_; 2409 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2410
2173 $self->{last_save} = $cf::RUNTIME; 2411 $self->{last_save} = $cf::RUNTIME;
2174 2412
2175 return unless $self->dirty; 2413 return unless $self->dirty;
2176 2414
2196 } else { 2434 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2435 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2436 }
2199} 2437}
2200 2438
2439sub save {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 $self->_save;
2445}
2446
2201sub swap_out { 2447sub swap_out {
2202 my ($self) = @_; 2448 my ($self) = @_;
2203 2449
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2450 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2451
2452 return if !$self->linkable;
2453 return if $self->{deny_save};
2209 return if $self->players; 2454 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2455
2456 # first deactivate the map and "unlink" it from the core
2457 $self->deactivate;
2458 $_->clear_links_to ($self) for values %cf::MAP;
2459 $self->state (cf::MAP_SWAPPED);
2460
2461 # then atomically save
2462 $self->_save;
2463
2464 # then free the map
2465 $self->clear;
2466}
2467
2468sub reset_at {
2469 my ($self) = @_;
2470
2471 # TODO: safety, remove and allow resettable per-player maps
2211 return if $self->{deny_save}; 2472 return 1e99 if $self->{deny_reset};
2212 2473
2474 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2475 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2476
2477 $time + $to
2478}
2479
2480sub should_reset {
2481 my ($self) = @_;
2482
2483 $self->reset_at <= $cf::RUNTIME
2484}
2485
2486sub reset {
2487 my ($self) = @_;
2488
2489 my $lock = cf::lock_acquire "map_data:$self->{path}";
2490
2491 return if $self->players;
2492
2493 cf::trace "resetting map ", $self->path, "\n";
2494
2213 $self->in_memory (cf::MAP_SWAPPED); 2495 $self->state (cf::MAP_SWAPPED);
2496
2497 # need to save uniques path
2498 unless ($self->{deny_save}) {
2499 my $uniq = $self->uniq_path; utf8::encode $uniq;
2500
2501 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2502 if $uniq;
2503 }
2504
2505 delete $cf::MAP{$self->path};
2214 2506
2215 $self->deactivate; 2507 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2508 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2509 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2510
2263 $self->unlink_save; 2511 $self->unlink_save;
2264 $self->destroy; 2512 $self->destroy;
2265} 2513}
2266 2514
2274 2522
2275 delete $cf::MAP{$self->path}; 2523 delete $cf::MAP{$self->path};
2276 2524
2277 $self->unlink_save; 2525 $self->unlink_save;
2278 2526
2279 bless $self, "cf::map"; 2527 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2528 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2529 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2530 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2531 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2532
2514 2762
2515Freezes the player and moves him/her to a special map (C<{link}>). 2763Freezes the player and moves him/her to a special map (C<{link}>).
2516 2764
2517The player should be reasonably safe there for short amounts of time (e.g. 2765The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2766for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2767though, as the player cannot control the character while it is on the link
2520map. 2768map.
2521 2769
2522Will never block. 2770Will never block.
2523 2771
2524=item $player_object->leave_link ($map, $x, $y) 2772=item $player_object->leave_link ($map, $x, $y)
2545sub cf::object::player::enter_link { 2793sub cf::object::player::enter_link {
2546 my ($self) = @_; 2794 my ($self) = @_;
2547 2795
2548 $self->deactivate_recursive; 2796 $self->deactivate_recursive;
2549 2797
2798 ++$self->{_link_recursion};
2799
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2800 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2801
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2802 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2803 if $self->map && $self->map->{path} ne "{link}";
2554 2804
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2805 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2806}
2557 2807
2558sub cf::object::player::leave_link { 2808sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2809 my ($self, $map, $x, $y) = @_;
2560 2810
2580 # use -1 or undef as default coordinates, not 0, 0 2830 # use -1 or undef as default coordinates, not 0, 0
2581 ($x, $y) = ($map->enter_x, $map->enter_y) 2831 ($x, $y) = ($map->enter_x, $map->enter_y)
2582 if $x <= 0 && $y <= 0; 2832 if $x <= 0 && $y <= 0;
2583 2833
2584 $map->load; 2834 $map->load;
2585 $map->load_neighbours;
2586 2835
2587 return unless $self->contr->active; 2836 return unless $self->contr->active;
2588 2837
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2838 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2839 if ($self->enter_map ($map, $x, $y)) {
2591 2840 # entering was successful
2841 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2842 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2843 $self->activate_recursive;
2594} 2844 }
2595 2845
2846}
2847
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2848=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2849
2598Moves the player to the given map-path and coordinates by first freezing 2850Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2851her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2852that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2853the new (success) or old (failed) map position. In either case, $done will
2608 2860
2609our $GOTOGEN; 2861our $GOTOGEN;
2610 2862
2611sub cf::object::player::goto { 2863sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2864 my ($self, $path, $x, $y, $check, $done) = @_;
2865
2866 if ($self->{_link_recursion} >= $MAX_LINKS) {
2867 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2868 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2869 ($path, $x, $y) = @$EMERGENCY_POSITION;
2870 }
2613 2871
2614 # do generation counting so two concurrent goto's will be executed in-order 2872 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2873 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2874
2617 $self->enter_link; 2875 $self->enter_link;
2637 ($path, $x, $y) = (undef, undef, undef); 2895 ($path, $x, $y) = (undef, undef, undef);
2638 } 2896 }
2639 } 2897 }
2640 2898
2641 my $map = eval { 2899 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2900 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2643 2901
2644 if ($map) { 2902 if ($map) {
2645 $map = $map->customise_for ($self); 2903 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2904 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2905 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2906 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2907 }
2650 2908
2651 $map 2909 $map
2659 if ($gen == $self->{_goto_generation}) { 2917 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2918 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2919 $self->leave_link ($map, $x, $y);
2662 } 2920 }
2663 2921
2664 $done->() if $done; 2922 $done->($self) if $done;
2665 })->prio (1); 2923 })->prio (1);
2666} 2924}
2667 2925
2668=item $player_object->enter_exit ($exit_object) 2926=item $player_object->enter_exit ($exit_object)
2669 2927
2737 $Coro::current->{desc} = "enter_exit"; 2995 $Coro::current->{desc} = "enter_exit";
2738 2996
2739 unless (eval { 2997 unless (eval {
2740 $self->deactivate_recursive; # just to be sure 2998 $self->deactivate_recursive; # just to be sure
2741 2999
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3000 my $map = cf::map::normalise $exit->slaying, $exit->map;
2751 my $x = $exit->stats->hp; 3001 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp; 3002 my $y = $exit->stats->sp;
3003
3004 # special map handling
3005 my $slaying = $exit->slaying;
3006
3007 # special map handling
3008 if ($slaying eq "/!") {
3009 my $guard = cf::lock_acquire "exit_prepare:$exit";
3010
3011 prepare_random_map $exit
3012 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3013
3014 $map = $exit->slaying;
3015
3016 } elsif ($slaying eq '!up') {
3017 $map = $exit->map->tile_path (cf::TILE_UP);
3018 $x = $exit->x;
3019 $y = $exit->y;
3020
3021 } elsif ($slaying eq '!down') {
3022 $map = $exit->map->tile_path (cf::TILE_DOWN);
3023 $x = $exit->x;
3024 $y = $exit->y;
3025 }
2753 3026
2754 $self->goto ($map, $x, $y); 3027 $self->goto ($map, $x, $y);
2755 3028
2756 # if exit is damned, update players death & WoR home-position 3029 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y) 3030 $self->contr->savebed ($map, $x, $y)
2762 $self->message ("Something went wrong deep within the deliantra server. " 3035 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "I'll try to bring you back to the map you were before. " 3036 . "I'll try to bring you back to the map you were before. "
2764 . "Please report this to the dungeon master!", 3037 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 3038 cf::NDI_UNIQUE | cf::NDI_RED);
2766 3039
2767 warn "ERROR in enter_exit: $@"; 3040 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 3041 $self->leave_link;
2769 } 3042 }
2770 })->prio (1); 3043 })->prio (1);
2771} 3044}
2772 3045
2982=cut 3255=cut
2983 3256
2984sub cf::client::ext_msg($$@) { 3257sub cf::client::ext_msg($$@) {
2985 my ($self, $type, @msg) = @_; 3258 my ($self, $type, @msg) = @_;
2986 3259
2987 if ($self->extcmd == 2) {
2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3260 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2989 } elsif ($self->extcmd == 1) { # TODO: remove
2990 push @msg, msgtype => "event_$type";
2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2992 }
2993}
2994
2995=item $client->ext_reply ($msgid, @msg)
2996
2997Sends an ext reply to the client.
2998
2999=cut
3000
3001sub cf::client::ext_reply($$@) {
3002 my ($self, $id, @msg) = @_;
3003
3004 if ($self->extcmd == 2) {
3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3006 } elsif ($self->extcmd == 1) {
3007 #TODO: version 1, remove
3008 unshift @msg, msgtype => "reply", msgid => $id;
3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3010 }
3011} 3261}
3012 3262
3013=item $success = $client->query ($flags, "text", \&cb) 3263=item $success = $client->query ($flags, "text", \&cb)
3014 3264
3015Queues a query to the client, calling the given callback with 3265Queues a query to the client, calling the given callback with
3070 my ($ns, $buf) = @_; 3320 my ($ns, $buf) = @_;
3071 3321
3072 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3322 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3073 3323
3074 if (ref $msg) { 3324 if (ref $msg) {
3075 my ($type, $reply, @payload) = 3325 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3076 "ARRAY" eq ref $msg
3077 ? @$msg
3078 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3079 3326
3080 my @reply;
3081
3082 if (my $cb = $EXTICMD{$type}) { 3327 if (my $cb = $EXTIACMD{$type}) {
3328 $cb->(
3329 $ns,
3330 sub {
3331 $ns->ext_msg ("reply-$reply", @_)
3332 if $reply;
3333 },
3334 @payload
3335 );
3336 } else {
3337 my @reply;
3338
3339 if (my $cb = $EXTICMD{$type}) {
3083 @reply = $cb->($ns, @payload); 3340 @reply = $cb->($ns, @payload);
3341 }
3342
3343 $ns->ext_msg ("reply-$reply", @reply)
3344 if $reply;
3084 } 3345 }
3085
3086 $ns->ext_reply ($reply, @reply)
3087 if $reply;
3088
3089 } else { 3346 } else {
3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3347 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091 } 3348 }
3092 3349
3093 cf::override; 3350 cf::override;
3094 }, 3351 },
3095); 3352);
3115 3372
3116 $coro 3373 $coro
3117} 3374}
3118 3375
3119cf::client->attach ( 3376cf::client->attach (
3120 on_destroy => sub { 3377 on_client_destroy => sub {
3121 my ($ns) = @_; 3378 my ($ns) = @_;
3122 3379
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3380 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3381 },
3125); 3382);
3176 decrease split destroy change_exp value msg lore send_msg)], 3433 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3434 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3435 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3436 ["cf::map" => qw(trigger)],
3180) { 3437) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3438 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3439 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3440 for @funs;
3185} 3441}
3186 3442
3225 local @cf::_safe_eval_args = values %vars; 3481 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval; 3482 @res = wantarray ? eval eval : scalar eval $eval;
3227 } 3483 }
3228 3484
3229 if ($@) { 3485 if ($@) {
3230 warn "$@"; 3486 warn "$@",
3231 warn "while executing safe code '$code'\n"; 3487 "while executing safe code '$code'\n",
3232 warn "with arguments " . (join " ", %vars) . "\n"; 3488 "with arguments " . (join " ", %vars) . "\n";
3233 } 3489 }
3234 3490
3235 wantarray ? @res : $res[0] 3491 wantarray ? @res : $res[0]
3236} 3492}
3237 3493
3262=cut 3518=cut
3263 3519
3264############################################################################# 3520#############################################################################
3265# the server's init and main functions 3521# the server's init and main functions
3266 3522
3523our %FACEHASH; # hash => idx, #d# HACK for http server
3524
3525# internal api, not fianlised
3526sub set_face {
3527 my ($name, $type, $data) = @_;
3528
3529 my $idx = cf::face::find $name;
3530
3531 if ($idx) {
3532 delete $FACEHASH{cf::face::get_chksum $idx};
3533 } else {
3534 $idx = cf::face::alloc $name;
3535 }
3536
3537 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3538
3539 cf::face::set_type $idx, $type;
3540 cf::face::set_data $idx, 0, $data, $hash;
3541 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3542 $FACEHASH{$hash} = $idx;#d#
3543
3544 $idx
3545}
3546
3267sub load_facedata($) { 3547sub load_facedata($) {
3268 my ($path) = @_; 3548 my ($path) = @_;
3269 3549
3270 # HACK to clear player env face cache, we need some signal framework 3550 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3551 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3553
3274 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3554 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275 3555
3276 warn "loading facedata from $path\n"; 3556 trace "loading facedata from $path\n";
3277 3557
3278 my $facedata; 3558 my $facedata = decode_storable load_file $path;
3279 0 < aio_load $path, $facedata
3280 or die "$path: $!";
3281
3282 $facedata = Coro::Storable::thaw $facedata;
3283 3559
3284 $facedata->{version} == 2 3560 $facedata->{version} == 2
3285 or cf::cleanup "$path: version mismatch, cannot proceed."; 3561 or cf::cleanup "$path: version mismatch, cannot proceed.";
3286 3562
3287 # patch in the exptable
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3289 $facedata->{resource}{"res/exp_table"} = {
3290 type => FT_RSRC,
3291 data => $exp_table,
3292 hash => (Digest::MD5::md5 $exp_table),
3293 };
3294 cf::cede_to_tick; 3563 cf::cede_to_tick;
3295 3564
3296 { 3565 {
3297 my $faces = $facedata->{faceinfo}; 3566 my $faces = delete $facedata->{faceinfo};
3298 3567
3299 while (my ($face, $info) = each %$faces) { 3568 for my $face (sort keys %$faces) {
3569 my $info = $faces->{$face};
3300 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3570 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3301 3571
3302 cf::face::set_visibility $idx, $info->{visibility}; 3572 cf::face::set_visibility $idx, $info->{visibility};
3303 cf::face::set_magicmap $idx, $info->{magicmap}; 3573 cf::face::set_magicmap $idx, $info->{magicmap};
3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3574 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3575 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3306 3576 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3577 $FACEHASH{$info->{hash64}} = $idx;#d#
3578
3307 cf::cede_to_tick; 3579 cf::cede_to_tick;
3308 } 3580 }
3309 3581
3310 while (my ($face, $info) = each %$faces) { 3582 while (my ($face, $info) = each %$faces) {
3311 next unless $info->{smooth}; 3583 next unless $info->{smooth};
3315 3587
3316 if (my $smooth = cf::face::find $info->{smooth}) { 3588 if (my $smooth = cf::face::find $info->{smooth}) {
3317 cf::face::set_smooth $idx, $smooth; 3589 cf::face::set_smooth $idx, $smooth;
3318 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3590 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3319 } else { 3591 } else {
3320 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3592 error "smooth face '$info->{smooth}' not found for face '$face'";
3321 } 3593 }
3322 3594
3323 cf::cede_to_tick; 3595 cf::cede_to_tick;
3324 } 3596 }
3325 } 3597 }
3326 3598
3327 { 3599 {
3328 my $anims = $facedata->{animinfo}; 3600 my $anims = delete $facedata->{animinfo};
3329 3601
3330 while (my ($anim, $info) = each %$anims) { 3602 while (my ($anim, $info) = each %$anims) {
3331 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3603 cf::anim::set $anim, $info->{frames}, $info->{facings};
3332 cf::cede_to_tick; 3604 cf::cede_to_tick;
3333 } 3605 }
3334 3606
3335 cf::anim::invalidate_all; # d'oh 3607 cf::anim::invalidate_all; # d'oh
3336 } 3608 }
3337 3609
3338 { 3610 {
3339 my $res = $facedata->{resource}; 3611 my $res = delete $facedata->{resource};
3340 3612
3341 while (my ($name, $info) = each %$res) { 3613 while (my ($name, $info) = each %$res) {
3342 if (defined $info->{type}) { 3614 if (defined (my $type = $info->{type})) {
3615 # TODO: different hash - must free and use new index, or cache ixface data queue
3343 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3616 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3344 3617
3618 cf::face::set_type $idx, $type;
3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3619 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3346 cf::face::set_type $idx, $info->{type}; 3620 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3621 $FACEHASH{$info->{hash}} = $idx;#d#
3347 } else { 3622 } else {
3348 $RESOURCE{$name} = $info; 3623# $RESOURCE{$name} = $info; # unused
3349 } 3624 }
3350 3625
3351 cf::cede_to_tick; 3626 cf::cede_to_tick;
3352 } 3627 }
3353 } 3628 }
3354 3629
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3630 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3356 3631
3357 1 3632 1
3358} 3633}
3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3379 3634
3380register_exticmd fx_want => sub { 3635register_exticmd fx_want => sub {
3381 my ($ns, $want) = @_; 3636 my ($ns, $want) = @_;
3382 3637
3383 while (my ($k, $v) = each %$want) { 3638 while (my ($k, $v) = each %$want) {
3391 my $status = load_resource_file_ $_[0]; 3646 my $status = load_resource_file_ $_[0];
3392 get_slot 0.1, 100; 3647 get_slot 0.1, 100;
3393 cf::arch::commit_load; 3648 cf::arch::commit_load;
3394 3649
3395 $status 3650 $status
3651}
3652
3653sub reload_exp_table {
3654 _reload_exp_table;
3655
3656 set_face "res/exp_table" => FT_RSRC,
3657 JSON::XS->new->utf8->canonical->encode (
3658 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3659 );
3660}
3661
3662sub reload_materials {
3663 _reload_materials;
3396} 3664}
3397 3665
3398sub reload_regions { 3666sub reload_regions {
3399 # HACK to clear player env face cache, we need some signal framework 3667 # HACK to clear player env face cache, we need some signal framework
3400 # for this (global event?) 3668 # for this (global event?)
3415} 3683}
3416 3684
3417sub reload_archetypes { 3685sub reload_archetypes {
3418 load_resource_file "$DATADIR/archetypes" 3686 load_resource_file "$DATADIR/archetypes"
3419 or die "unable to load archetypes\n"; 3687 or die "unable to load archetypes\n";
3688
3689 set_face "res/skill_info" => FT_RSRC,
3690 JSON::XS->new->utf8->canonical->encode (
3691 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3692 );
3693 set_face "res/spell_paths" => FT_RSRC,
3694 JSON::XS->new->utf8->canonical->encode (
3695 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3696 );
3420} 3697}
3421 3698
3422sub reload_treasures { 3699sub reload_treasures {
3423 load_resource_file "$DATADIR/treasures" 3700 load_resource_file "$DATADIR/treasures"
3424 or die "unable to load treasurelists\n"; 3701 or die "unable to load treasurelists\n";
3425} 3702}
3426 3703
3704sub reload_sound {
3705 trace "loading sound config from $DATADIR/sound\n";
3706
3707 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3708
3709 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3710 my $sound = $soundconf->{compat}[$_]
3711 or next;
3712
3713 my $face = cf::face::find "sound/$sound->[1]";
3714 cf::sound::set $sound->[0] => $face;
3715 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3716 }
3717
3718 while (my ($k, $v) = each %{$soundconf->{event}}) {
3719 my $face = cf::face::find "sound/$v";
3720 cf::sound::set $k => $face;
3721 }
3722}
3723
3427sub reload_resources { 3724sub reload_resources {
3428 warn "reloading resource files...\n"; 3725 trace "reloading resource files...\n";
3429 3726
3727 reload_materials;
3430 reload_facedata; 3728 reload_facedata;
3729 reload_exp_table;
3730 reload_sound;
3431 reload_archetypes; 3731 reload_archetypes;
3432 reload_regions; 3732 reload_regions;
3433 reload_treasures; 3733 reload_treasures;
3434 3734
3435 warn "finished reloading resource files\n"; 3735 trace "finished reloading resource files\n";
3436} 3736}
3437 3737
3438sub reload_config { 3738sub reload_config {
3439 warn "reloading config file...\n"; 3739 trace "reloading config file...\n";
3440 3740
3441 open my $fh, "<:utf8", "$CONFDIR/config" 3741 my $config = load_file "$CONFDIR/config";
3442 or return; 3742 utf8::decode $config;
3743 *CFG = decode_yaml $config;
3443 3744
3444 local $/;
3445 *CFG = YAML::XS::Load scalar <$fh>;
3446
3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3745 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3448 3746
3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3747 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3748 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3451 3749
3452 if (exists $CFG{mlockall}) { 3750 if (exists $CFG{mlockall}) {
3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3752 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3455 and die "WARNING: m(un)lockall failed: $!\n"; 3753 and die "WARNING: m(un)lockall failed: $!\n";
3456 }; 3754 };
3457 warn $@ if $@; 3755 warn $@ if $@;
3458 } 3756 }
3459
3460 warn "finished reloading resource files\n";
3461} 3757}
3462 3758
3463sub pidfile() { 3759sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3760 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!"; 3761 or die "$PIDFILE: $!";
3478 seek $fh, 0, 0; 3774 seek $fh, 0, 0;
3479 print $fh $$; 3775 print $fh $$;
3480} 3776}
3481 3777
3482sub main_loop { 3778sub main_loop {
3483 warn "EV::loop starting\n"; 3779 trace "EV::loop starting\n";
3484 if (1) { 3780 if (1) {
3485 EV::loop; 3781 EV::loop;
3486 } 3782 }
3487 warn "EV::loop returned\n"; 3783 trace "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP; 3784 goto &main_loop unless $REALLY_UNLOOP;
3489} 3785}
3490 3786
3491sub main { 3787sub main {
3492 cf::init_globals; # initialise logging 3788 cf::init_globals; # initialise logging
3493 3789
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3790 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3791 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3792 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3793 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498 3794
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503
3504 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3795 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3505 3796
3506 # we must not ever block the main coroutine 3797 # we must not ever block the main coroutine
3507 local $Coro::idle = sub { 3798 $Coro::idle = sub {
3508 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3799 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3509 (async { 3800 (async {
3510 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3801 $Coro::current->{desc} = "IDLE BUG HANDLER";
3511 EV::loop EV::LOOP_ONESHOT; 3802 EV::loop EV::LOOP_ONESHOT;
3512 })->prio (Coro::PRIO_MAX); 3803 })->prio (Coro::PRIO_MAX);
3513 }; 3804 };
3514 3805
3515 evthread_start IO::AIO::poll_fileno; 3806 evthread_start IO::AIO::poll_fileno;
3516 3807
3517 cf::sync_job { 3808 cf::sync_job {
3809 cf::incloader::init ();
3810
3811 db_init;
3812
3813 cf::init_anim;
3814 cf::init_attackmess;
3815 cf::init_dynamic;
3816
3518 cf::load_settings; 3817 cf::load_settings;
3519 cf::load_materials;
3520 3818
3521 reload_resources; 3819 reload_resources;
3522 reload_config; 3820 reload_config;
3523 db_init;
3524 3821
3525 cf::init_uuid; 3822 cf::init_uuid;
3526 cf::init_signals; 3823 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills; 3824 cf::init_skills;
3529 3825
3530 cf::init_beforeplay; 3826 cf::init_beforeplay;
3531 3827
3532 atomic; 3828 atomic;
3537 3833
3538 # no (long-running) fork's whatsoever before this point(!) 3834 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX (); 3835 use POSIX ();
3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3836 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3541 3837
3542 (pop @POST_INIT)->(0) while @POST_INIT; 3838 cf::_post_init 0;
3543 }; 3839 };
3544 3840
3841 cf::object::thawer::errors_are_fatal 0;
3842 info "parse errors in files are no longer fatal from this point on.\n";
3843
3844 AE::postpone {
3845 undef &main; # free gobs of memory :)
3846 };
3847
3545 main_loop; 3848 goto &main_loop;
3546} 3849}
3547 3850
3548############################################################################# 3851#############################################################################
3549# initialisation and cleanup 3852# initialisation and cleanup
3550 3853
3551# install some emergency cleanup handlers 3854# install some emergency cleanup handlers
3552BEGIN { 3855BEGIN {
3553 our %SIGWATCHER = (); 3856 our %SIGWATCHER = ();
3554 for my $signal (qw(INT HUP TERM)) { 3857 for my $signal (qw(INT HUP TERM)) {
3555 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3858 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3556 cf::cleanup "SIG$signal"; 3859 cf::cleanup "SIG$signal";
3557 }; 3860 };
3558 } 3861 }
3559} 3862}
3560 3863
3561sub write_runtime_sync { 3864sub write_runtime_sync {
3865 my $t0 = AE::time;
3866
3562 # first touch the runtime file to show we are still running: 3867 # first touch the runtime file to show we are still running:
3563 # the fsync below can take a very very long time. 3868 # the fsync below can take a very very long time.
3564 3869
3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3870 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3566 3871
3567 my $guard = cf::lock_acquire "write_runtime"; 3872 my $guard = cf::lock_acquire "write_runtime";
3568 3873
3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3874 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3570 or return; 3875 or return;
3571 3876
3572 my $value = $cf::RUNTIME + 90 + 10; 3877 my $value = $cf::RUNTIME + 90 + 10;
3573 # 10 is the runtime save interval, for a monotonic clock 3878 # 10 is the runtime save interval, for a monotonic clock
3574 # 60 allows for the watchdog to kill the server. 3879 # 60 allows for the watchdog to kill the server.
3587 or return; 3892 or return;
3588 3893
3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3894 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3590 and return; 3895 and return;
3591 3896
3592 warn "runtime file written.\n"; 3897 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3593 3898
3594 1 3899 1
3595} 3900}
3596 3901
3597our $uuid_lock; 3902our $uuid_lock;
3609 or return; 3914 or return;
3610 3915
3611 my $value = uuid_seq uuid_cur; 3916 my $value = uuid_seq uuid_cur;
3612 3917
3613 unless ($value) { 3918 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n"; 3919 info "cowardly refusing to write zero uuid value!\n";
3615 return; 3920 return;
3616 } 3921 }
3617 3922
3618 my $value = uuid_str $value + $uuid_skip; 3923 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0; 3924 $uuid_skip = 0;
3629 or return; 3934 or return;
3630 3935
3631 aio_rename "$uuid~", $uuid 3936 aio_rename "$uuid~", $uuid
3632 and return; 3937 and return;
3633 3938
3634 warn "uuid file written ($value).\n"; 3939 trace "uuid file written ($value).\n";
3635 3940
3636 1 3941 1
3637 3942
3638} 3943}
3639 3944
3645} 3950}
3646 3951
3647sub emergency_save() { 3952sub emergency_save() {
3648 my $freeze_guard = cf::freeze_mainloop; 3953 my $freeze_guard = cf::freeze_mainloop;
3649 3954
3650 warn "emergency_perl_save: enter\n"; 3955 info "emergency_perl_save: enter\n";
3956
3957 # this is a trade-off: we want to be very quick here, so
3958 # save all maps without fsync, and later call a global sync
3959 # (which in turn might be very very slow)
3960 local $USE_FSYNC = 0;
3651 3961
3652 cf::sync_job { 3962 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so 3963 cf::write_runtime_sync; # external watchdog should not bark
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657 3964
3658 # use a peculiar iteration method to avoid tripping on perl 3965 # use a peculiar iteration method to avoid tripping on perl
3659 # refcount bugs in for. also avoids problems with players 3966 # refcount bugs in for. also avoids problems with players
3660 # and maps saved/destroyed asynchronously. 3967 # and maps saved/destroyed asynchronously.
3661 warn "emergency_perl_save: begin player save\n"; 3968 info "emergency_perl_save: begin player save\n";
3662 for my $login (keys %cf::PLAYER) { 3969 for my $login (keys %cf::PLAYER) {
3663 my $pl = $cf::PLAYER{$login} or next; 3970 my $pl = $cf::PLAYER{$login} or next;
3664 $pl->valid or next; 3971 $pl->valid or next;
3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3972 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3666 $pl->save; 3973 $pl->save;
3667 } 3974 }
3668 warn "emergency_perl_save: end player save\n"; 3975 info "emergency_perl_save: end player save\n";
3669 3976
3977 cf::write_runtime_sync; # external watchdog should not bark
3978
3670 warn "emergency_perl_save: begin map save\n"; 3979 info "emergency_perl_save: begin map save\n";
3671 for my $path (keys %cf::MAP) { 3980 for my $path (keys %cf::MAP) {
3672 my $map = $cf::MAP{$path} or next; 3981 my $map = $cf::MAP{$path} or next;
3673 $map->valid or next; 3982 $map->valid or next;
3674 $map->save; 3983 $map->save;
3675 } 3984 }
3676 warn "emergency_perl_save: end map save\n"; 3985 info "emergency_perl_save: end map save\n";
3677 3986
3987 cf::write_runtime_sync; # external watchdog should not bark
3988
3678 warn "emergency_perl_save: begin database checkpoint\n"; 3989 info "emergency_perl_save: begin database checkpoint\n";
3679 BDB::db_env_txn_checkpoint $DB_ENV; 3990 BDB::db_env_txn_checkpoint $DB_ENV;
3680 warn "emergency_perl_save: end database checkpoint\n"; 3991 info "emergency_perl_save: end database checkpoint\n";
3681 3992
3682 warn "emergency_perl_save: begin write uuid\n"; 3993 info "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1; 3994 write_uuid_sync 1;
3684 warn "emergency_perl_save: end write uuid\n"; 3995 info "emergency_perl_save: end write uuid\n";
3996
3997 cf::write_runtime_sync; # external watchdog should not bark
3998
3999 trace "emergency_perl_save: syncing database to disk";
4000 BDB::db_env_txn_checkpoint $DB_ENV;
4001
4002 info "emergency_perl_save: starting sync\n";
4003 IO::AIO::aio_sync sub {
4004 info "emergency_perl_save: finished sync\n";
4005 };
4006
4007 cf::write_runtime_sync; # external watchdog should not bark
4008
4009 trace "emergency_perl_save: flushing outstanding aio requests";
4010 while (IO::AIO::nreqs || BDB::nreqs) {
4011 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4012 }
4013
4014 cf::write_runtime_sync; # external watchdog should not bark
3685 }; 4015 };
3686 4016
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3692 warn "emergency_perl_save: leave\n"; 4017 info "emergency_perl_save: leave\n";
3693} 4018}
3694 4019
3695sub post_cleanup { 4020sub post_cleanup {
3696 my ($make_core) = @_; 4021 my ($make_core) = @_;
3697 4022
4023 IO::AIO::flush;
4024
3698 warn Carp::longmess "post_cleanup backtrace" 4025 error Carp::longmess "post_cleanup backtrace"
3699 if $make_core; 4026 if $make_core;
3700 4027
3701 my $fh = pidfile; 4028 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$; 4029 unlink $PIDFILE if <$fh> == $$;
3703} 4030}
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4050 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) { 4051 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"}; 4052 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4053# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 } 4054 }
3728 warn "cleared package $pkg\n";#d#
3729} 4055}
3730 4056
3731sub do_reload_perl() { 4057sub do_reload_perl() {
3732 # can/must only be called in main 4058 # can/must only be called in main
3733 if ($Coro::current != $Coro::main) { 4059 unless (in_main) {
3734 warn "can only reload from main coroutine"; 4060 error "can only reload from main coroutine";
3735 return; 4061 return;
3736 } 4062 }
3737 4063
3738 return if $RELOAD++; 4064 return if $RELOAD++;
3739 4065
3740 my $t1 = EV::time; 4066 my $t1 = AE::time;
3741 4067
3742 while ($RELOAD) { 4068 while ($RELOAD) {
3743 warn "reloading..."; 4069 cf::get_slot 0.1, -1, "reload_perl";
4070 info "perl_reload: reloading...";
3744 4071
3745 warn "entering sync_job"; 4072 trace "perl_reload: entering sync_job";
3746 4073
3747 cf::sync_job { 4074 cf::sync_job {
3748 cf::write_runtime_sync; # external watchdog should not bark
3749 cf::emergency_save; 4075 #cf::emergency_save;
3750 cf::write_runtime_sync; # external watchdog should not bark
3751 4076
3752 warn "syncing database to disk";
3753 BDB::db_env_txn_checkpoint $DB_ENV;
3754
3755 # if anything goes wrong in here, we should simply crash as we already saved
3756
3757 warn "flushing outstanding aio requests";
3758 while (IO::AIO::nreqs || BDB::nreqs) {
3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3760 }
3761
3762 warn "cancelling all extension coros"; 4077 trace "perl_reload: cancelling all extension coros";
3763 $_->cancel for values %EXT_CORO; 4078 $_->cancel for values %EXT_CORO;
3764 %EXT_CORO = (); 4079 %EXT_CORO = ();
3765 4080
3766 warn "removing commands"; 4081 trace "perl_reload: removing commands";
3767 %COMMAND = (); 4082 %COMMAND = ();
3768 4083
3769 warn "removing ext/exti commands"; 4084 trace "perl_reload: removing ext/exti commands";
3770 %EXTCMD = (); 4085 %EXTCMD = ();
3771 %EXTICMD = (); 4086 %EXTICMD = ();
3772 4087
3773 warn "unloading/nuking all extensions"; 4088 trace "perl_reload: unloading/nuking all extensions";
3774 for my $pkg (@EXTS) { 4089 for my $pkg (@EXTS) {
3775 warn "... unloading $pkg"; 4090 trace "... unloading $pkg";
3776 4091
3777 if (my $cb = $pkg->can ("unload")) { 4092 if (my $cb = $pkg->can ("unload")) {
3778 eval { 4093 eval {
3779 $cb->($pkg); 4094 $cb->($pkg);
3780 1 4095 1
3781 } or warn "$pkg unloaded, but with errors: $@"; 4096 } or error "$pkg unloaded, but with errors: $@";
3782 } 4097 }
3783 4098
3784 warn "... clearing $pkg"; 4099 trace "... clearing $pkg";
3785 clear_package $pkg; 4100 clear_package $pkg;
3786 } 4101 }
3787 4102
3788 warn "unloading all perl modules loaded from $LIBDIR"; 4103 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) { 4104 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4105 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791 4106
3792 warn "... unloading $k"; 4107 trace "... unloading $k";
3793 delete $INC{$k}; 4108 delete $INC{$k};
3794 4109
3795 $k =~ s/\.pm$//; 4110 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g; 4111 $k =~ s/\//::/g;
3797 4112
3800 } 4115 }
3801 4116
3802 clear_package $k; 4117 clear_package $k;
3803 } 4118 }
3804 4119
3805 warn "getting rid of safe::, as good as possible"; 4120 trace "perl_reload: getting rid of safe::, as good as possible";
3806 clear_package "safe::$_" 4121 clear_package "safe::$_"
3807 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4122 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3808 4123
3809 warn "unloading cf.pm \"a bit\""; 4124 trace "perl_reload: unloading cf.pm \"a bit\"";
3810 delete $INC{"cf.pm"}; 4125 delete $INC{"cf.pm"};
3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4126 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3812 4127
3813 # don't, removes xs symbols, too, 4128 # don't, removes xs symbols, too,
3814 # and global variables created in xs 4129 # and global variables created in xs
3815 #clear_package __PACKAGE__; 4130 #clear_package __PACKAGE__;
3816 4131
3817 warn "unload completed, starting to reload now"; 4132 info "perl_reload: unload completed, starting to reload now";
3818 4133
3819 warn "reloading cf.pm"; 4134 trace "perl_reload: reloading cf.pm";
3820 require cf; 4135 require cf;
3821 cf::_connect_to_perl_1; 4136 cf::_connect_to_perl_1;
3822 4137
3823 warn "loading config and database again"; 4138 trace "perl_reload: loading config and database again";
3824 cf::reload_config; 4139 cf::reload_config;
3825 4140
3826 warn "loading extensions"; 4141 trace "perl_reload: loading extensions";
3827 cf::load_extensions; 4142 cf::load_extensions;
3828 4143
3829 if ($REATTACH_ON_RELOAD) { 4144 if ($REATTACH_ON_RELOAD) {
3830 warn "reattaching attachments to objects/players"; 4145 trace "perl_reload: reattaching attachments to objects/players";
3831 _global_reattach; # objects, sockets 4146 _global_reattach; # objects, sockets
3832 warn "reattaching attachments to maps"; 4147 trace "perl_reload: reattaching attachments to maps";
3833 reattach $_ for values %MAP; 4148 reattach $_ for values %MAP;
3834 warn "reattaching attachments to players"; 4149 trace "perl_reload: reattaching attachments to players";
3835 reattach $_ for values %PLAYER; 4150 reattach $_ for values %PLAYER;
3836 } 4151 }
3837 4152
3838 warn "running post_init jobs"; 4153 cf::_post_init 1;
3839 (pop @POST_INIT)->(1) while @POST_INIT;
3840 4154
3841 warn "leaving sync_job"; 4155 trace "perl_reload: leaving sync_job";
3842 4156
3843 1 4157 1
3844 } or do { 4158 } or do {
3845 warn $@; 4159 error $@;
3846 cf::cleanup "error while reloading, exiting."; 4160 cf::cleanup "perl_reload: error, exiting.";
3847 }; 4161 };
3848 4162
3849 warn "reloaded";
3850 --$RELOAD; 4163 --$RELOAD;
3851 } 4164 }
3852 4165
3853 $t1 = EV::time - $t1; 4166 $t1 = AE::time - $t1;
3854 warn "reload completed in ${t1}s\n"; 4167 info "perl_reload: completed in ${t1}s\n";
3855}; 4168};
3856 4169
3857our $RELOAD_WATCHER; # used only during reload 4170our $RELOAD_WATCHER; # used only during reload
3858 4171
3859sub reload_perl() { 4172sub reload_perl() {
3861 # coro crashes during coro_state_free->destroy here. 4174 # coro crashes during coro_state_free->destroy here.
3862 4175
3863 $RELOAD_WATCHER ||= cf::async { 4176 $RELOAD_WATCHER ||= cf::async {
3864 Coro::AIO::aio_wait cache_extensions; 4177 Coro::AIO::aio_wait cache_extensions;
3865 4178
3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4179 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3867 do_reload_perl; 4180 do_reload_perl;
3868 undef $RELOAD_WATCHER; 4181 undef $RELOAD_WATCHER;
3869 }; 4182 };
3870 }; 4183 };
3871} 4184}
3880 reload_perl; 4193 reload_perl;
3881 }; 4194 };
3882 } 4195 }
3883}; 4196};
3884 4197
3885unshift @INC, $LIBDIR; 4198#############################################################################
3886 4199
3887my $bug_warning = 0; 4200my $bug_warning = 0;
3888 4201
3889our @WAIT_FOR_TICK;
3890our @WAIT_FOR_TICK_BEGIN;
3891
3892sub wait_for_tick { 4202sub wait_for_tick() {
3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4203 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3894 4204
3895 my $signal = new Coro::Signal; 4205 $WAIT_FOR_TICK->wait;
3896 push @WAIT_FOR_TICK, $signal;
3897 $signal->wait;
3898} 4206}
3899 4207
3900sub wait_for_tick_begin { 4208sub wait_for_tick_begin() {
3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4209 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3902 4210
3903 my $signal = new Coro::Signal; 4211 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK_BEGIN, $signal; 4212 push @WAIT_FOR_TICK_BEGIN, $signal;
3905 $signal->wait; 4213 $signal->wait;
3906} 4214}
3910 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4218 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3911 unless ++$bug_warning > 10; 4219 unless ++$bug_warning > 10;
3912 return; 4220 return;
3913 } 4221 }
3914 4222
3915 cf::server_tick; # one server iteration 4223 cf::one_tick; # one server iteration
4224
4225 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3916 4226
3917 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4227 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3918 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4228 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3919 Coro::async_pool { 4229 Coro::async_pool {
3920 $Coro::current->{desc} = "runtime saver"; 4230 $Coro::current->{desc} = "runtime saver";
3921 write_runtime_sync 4231 write_runtime_sync
3922 or warn "ERROR: unable to write runtime file: $!"; 4232 or error "ERROR: unable to write runtime file: $!";
3923 }; 4233 };
3924 } 4234 }
3925 4235
3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3927 $sig->send; 4237 $sig->send;
3928 } 4238 }
3929 while (my $sig = shift @WAIT_FOR_TICK) { 4239 $WAIT_FOR_TICK->broadcast;
3930 $sig->send;
3931 }
3932 4240
3933 $LOAD = ($NOW - $TICK_START) / $TICK; 4241 $LOAD = ($NOW - $TICK_START) / $TICK;
3934 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4242 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3935 4243
3936 if (0) { 4244 if (0) {
3937 if ($NEXT_TICK) { 4245 if ($NEXT_TICK) {
3938 my $jitter = $TICK_START - $NEXT_TICK; 4246 my $jitter = $TICK_START - $NEXT_TICK;
3939 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4247 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3940 warn "jitter $JITTER\n";#d# 4248 debug "jitter $JITTER\n";#d#
3941 } 4249 }
3942 } 4250 }
3943} 4251}
3944 4252
3945{ 4253{
3946 # configure BDB 4254 # configure BDB
4255 info "initialising database";
3947 4256
3948 BDB::min_parallel 8; 4257 BDB::min_parallel 16;
3949 BDB::max_poll_reqs $TICK * 0.1; 4258 BDB::max_poll_reqs $TICK * 0.1;
3950 $AnyEvent::BDB::WATCHER->priority (1); 4259 #$AnyEvent::BDB::WATCHER->priority (1);
3951 4260
3952 unless ($DB_ENV) { 4261 unless ($DB_ENV) {
3953 $DB_ENV = BDB::db_env_create; 4262 $DB_ENV = BDB::db_env_create;
3954 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4263 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3955 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4264 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3980 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4289 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3981 }; 4290 };
3982 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4291 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3983 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4292 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3984 }; 4293 };
4294
4295 info "database initialised";
3985} 4296}
3986 4297
3987{ 4298{
3988 # configure IO::AIO 4299 # configure IO::AIO
3989 4300
4301 info "initialising aio";
3990 IO::AIO::min_parallel 8; 4302 IO::AIO::min_parallel 8;
3991 IO::AIO::max_poll_time $TICK * 0.1; 4303 IO::AIO::max_poll_time $TICK * 0.1;
3992 undef $AnyEvent::AIO::WATCHER; 4304 undef $AnyEvent::AIO::WATCHER;
4305 info "aio initialised";
3993} 4306}
3994 4307
3995my $_log_backtrace; 4308our $_log_backtrace;
4309our $_log_backtrace_last;
3996 4310
3997sub _log_backtrace { 4311sub _log_backtrace {
3998 my ($msg, @addr) = @_; 4312 my ($msg, @addr) = @_;
3999 4313
4000 $msg =~ s/\n//; 4314 $msg =~ s/\n$//;
4001 4315
4316 if ($_log_backtrace_last eq $msg) {
4317 LOG llevInfo, "[ABT] $msg\n";
4318 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4002 # limit the # of concurrent backtraces 4319 # limit the # of concurrent backtraces
4003 if ($_log_backtrace < 2) { 4320 } elsif ($_log_backtrace < 2) {
4321 $_log_backtrace_last = $msg;
4004 ++$_log_backtrace; 4322 ++$_log_backtrace;
4005 my $perl_bt = Carp::longmess $msg; 4323 my $perl_bt = Carp::longmess $msg;
4006 async { 4324 async {
4007 $Coro::current->{desc} = "abt $msg"; 4325 $Coro::current->{desc} = "abt $msg";
4008 4326
4028 LOG llevInfo, "[ABT] $_\n" for @bt; 4346 LOG llevInfo, "[ABT] $_\n" for @bt;
4029 --$_log_backtrace; 4347 --$_log_backtrace;
4030 }; 4348 };
4031 } else { 4349 } else {
4032 LOG llevInfo, "[ABT] $msg\n"; 4350 LOG llevInfo, "[ABT] $msg\n";
4033 LOG llevInfo, "[ABT] [suppressed]\n"; 4351 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4034 } 4352 }
4035} 4353}
4036 4354
4037# load additional modules 4355# load additional modules
4038require "cf/$_.pm" for @EXTRA_MODULES; 4356require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines