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.478 by root, Thu Sep 17 01:57:31 2009 UTC vs.
Revision 1.604 by root, Thu Nov 15 07:08:08 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 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your 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 GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
64AnyEvent::detect; 66AnyEvent::detect;
65 67
77# strictly for debugging 79# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 81
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
81 83
84our @ORIG_INC;
85
82our %COMMAND = (); 86our %COMMAND = ();
83our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
84 88
85our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
86our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
87our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
88our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
90 96
91our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
93 101
94our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
95our $DATADIR = datadir; 104our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
99our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 117
108our %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;
109 125
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 128our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 134our $DB_ENV;
119 135
120our @EXTRA_MODULES = qw(pod mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 137
122our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
123 140
124our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
126our $NOW; 144our $NOW;
127 145
128our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
139 157
140our @POST_INIT; 158our @POST_INIT;
141 159
142our $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)
143our $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;
144 165
145binmode STDOUT; 166binmode STDOUT;
146binmode STDERR; 167binmode STDERR;
147 168
148# read virtual server time, if available 169# read virtual server time, if available
159 180
160our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
161 182
162sub cf::map::normalise; 183sub cf::map::normalise;
163 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
164############################################################################# 189#############################################################################
165 190
191%REFLECT = ();
192for (@REFLECT) {
193 my $reflect = JSON::XS::decode_json $_;
194 $REFLECT{$reflect->{class}} = $reflect;
195}
196
197# this is decidedly evil
198$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
199
200#############################################################################
201
166=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
167 203
168=over 4 204=over 4
169 205
170=item $cf::UPTIME 206=item $cf::UPTIME
171 207
172The 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.
173 224
174=item $cf::RUNTIME 225=item $cf::RUNTIME
175 226
176The 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
177every server tick. 228every server tick.
178 229
179=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
180$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
181$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
182 233
183Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
186database environment. 237database environment.
187 238
188=item $cf::NOW
189
190The time of the last (current) server tick.
191
192=item $cf::TICK
193
194The interval between server ticks, in seconds.
195
196=item $cf::LOADAVG 239=item $cf::LOADAVG
197 240
198The 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
199(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
200objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
208Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
209from wherever your confdir points to. 252from wherever your confdir points to.
210 253
211=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
212 255
213These 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.
214returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
216 277
217=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
218 279
219This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 282that call.
222 283
284=item %cf::REFLECT
285
286Contains, for each (C++) class name, a hash reference with information
287about object members (methods, scalars, arrays and flags) and other
288metadata, which is useful for introspection.
289
223=back 290=back
224 291
225=cut 292=cut
293
294sub error(@) { LOG llevError, join "", @_ }
295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
226 299
227$Coro::State::WARNHOOK = sub { 300$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 301 my $msg = join "", @_;
229 302
230 $msg .= "\n" 303 $msg .= "\n"
231 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
232 305
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 307
235 LOG llevError, $msg; 308 LOG llevWarn, $msg;
236}; 309};
237 310
238$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
240 313
241 warn Carp::longmess $_[0]; 314 error Carp::longmess $_[0];
242 315
243 if ($Coro::current == $Coro::main) {#d# 316 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 318 return;#d#
246 }#d# 319 }#d#
247 320
248 # kill coroutine otherwise 321 # kill coroutine otherwise
249 Coro::terminate 322 Coro::terminate
269)) { 342)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 344}
272 345
273$EV::DIED = sub { 346$EV::DIED = sub {
274 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
275}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
276 354
277############################################################################# 355#############################################################################
278 356
279=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
280 358
301 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
302 $d 380 $d
303 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
304} 382}
305 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
306=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
307 437
308Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
309 439
310=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
316our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
317 447
318sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
319sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
320 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
321=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
322 483
323Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
324but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
325 486
326The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
327is a reload or not. 488is a reload or not.
328 489
329=cut 490=cut
330 491
331sub post_init(&) { 492sub post_init(&) {
332 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
333} 511}
334 512
335=item cf::lock_wait $string 513=item cf::lock_wait $string
336 514
337Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
376} 554}
377 555
378=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
379 557
380Like EV::periodic, but randomly selects a starting point so that the actions 558Like EV::periodic, but randomly selects a starting point so that the actions
381get spread over timer. 559get spread over time.
382 560
383=cut 561=cut
384 562
385sub periodic($$) { 563sub periodic($$) {
386 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
390 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
391} 569}
392 570
393=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
394 572
395Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
396This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
397of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
398 580
399The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
400used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
401 583
402Useful for short background jobs. 584Useful for short background jobs.
403 585
404=cut 586=cut
405 587
406our @SLOT_QUEUE; 588our @SLOT_QUEUE;
407our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
408 591
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
412 595
413 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
414 598
415 while () { 599 while () {
416 next_job: 600 next_job:
601
417 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 603
419 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 608 $job->[2]->send;
423 Coro::cede; 609 Coro::cede;
424 goto next_job; 610 goto next_job;
425 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 613 }
427 } 614 }
428 615
429 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
430 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
431 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
432 $signal->wait;
433 } else { 619 } else {
620 $busy = 0;
434 Coro::schedule; 621 Coro::schedule;
435 } 622 }
436 } 623 }
437}; 624};
438 625
439sub get_slot($;$$) { 626sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
441 628
442 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
443 630
444 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
445 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
446 634
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
475=cut 663=cut
476 664
477sub sync_job(&) { 665sub sync_job(&) {
478 my ($job) = @_; 666 my ($job) = @_;
479 667
480 if ($Coro::current == $Coro::main) { 668 if (in_main) {
481 my $time = EV::time; 669 my $time = AE::time;
482 670
483 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
485 673
486 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
487 675
488 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
489 677
490 my $busy = 1; 678 my $busy = 1;
491 my @res; 679 my @res;
492 680
493 (async { 681 (async {
494 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
495 @res = eval { $job->() }; 683 @res = eval { $job->() };
496 warn $@ if $@; 684 error $@ if $@;
497 undef $busy; 685 undef $busy;
498 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
499 687
500 while ($busy) { 688 while ($busy) {
501 if (Coro::nready) { 689 if (Coro::nready) {
503 } else { 691 } else {
504 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
505 } 693 }
506 } 694 }
507 695
508 my $time = EV::time - $time; 696 my $time = AE::time - $time;
509 697
510 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
511 699
512 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
513 } else { 701 } else {
535 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
536 724
537 $coro 725 $coro
538} 726}
539 727
540=item fork_call { }, $args 728=item fork_call { }, @args
541 729
542Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
543process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
544Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
545never block itself or use any form of event handling. 733never block itself or use any form of event handling.
546 734
547=cut 735=cut
548 736
737sub post_fork {
738 reset_signals;
739}
740
549sub fork_call(&@) { 741sub fork_call(&@) {
550 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
551 743
552 # we seemingly have to make a local copy of the whole thing,
553 # otherwise perl prematurely frees the stuff :/
554 # TODO: investigate and fix (likely this will be rather laborious)
555
556 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
557 reset_signals; 745 cf::post_fork;
558 &$cb 746 &$cb
559 }, @args; 747 } @args;
560 748
561 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
750}
751
752sub objinfo {
753 (
754 "counter value" => cf::object::object_count,
755 "objects created" => cf::object::create_count,
756 "objects destroyed" => cf::object::destroy_count,
757 "freelist size" => cf::object::free_count,
758 "allocated objects" => cf::object::objects_size,
759 "active objects" => cf::object::actives_size,
760 )
562} 761}
563 762
564=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
565 764
566=cut 765=cut
603within each server. 802within each server.
604 803
605=cut 804=cut
606 805
607sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
608 my ($name) = @_; 810 my ($name) = @_;
609 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
610 812
611 eval { 813 eval {
612 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
622} 824}
623 825
624our $DB; 826our $DB;
625 827
626sub db_init { 828sub db_init {
627 cf::sync_job {
628 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
629 };
630} 830}
631 831
632sub db_get($$) { 832sub db_get($$) {
633 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
634 834
635 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
636 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
637 839
638 $! ? () 840 $! ? ()
639 : $data 841 : $data
640 }
641} 842}
642 843
643sub db_put($$$) { 844sub db_put($$$) {
644 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
645 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
673 874
674 my @data; 875 my @data;
675 my $md5; 876 my $md5;
676 877
677 for (0 .. $#$src) { 878 for (0 .. $#$src) {
678 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
679 or Carp::croak "$src->[$_]: $!";
680 } 880 }
681 881
682 # if processing is expensive, check 882 # if processing is expensive, check
683 # checksum first 883 # checksum first
684 if (1) { 884 if (1) {
697 897
698 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
699 } 899 }
700 } 900 }
701 901
702 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
703 my $data = $process->(\@data); 903 my $data = $process->(\@data);
704 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
705 905
706 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707 907
708 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
709 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
710 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
711 911
721 921
722=cut 922=cut
723 923
724sub datalog($@) { 924sub datalog($@) {
725 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
726 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727} 927}
728 928
729=back 929=back
730 930
731=cut 931=cut
926 1126
927 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
928 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929 1129
930 } elsif (ref $type) { 1130 } elsif (ref $type) {
931 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
932 1132
933 } else { 1133 } else {
934 shift @arg; 1134 shift @arg;
935 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
936 } 1136 }
937 } 1137 }
938} 1138}
939 1139
940sub _object_attach { 1140sub _object_attach {
950 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
951 } 1151 }
952 1152
953 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
954 } else { 1154 } else {
955 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
956 } 1156 }
957 1157
958 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
959} 1159}
960 1160
1019 1219
1020 for (@$callbacks) { 1220 for (@$callbacks) {
1021 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1022 1222
1023 if ($@) { 1223 if ($@) {
1024 warn "$@";
1025 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026 override; 1225 override;
1027 } 1226 }
1028 1227
1029 return 1 if $override; 1228 return 1 if $override;
1030 } 1229 }
1109 for (@$attach) { 1308 for (@$attach) {
1110 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1111 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1112 } 1311 }
1113 } else { 1312 } else {
1114 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1115 } 1314 }
1116 } 1315 }
1117} 1316}
1118 1317
1119cf::attachable->attach ( 1318cf::attachable->attach (
1146 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1147 1346
1148 sync_job { 1347 sync_job {
1149 if (length $$rdata) { 1348 if (length $$rdata) {
1150 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1151 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1152 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1153 1353
1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157 if ($cf::USE_FSYNC) { 1357 if ($cf::USE_FSYNC) {
1179 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1180 1380
1181 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1183 } else { 1383 } else {
1184 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1185 } 1385 }
1186 } else { 1386 } else {
1187 aio_unlink $filename; 1387 aio_unlink $filename;
1188 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1189 } 1389 }
1213 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1214 $av = $st->{objs}; 1414 $av = $st->{objs};
1215 } 1415 }
1216 1416
1217 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1218 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1219 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1220 1421
1221 ($data, $av) 1422 ($data, $av)
1222} 1423}
1223 1424
1224=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1228=cut 1429=cut
1229 1430
1230############################################################################# 1431#############################################################################
1231# command handling &c 1432# command handling &c
1232 1433
1233=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1234 1435
1235Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1236$name. 1437$name.
1237 1438
1238=cut 1439=cut
1244 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1245 1446
1246 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1247} 1448}
1248 1449
1249=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1250 1451
1251Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1252extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1253received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1254the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1255has logged in successfully. 1456has logged in successfully.
1256 1457
1257If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1258called.
1259 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1260=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1261 1466
1262Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1263exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1264are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1265is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1266log-in. 1471log-in.
1267 1472
1268If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1269called.
1270 1474
1271=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1272 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1273sub register_extcmd { 1482sub register_extcmd($$) {
1274 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1275 1484
1276 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1277} 1486}
1278 1487
1279sub register_exticmd { 1488sub register_async_extcmd($$) {
1280 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1281 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1282 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1283} 1498}
1284 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1285use File::Glob (); 1506use File::Glob ();
1286 1507
1287cf::player->attach ( 1508cf::player->attach (
1288 on_command => sub { 1509 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1290 1511
1291 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1292 or return; 1513 or return;
1293 1514
1301 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1302 1523
1303 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1304 1525
1305 if (ref $msg) { 1526 if (ref $msg) {
1306 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1307 "ARRAY" eq ref $msg
1308 ? @$msg
1309 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1310 1528
1311 my @reply;
1312
1313 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1314 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1315 } 1547 }
1316 1548
1317 $pl->ext_reply ($reply, @reply)
1318 if $reply;
1319
1320 } else { 1549 } else {
1321 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322 } 1551 }
1323 1552
1324 cf::override; 1553 cf::override;
1325 }, 1554 },
1326); 1555);
1336 }; 1565 };
1337 1566
1338 $grp 1567 $grp
1339} 1568}
1340 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1341sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1342 cf::sync_job { 1586 cf::sync_job {
1343 my %todo; 1587 my %todo;
1344 1588
1345 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1346 next unless -r $path; 1590 next unless -r $path;
1364 1608
1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367 1611
1368 $ext{source} = 1612 $ext{source} =
1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1370 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1371 . $source 1615 . $source
1372 . "\n};\n1"; 1616 . "\n};\n1";
1373 1617
1374 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1375 } 1619 }
1376 1620
1621 my $pass = 0;
1377 my %done; 1622 my %done;
1378 while (%todo) { 1623 while (%todo) {
1379 my $progress; 1624 my $progress;
1380 1625
1626 ++$pass;
1627
1628 ext:
1381 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1631 next ext
1384 unless exists $done{$_}; 1632 unless exists $done{$_};
1385 } 1633 }
1386 1634
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1636
1389 unless (eval $v->{source}) { 1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1646 my $active = eval $source;
1647
1648 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n";
1392 1650
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1652 if exists $v->{meta}{mandatory};
1397 1653
1398 warn $msg; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1655 delete $todo{$k};
1656 } else {
1657 $done{$k} = delete $todo{$k};
1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1399 } 1663 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1664 }
1405 1665
1406 skip: 1666 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 unless $progress; 1668
1669 while (my ($k, $v) = each %todo) {
1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1671 if exists $v->{meta}{mandatory};
1672 }
1673
1674 last;
1675 }
1409 } 1676 }
1410 }; 1677 };
1411} 1678}
1412 1679
1413############################################################################# 1680#############################################################################
1497 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1498 } 1765 }
1499 } 1766 }
1500} 1767}
1501 1768
1769cf::player->attach (
1770 on_load => sub {
1771 my ($pl, $path) = @_;
1772
1773 # restore slots saved in save, below
1774 my $slots = delete $pl->{_slots};
1775
1776 $pl->ob->current_weapon ($slots->[0]);
1777 $pl->combat_ob ($slots->[1]);
1778 $pl->ranged_ob ($slots->[2]);
1779 },
1780);
1781
1502sub save($) { 1782sub save($) {
1503 my ($pl) = @_; 1783 my ($pl) = @_;
1504 1784
1505 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1506 1786
1511 1791
1512 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1514 1794
1515 cf::get_slot 0.01; 1795 cf::get_slot 0.01;
1796
1797 # save slots, to be restored later
1798 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1516 1799
1517 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1801 cf::cede_to_tick;
1519} 1802}
1520 1803
1554 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1555 1838
1556 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1557 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1558 1841
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1560 $pl->deactivate; 1843 $pl->deactivate;
1844
1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1564 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1565 1850
1566 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1568 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1622 \@logins 1907 \@logins
1623} 1908}
1624 1909
1625=item $player->maps 1910=item $player->maps
1626 1911
1912=item cf::player::maps $login
1913
1627Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1628player. May block. 1915player. May block.
1629 1916
1630=cut 1917=cut
1631 1918
1652 1939
1653=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1654 1941
1655Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1656 1943
1657=item $player->ext_reply ($msgid, @msg)
1658
1659Sends an ext reply to the player.
1660
1661=cut
1662
1663sub ext_reply($$@) {
1664 my ($self, $id, @msg) = @_;
1665
1666 $self->ns->ext_reply ($id, @msg)
1667}
1668
1669=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1670 1945
1671Sends an ext event to the client. 1946Sends an ext event to the client.
1672 1947
1673=cut 1948=cut
1692 1967
1693=cut 1968=cut
1694 1969
1695sub find_by_path($) { 1970sub find_by_path($) {
1696 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1697 1974
1698 my ($match, $specificity); 1975 my ($match, $specificity);
1699 1976
1700 for my $region (list) { 1977 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1730sub generate_random_map { 2007sub generate_random_map {
1731 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1732 2009
1733 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1734 2011
1735 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1744 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1745 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1746 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1747 (cf::region::find $rmp->{region}), $rmp->{custom}
1748 )
1749} 2013}
1750 2014
1751=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1752 2016
1753Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1758 2022
1759sub register { 2023sub register {
1760 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 2025 my $pkg = caller;
1762 2026
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 2028
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 2030}
1768 2031
1769# also paths starting with '/' 2032# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 2034
1772sub thawer_merge { 2035sub thawer_merge {
1773 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1774 2037
1775 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1780} 2043}
1781 2044
1782sub normalise { 2045sub normalise {
1783 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1784 2047
1785 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1786 2049
1787 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1788 2051
1789 # map plan: 2052 # map plan:
1790 # 2053 #
1805 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 2069 $path = "$base/$path";
1807 } 2070 }
1808 2071
1809 for ($path) { 2072 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1813 } 2075 }
1814 2076
1815 $path 2077 $path
1829 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1830 return $self; 2092 return $self;
1831 } 2093 }
1832 } 2094 }
1833 2095
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 2097 ()
1836} 2098}
1837 2099
2100# may re-bless or do other evil things
1838sub init { 2101sub init {
1839 my ($self) = @_; 2102 my ($self) = @_;
1840 2103
1841 $self 2104 $self
1842} 2105}
1907 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1908 2171
1909 1 2172 1
1910} 2173}
1911 2174
2175# used to laod the header of an original map
1912sub load_header_orig { 2176sub load_header_orig {
1913 my ($self) = @_; 2177 my ($self) = @_;
1914 2178
1915 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1916} 2180}
1917 2181
2182# used to laod the header of an instantiated map
1918sub load_header_temp { 2183sub load_header_temp {
1919 my ($self) = @_; 2184 my ($self) = @_;
1920 2185
1921 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1922} 2187}
1923 2188
2189# called after loading the header from an instantiated map
1924sub prepare_temp { 2190sub prepare_temp {
1925 my ($self) = @_; 2191 my ($self) = @_;
1926 2192
1927 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1928 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1929 # safety 2195 # safety
1930 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1931 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1932} 2198}
1933 2199
2200# called after loading the header from an original map
1934sub prepare_orig { 2201sub prepare_orig {
1935 my ($self) = @_; 2202 my ($self) = @_;
1936 2203
1937 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1938 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1962 2229
1963sub find; 2230sub find;
1964sub find { 2231sub find {
1965 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1966 2233
2234 cf::cede_to_tick;
2235
1967 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1968 2237
1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1970 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1971 2240
1972 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1989 2258
1990 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1991 } 2260 }
1992} 2261}
1993 2262
1994sub pre_load { } 2263sub pre_load { }
1995sub post_load { } 2264#sub post_load { } # XS
1996 2265
1997sub load { 2266sub load {
1998 my ($self) = @_; 2267 my ($self) = @_;
1999 2268
2000 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2003 2272
2004 { 2273 {
2005 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2006 2275
2007 return unless $self->valid; 2276 return unless $self->valid;
2008 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2009
2010 $self->in_memory (cf::MAP_LOADING);
2011 2278
2012 $self->alloc; 2279 $self->alloc;
2013 2280
2014 $self->pre_load; 2281 $self->pre_load;
2015 cf::cede_to_tick; 2282 cf::cede_to_tick;
2016 2283
2284 if (exists $self->{load_path}) {
2017 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2018 $f->skip_block; 2286 $f->skip_block;
2019 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2020 or return; 2288 or return;
2021 2289
2022 $self->post_load_original 2290 $self->post_load_original
2023 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2024 2292
2025 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2026 utf8::encode $uniq; 2294 utf8::encode $uniq;
2027 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2028 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2029 $self->clear_unique_items; 2297 $self->clear_unique_items;
2030 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2031 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2032 } 2301 }
2033 } 2302 }
2034 }
2035 2303
2036 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2037 2311
2038 cf::cede_to_tick; 2312 cf::cede_to_tick;
2039 # now do the right thing for maps 2313 # now do the right thing for maps
2040 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2041 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2045 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2046 $self->decay_objects; 2320 $self->decay_objects;
2047 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2048 $self->update_buttons; 2322 $self->update_buttons;
2049 cf::cede_to_tick; 2323 cf::cede_to_tick;
2050 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2051 } 2325 }
2052 2326
2053 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2055
2056 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2329 }
2058 2330
2059 $self->post_load; 2331 $self->post_load;
2060}
2061 2332
2333 1
2334}
2335
2336# customize the map for a given player, i.e.
2337# return the _real_ map. used by e.g. per-player
2338# maps to change the path to ~playername/mappath
2062sub customise_for { 2339sub customise_for {
2063 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2064 2341
2065 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2343 if $self->per_player;
2069# if $self->per_party; 2346# if $self->per_party;
2070 2347
2071 $self 2348 $self
2072} 2349}
2073 2350
2074# find and load all maps in the 3x3 area around a map
2075sub load_neighbours {
2076 my ($map) = @_;
2077
2078 my @neigh; # diagonal neighbours
2079
2080 for (0 .. 3) {
2081 my $neigh = $map->tile_path ($_)
2082 or next;
2083 $neigh = find $neigh, $map
2084 or next;
2085 $neigh->load;
2086
2087 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 }
2091
2092 for (grep defined $_->[0], @neigh) {
2093 my ($path, $origin) = @$_;
2094 my $neigh = find $path, $origin
2095 or next;
2096 $neigh->load;
2097 }
2098}
2099
2100sub find_sync { 2351sub find_sync {
2101 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2102 2353
2103 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2104} 2359}
2105 2360
2106sub do_load_sync { 2361sub do_load_sync {
2107 my ($map) = @_; 2362 my ($map) = @_;
2108 2363
2364 # it's a bug to call this from the main context
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2111 2367
2112 cf::sync_job { $map->load }; 2368 $map->load;
2113} 2369}
2114 2370
2115our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2117 2373
2118sub find_async { 2374sub find_async {
2119 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2120 2376
2121 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2122 2378
2123 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2125 } 2381 }
2126 2382
2127 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2128 2384
2129 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2143 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2144 2400
2145 () 2401 ()
2146} 2402}
2147 2403
2404# common code, used by both ->save and ->swapout
2148sub save { 2405sub _save {
2149 my ($self) = @_; 2406 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2407
2153 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2154 2409
2155 return unless $self->dirty; 2410 return unless $self->dirty;
2156 2411
2176 } else { 2431 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2432 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2433 }
2179} 2434}
2180 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2181sub swap_out { 2444sub swap_out {
2182 my ($self) = @_; 2445 my ($self) = @_;
2183 2446
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2189 return if $self->players; 2451 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2452
2453 # first deactivate the map and "unlink" it from the core
2454 $self->deactivate;
2455 $_->clear_links_to ($self) for values %cf::MAP;
2456 $self->state (cf::MAP_SWAPPED);
2457
2458 # then atomically save
2459 $self->_save;
2460
2461 # then free the map
2462 $self->clear;
2463}
2464
2465sub reset_at {
2466 my ($self) = @_;
2467
2468 # TODO: safety, remove and allow resettable per-player maps
2191 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2192 2470
2471 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2472 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2473
2474 $time + $to
2475}
2476
2477sub should_reset {
2478 my ($self) = @_;
2479
2480 $self->reset_at <= $cf::RUNTIME
2481}
2482
2483sub reset {
2484 my ($self) = @_;
2485
2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2487
2488 return if $self->players;
2489
2490 cf::trace "resetting map ", $self->path, "\n";
2491
2193 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2493
2494 # need to save uniques path
2495 unless ($self->{deny_save}) {
2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2497
2498 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2499 if $uniq;
2500 }
2501
2502 delete $cf::MAP{$self->path};
2194 2503
2195 $self->deactivate; 2504 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2506 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path, "\n";
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2507
2243 $self->unlink_save; 2508 $self->unlink_save;
2244 $self->destroy; 2509 $self->destroy;
2245} 2510}
2246 2511
2254 2519
2255 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2256 2521
2257 $self->unlink_save; 2522 $self->unlink_save;
2258 2523
2259 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2529
2321 : normalise $_ 2586 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2588 ]
2324} 2589}
2325 2590
2591=item cf::map::static_maps
2592
2593Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2594file in the shared directory excluding F</styles> and F</editor>). May
2595block.
2596
2597=cut
2598
2599sub static_maps() {
2600 my @dirs = "";
2601 my @maps;
2602
2603 while (@dirs) {
2604 my $dir = shift @dirs;
2605
2606 next if $dir eq "/styles" || $dir eq "/editor";
2607
2608 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2609 or return;
2610
2611 for (@$files) {
2612 s/\.map$// or next;
2613 utf8::decode $_;
2614 push @maps, "$dir/$_";
2615 }
2616
2617 push @dirs, map "$dir/$_", @$dirs;
2618 }
2619
2620 \@maps
2621}
2622
2326=back 2623=back
2327 2624
2328=head3 cf::object 2625=head3 cf::object
2329 2626
2330=cut 2627=cut
2353 2650
2354Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2355 2652
2356=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2357 2654
2358returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2359even if the object actually exists. May block. 2656even if the object actually exists. May block.
2360 2657
2361=cut 2658=cut
2362 2659
2363sub deref { 2660sub deref {
2462 2759
2463Freezes the player and moves him/her to a special map (C<{link}>). 2760Freezes the player and moves him/her to a special map (C<{link}>).
2464 2761
2465The player should be reasonably safe there for short amounts of time (e.g. 2762The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2763for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2764though, as the player cannot control the character while it is on the link
2468map. 2765map.
2469 2766
2470Will never block. 2767Will never block.
2471 2768
2472=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2494 my ($self) = @_; 2791 my ($self) = @_;
2495 2792
2496 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2497 2794
2795 ++$self->{_link_recursion};
2796
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2798
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2502 2801
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2803}
2505 2804
2506sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2508 2807
2525 ($x, $y) = (-1, -1) 2824 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2825 unless (defined $x) && (defined $y);
2527 2826
2528 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2531 2830
2532 $map->load; 2831 $map->load;
2533 $map->load_neighbours;
2534 2832
2535 return unless $self->contr->active; 2833 return unless $self->contr->active;
2536 2834
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2539 2837 # entering was successful
2838 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2839 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2840 $self->activate_recursive;
2542} 2841 }
2543 2842
2843}
2844
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2845=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2545 2846
2546Moves the player to the given map-path and coordinates by first freezing 2847Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2849that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2850the new (success) or old (failed) map position. In either case, $done will
2556 2857
2557our $GOTOGEN; 2858our $GOTOGEN;
2558 2859
2559sub cf::object::player::goto { 2860sub cf::object::player::goto {
2560 my ($self, $path, $x, $y, $check, $done) = @_; 2861 my ($self, $path, $x, $y, $check, $done) = @_;
2862
2863 if ($self->{_link_recursion} >= $MAX_LINKS) {
2864 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2865 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2866 ($path, $x, $y) = @$EMERGENCY_POSITION;
2867 }
2561 2868
2562 # do generation counting so two concurrent goto's will be executed in-order 2869 # do generation counting so two concurrent goto's will be executed in-order
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2871
2565 $self->enter_link; 2872 $self->enter_link;
2585 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2586 } 2893 }
2587 } 2894 }
2588 2895
2589 my $map = eval { 2896 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2591 2898
2592 if ($map) { 2899 if ($map) {
2593 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2902 } else {
2596 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2903 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2597 } 2904 }
2598 2905
2599 $map 2906 $map
2607 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2610 } 2917 }
2611 2918
2612 $done->() if $done; 2919 $done->($self) if $done;
2613 })->prio (1); 2920 })->prio (1);
2614} 2921}
2615 2922
2616=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2617 2924
2685 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2686 2993
2687 unless (eval { 2994 unless (eval {
2688 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2689 2996
2690 # random map handling
2691 {
2692 my $guard = cf::lock_acquire "exit_prepare:$exit";
2693
2694 prepare_random_map $exit
2695 if $exit->slaying eq "/!";
2696 }
2697
2698 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2699 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2700 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2701 3023
2702 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2703 3025
2704 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2705 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2710 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "I'll try to bring you back to the map you were before. " 3033 . "I'll try to bring you back to the map you were before. "
2712 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2714 3036
2715 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 3038 $self->leave_link;
2717 } 3039 }
2718 })->prio (1); 3040 })->prio (1);
2719} 3041}
2720 3042
2732sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
2734 3056
2735 utf8::encode $text; 3057 utf8::encode $text;
2736 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3058 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3059}
3060
3061=item $client->send_big_packet ($pkt)
3062
3063Like C<send_packet>, but tries to compress large packets, and fragments
3064them as required.
3065
3066=cut
3067
3068our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3069
3070sub cf::client::send_big_packet {
3071 my ($self, $pkt) = @_;
3072
3073 # try lzf for large packets
3074 $pkt = "lzf " . Compress::LZF::compress $pkt
3075 if 1024 <= length $pkt and $self->{can_lzf};
3076
3077 # split very large packets
3078 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3079 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3080 $pkt = "frag";
3081 }
3082
3083 $self->send_packet ($pkt);
2737} 3084}
2738 3085
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 3087
2741Send a drawinfo or msg packet to the client, formatting the msg for the 3088Send a drawinfo or msg packet to the client, formatting the msg for the
2745 3092
2746=cut 3093=cut
2747 3094
2748# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 3096our %CHANNEL = (
3097 "c/motd" => {
3098 id => "infobox",
3099 title => "MOTD",
3100 reply => undef,
3101 tooltip => "The message of the day",
3102 },
2750 "c/identify" => { 3103 "c/identify" => {
2751 id => "infobox", 3104 id => "infobox",
2752 title => "Identify", 3105 title => "Identify",
2753 reply => undef, 3106 reply => undef,
2754 tooltip => "Items recently identified", 3107 tooltip => "Items recently identified",
2756 "c/examine" => { 3109 "c/examine" => {
2757 id => "infobox", 3110 id => "infobox",
2758 title => "Examine", 3111 title => "Examine",
2759 reply => undef, 3112 reply => undef,
2760 tooltip => "Signs and other items you examined", 3113 tooltip => "Signs and other items you examined",
3114 },
3115 "c/shopinfo" => {
3116 id => "infobox",
3117 title => "Shop Info",
3118 reply => undef,
3119 tooltip => "What your bargaining skill tells you about the shop",
2761 }, 3120 },
2762 "c/book" => { 3121 "c/book" => {
2763 id => "infobox", 3122 id => "infobox",
2764 title => "Book", 3123 title => "Book",
2765 reply => undef, 3124 reply => undef,
2841 id => "death", 3200 id => "death",
2842 title => "Death", 3201 title => "Death",
2843 reply => undef, 3202 reply => undef,
2844 tooltip => "Reason for and more info about your most recent death", 3203 tooltip => "Reason for and more info about your most recent death",
2845 }, 3204 },
3205 "c/fatal" => {
3206 id => "fatal",
3207 title => "Fatal Error",
3208 reply => undef,
3209 tooltip => "Reason for the server disconnect",
3210 },
2846 "c/say" => $SAY_CHANNEL, 3211 "c/say" => $SAY_CHANNEL,
2847 "c/chat" => $CHAT_CHANNEL, 3212 "c/chat" => $CHAT_CHANNEL,
2848); 3213);
2849 3214
2850sub cf::client::send_msg { 3215sub cf::client::send_msg {
2881 my $pkt = "msg " 3246 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3247 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3248 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3249 );
2885 3250
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3251 $self->send_big_packet ($pkt);
2897} 3252}
2898 3253
2899=item $client->ext_msg ($type, @msg) 3254=item $client->ext_msg ($type, @msg)
2900 3255
2901Sends an ext event to the client. 3256Sends an ext event to the client.
2903=cut 3258=cut
2904 3259
2905sub cf::client::ext_msg($$@) { 3260sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3261 my ($self, $type, @msg) = @_;
2907 3262
2908 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3263 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 }
2914}
2915
2916=item $client->ext_reply ($msgid, @msg)
2917
2918Sends an ext reply to the client.
2919
2920=cut
2921
2922sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_;
2924
2925 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 }
2932} 3264}
2933 3265
2934=item $success = $client->query ($flags, "text", \&cb) 3266=item $success = $client->query ($flags, "text", \&cb)
2935 3267
2936Queues a query to the client, calling the given callback with 3268Queues a query to the client, calling the given callback with
2991 my ($ns, $buf) = @_; 3323 my ($ns, $buf) = @_;
2992 3324
2993 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3325 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2994 3326
2995 if (ref $msg) { 3327 if (ref $msg) {
2996 my ($type, $reply, @payload) = 3328 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2997 "ARRAY" eq ref $msg
2998 ? @$msg
2999 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3000 3329
3001 my @reply;
3002
3003 if (my $cb = $EXTICMD{$type}) { 3330 if (my $cb = $EXTIACMD{$type}) {
3331 $cb->(
3332 $ns,
3333 sub {
3334 $ns->ext_msg ("reply-$reply", @_)
3335 if $reply;
3336 },
3337 @payload
3338 );
3339 } else {
3340 my @reply;
3341
3342 if (my $cb = $EXTICMD{$type}) {
3004 @reply = $cb->($ns, @payload); 3343 @reply = $cb->($ns, @payload);
3344 }
3345
3346 $ns->ext_msg ("reply-$reply", @reply)
3347 if $reply;
3005 } 3348 }
3006
3007 $ns->ext_reply ($reply, @reply)
3008 if $reply;
3009
3010 } else { 3349 } else {
3011 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3350 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3012 } 3351 }
3013 3352
3014 cf::override; 3353 cf::override;
3015 }, 3354 },
3016); 3355);
3036 3375
3037 $coro 3376 $coro
3038} 3377}
3039 3378
3040cf::client->attach ( 3379cf::client->attach (
3041 on_destroy => sub { 3380 on_client_destroy => sub {
3042 my ($ns) = @_; 3381 my ($ns) = @_;
3043 3382
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3383 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3384 },
3046); 3385);
3062our $safe_hole = new Safe::Hole; 3401our $safe_hole = new Safe::Hole;
3063 3402
3064$SIG{FPE} = 'IGNORE'; 3403$SIG{FPE} = 'IGNORE';
3065 3404
3066$safe->permit_only (Opcode::opset qw( 3405$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3406 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3407 grepstart grepwhile mapstart mapwhile
3069 sort time 3408 sort time
3070)); 3409));
3071 3410
3072# here we export the classes and methods available to script code 3411# here we export the classes and methods available to script code
3097 decrease split destroy change_exp value msg lore send_msg)], 3436 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3437 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful send_msg)], 3438 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3439 ["cf::map" => qw(trigger)],
3101) { 3440) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3441 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3442 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3443 for @funs;
3106} 3444}
3107 3445
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3462 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3463 $qcode =~ s/\n/\\n/g;
3126 3464
3127 %vars = (_dummy => 0) unless %vars; 3465 %vars = (_dummy => 0) unless %vars;
3128 3466
3467 my @res;
3129 local $_; 3468 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3469
3132 my $eval = 3470 my $eval =
3133 "do {\n" 3471 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3472 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3473 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3474 . $code
3137 . "\n}" 3475 . "\n}"
3138 ; 3476 ;
3139 3477
3478 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3479 sub_generation_inc;
3480 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3481 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3482 sub_generation_inc;
3483 } else {
3484 local @cf::_safe_eval_args = values %vars;
3485 @res = wantarray ? eval eval : scalar eval $eval;
3486 }
3143 3487
3144 if ($@) { 3488 if ($@) {
3145 warn "$@"; 3489 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3490 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3491 "with arguments " . (join " ", %vars) . "\n";
3148 } 3492 }
3149 3493
3150 wantarray ? @res : $res[0] 3494 wantarray ? @res : $res[0]
3151} 3495}
3152 3496
3166=cut 3510=cut
3167 3511
3168sub register_script_function { 3512sub register_script_function {
3169 my ($fun, $cb) = @_; 3513 my ($fun, $cb) = @_;
3170 3514
3171 no strict 'refs'; 3515 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3516 *$fun = $safe_hole->wrap ($cb);
3173} 3517}
3174 3518
3175=back 3519=back
3176 3520
3177=cut 3521=cut
3178 3522
3179############################################################################# 3523#############################################################################
3180# the server's init and main functions 3524# the server's init and main functions
3181 3525
3526{
3527 package cf::face;
3528
3529 our %HASH; # hash => idx
3530 our @DATA; # dynamically-created facedata, only faceste 0 used
3531 our @FOFS; # file offset, if > 0
3532 our @SIZE; # size of face, in octets
3533 our @META; # meta hash of face, if any
3534 our $DATAFH; # facedata filehandle
3535
3536 # internal api, not finalised
3537 sub set {
3538 my ($name, $type, $data) = @_;
3539
3540 my $idx = cf::face::find $name;
3541
3542 if ($idx) {
3543 delete $HASH{cf::face::get_chksum $idx};
3544 } else {
3545 $idx = cf::face::alloc $name;
3546 }
3547
3548 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3549
3550 cf::face::set_type $idx, $type;
3551 cf::face::set_csum $idx, 0, $hash;
3552
3553 # we need to destroy the SV itself, not just modify it, as a running ix
3554 # might hold a reference to it: "delete" achieves that.
3555 delete $FOFS[0][$idx];
3556 delete $DATA[0][$idx];
3557 $DATA[0][$idx] = $data;
3558 $SIZE[0][$idx] = length $data;
3559 delete $META[$idx];
3560 $HASH{$hash} = $idx;#d#
3561
3562 $idx
3563 }
3564
3565 sub _get_data($$$) {
3566 my ($idx, $set, $cb) = @_;
3567
3568 if (defined $DATA[$set][$idx]) {
3569 $cb->($DATA[$set][$idx]);
3570 } elsif (my $fofs = $FOFS[$set][$idx]) {
3571 my $size = $SIZE[$set][$idx];
3572 my $buf;
3573 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3574 if ($_[0] == $size) {
3575 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3576 $cb->($buf);
3577 } else {
3578 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3579 }
3580 };
3581 } else {
3582 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3583 }
3584 }
3585
3586 # rather ineffient
3587 sub cf::face::get_data($;$) {
3588 my ($idx, $set) = @_;
3589
3590 _get_data $idx, $set, Coro::rouse_cb;
3591 Coro::rouse_wait
3592 }
3593
3594 sub cf::face::ix {
3595 my ($ns, $set, $idx, $pri) = @_;
3596
3597 _get_data $idx, $set, sub {
3598 $ns->ix_send ($idx, $pri, $_[0]);
3599 };
3600 }
3601}
3602
3182sub load_facedata($) { 3603sub load_facedata($) {
3183 my ($path) = @_; 3604 my ($path) = @_;
3184 3605
3185 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = ();
3188
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3606 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3607
3191 warn "loading facedata from $path\n"; 3608 trace "loading facedata from $path\n";
3192 3609
3193 my $facedata; 3610 my $facedata = decode_storable load_file "$path/faceinfo";
3194 0 < aio_load $path, $facedata
3195 or die "$path: $!";
3196
3197 $facedata = Coro::Storable::thaw $facedata;
3198 3611
3199 $facedata->{version} == 2 3612 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3613 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3201 3614
3202 # patch in the exptable 3615 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3203 $facedata->{resource}{"res/exp_table"} = { 3616 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3204 type => FT_RSRC, 3617
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3618 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3206 }; 3619
3207 cf::cede_to_tick; 3620 # BEGIN ATOMIC
3621 # from here on, everything must be atomic - no thread switch allowed
3622 my $t1 = EV::time;
3208 3623
3209 { 3624 {
3210 my $faces = $facedata->{faceinfo}; 3625 my $faces = $facedata->{faceinfo};
3211 3626
3212 while (my ($face, $info) = each %$faces) { 3627 for my $face (sort keys %$faces) {
3628 my $info = $faces->{$face};
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3629 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3630
3215 cf::face::set_visibility $idx, $info->{visibility}; 3631 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3632 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3633 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3634 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3219 3635 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3220 cf::cede_to_tick; 3636 $cf::face::HASH{$info->{hash64}} = $idx;
3637 delete $cf::face::META[$idx];
3221 } 3638 }
3222 3639
3223 while (my ($face, $info) = each %$faces) { 3640 while (my ($face, $info) = each %$faces) {
3224 next unless $info->{smooth}; 3641 next unless $info->{smooth};
3225 3642
3228 3645
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3646 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3647 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3648 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3649 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3650 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3651 }
3235
3236 cf::cede_to_tick;
3237 } 3652 }
3238 } 3653 }
3239 3654
3240 { 3655 {
3241 my $anims = $facedata->{animinfo}; 3656 my $anims = $facedata->{animinfo};
3242 3657
3243 while (my ($anim, $info) = each %$anims) { 3658 while (my ($anim, $info) = each %$anims) {
3244 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3659 cf::anim::set $anim, $info->{frames}, $info->{facings};
3245 cf::cede_to_tick;
3246 } 3660 }
3247 3661
3248 cf::anim::invalidate_all; # d'oh 3662 cf::anim::invalidate_all; # d'oh
3249 } 3663 }
3250 3664
3251 { 3665 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3666 my $res = $facedata->{resource};
3255 3667
3256 while (my ($name, $info) = each %$res) { 3668 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3669 if (defined (my $type = $info->{type})) {
3670 # TODO: different hash - must free and use new index, or cache ixface data queue
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3671 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3672
3261 if ($info->{type} & 1) {
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3673 cf::face::set_type $idx, $type;
3674 cf::face::set_csum $idx, 0, $info->{hash};
3675 $cf::face::SIZE[0][$idx] = $info->{size};
3676 $cf::face::FOFS[0][$idx] = $info->{fofs};
3677 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3678 $cf::face::HASH{$info->{hash}} = $idx;
3276 } else { 3679 } else {
3277 $RESOURCE{$name} = $info; 3680# $RESOURCE{$name} = $info; # unused
3278 } 3681 }
3279
3280 cf::cede_to_tick;
3281 } 3682 }
3282 } 3683 }
3684
3685 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3686
3687 # HACK to clear player env face cache, we need some signal framework
3688 # for this (global event?)
3689 %ext::player_env::MUSIC_FACE_CACHE = ();
3690
3691 # END ATOMIC
3692
3693 cf::debug "facedata atomic update time ", EV::time - $t1;
3283 3694
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3695 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3696
3697 aio_close $fh if $fh; # close old facedata
3698
3286 1 3699 1
3287} 3700}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3701
3309register_exticmd fx_want => sub { 3702register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3703 my ($ns, $want) = @_;
3311 3704
3312 while (my ($k, $v) = each %$want) { 3705 while (my ($k, $v) = each %$want) {
3320 my $status = load_resource_file_ $_[0]; 3713 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100; 3714 get_slot 0.1, 100;
3322 cf::arch::commit_load; 3715 cf::arch::commit_load;
3323 3716
3324 $status 3717 $status
3718}
3719
3720sub reload_exp_table {
3721 _reload_exp_table;
3722
3723 cf::face::set
3724 "res/exp_table" => FT_RSRC,
3725 JSON::XS->new->utf8->canonical->encode (
3726 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3727 );
3728}
3729
3730sub reload_materials {
3731 _reload_materials;
3325} 3732}
3326 3733
3327sub reload_regions { 3734sub reload_regions {
3328 # HACK to clear player env face cache, we need some signal framework 3735 # HACK to clear player env face cache, we need some signal framework
3329 # for this (global event?) 3736 # for this (global event?)
3337 if exists $_->{match}; 3744 if exists $_->{match};
3338 } 3745 }
3339} 3746}
3340 3747
3341sub reload_facedata { 3748sub reload_facedata {
3342 load_facedata "$DATADIR/facedata" 3749 load_facedata $DATADIR
3343 or die "unable to load facedata\n"; 3750 or die "unable to load facedata\n";
3344} 3751}
3345 3752
3346sub reload_archetypes { 3753sub reload_archetypes {
3347 load_resource_file "$DATADIR/archetypes" 3754 load_resource_file "$DATADIR/archetypes"
3348 or die "unable to load archetypes\n"; 3755 or die "unable to load archetypes\n";
3756
3757 cf::face::set
3758 "res/skill_info" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3761 );
3762
3763 cf::face::set
3764 "res/spell_paths" => FT_RSRC,
3765 JSON::XS->new->utf8->canonical->encode (
3766 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3767 );
3349} 3768}
3350 3769
3351sub reload_treasures { 3770sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3771 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3772 or die "unable to load treasurelists\n";
3354} 3773}
3355 3774
3775sub reload_sound {
3776 trace "loading sound config from $DATADIR/sound\n";
3777
3778 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3779
3780 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3781 my $sound = $soundconf->{compat}[$_]
3782 or next;
3783
3784 my $face = cf::face::find "sound/$sound->[1]";
3785 cf::sound::set $sound->[0] => $face;
3786 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3787 }
3788
3789 while (my ($k, $v) = each %{$soundconf->{event}}) {
3790 my $face = cf::face::find "sound/$v";
3791 cf::sound::set $k => $face;
3792 }
3793}
3794
3356sub reload_resources { 3795sub reload_resources {
3357 warn "reloading resource files...\n"; 3796 trace "reloading resource files...\n";
3358 3797
3798 reload_materials;
3359 reload_facedata; 3799 reload_facedata;
3800 reload_exp_table;
3801 reload_sound;
3360 reload_archetypes; 3802 reload_archetypes;
3361 reload_regions; 3803 reload_regions;
3362 reload_treasures; 3804 reload_treasures;
3363 3805
3364 warn "finished reloading resource files\n"; 3806 trace "finished reloading resource files\n";
3365} 3807}
3366 3808
3367sub reload_config { 3809sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3810 trace "reloading config file...\n";
3369 or return;
3370 3811
3371 local $/; 3812 my $config = load_file "$CONFDIR/config";
3372 *CFG = YAML::Load <$fh>; 3813 utf8::decode $config;
3814 *CFG = decode_yaml $config;
3373 3815
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3816 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3817
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3818 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3819 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3820
3379 if (exists $CFG{mlockall}) { 3821 if (exists $CFG{mlockall}) {
3403 seek $fh, 0, 0; 3845 seek $fh, 0, 0;
3404 print $fh $$; 3846 print $fh $$;
3405} 3847}
3406 3848
3407sub main_loop { 3849sub main_loop {
3408 warn "EV::loop starting\n"; 3850 trace "EV::loop starting\n";
3409 if (1) { 3851 if (1) {
3410 EV::loop; 3852 EV::loop;
3411 } 3853 }
3412 warn "EV::loop returned\n"; 3854 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3855 goto &main_loop unless $REALLY_UNLOOP;
3414} 3856}
3415 3857
3416sub main { 3858sub main {
3417 cf::init_globals; # initialise logging 3859 cf::init_globals; # initialise logging
3418 3860
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3861 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3862 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3863 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3864 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423 3865
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3866 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430 3867
3431 # we must not ever block the main coroutine 3868 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3869 $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3870 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3871 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3872 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3873 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3874 })->prio (Coro::PRIO_MAX);
3438 }; 3875 };
3439 3876
3440 evthread_start IO::AIO::poll_fileno; 3877 evthread_start IO::AIO::poll_fileno;
3441 3878
3442 cf::sync_job { 3879 cf::sync_job {
3880 cf::incloader::init ();
3881
3882 db_init;
3883
3884 cf::init_anim;
3885 cf::init_attackmess;
3886 cf::init_dynamic;
3887
3888 cf::load_settings;
3889
3443 reload_resources; 3890 reload_resources;
3444 reload_config; 3891 reload_config;
3445 db_init;
3446 3892
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3893 cf::init_uuid;
3450 cf::init_signals; 3894 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3895 cf::init_skills;
3453 3896
3454 cf::init_beforeplay; 3897 cf::init_beforeplay;
3455 3898
3456 atomic; 3899 atomic;
3461 3904
3462 # no (long-running) fork's whatsoever before this point(!) 3905 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX (); 3906 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3907 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465 3908
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3909 cf::_post_init 0;
3467 }; 3910 };
3468 3911
3912 cf::object::thawer::errors_are_fatal 0;
3913 info "parse errors in files are no longer fatal from this point on.\n";
3914
3915 AE::postpone {
3916 undef &main; # free gobs of memory :)
3917 };
3918
3469 main_loop; 3919 goto &main_loop;
3470} 3920}
3471 3921
3472############################################################################# 3922#############################################################################
3473# initialisation and cleanup 3923# initialisation and cleanup
3474 3924
3475# install some emergency cleanup handlers 3925# install some emergency cleanup handlers
3476BEGIN { 3926BEGIN {
3477 our %SIGWATCHER = (); 3927 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3928 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3929 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3930 cf::cleanup "SIG$signal";
3481 }; 3931 };
3482 } 3932 }
3483} 3933}
3484 3934
3485sub write_runtime_sync { 3935sub write_runtime_sync {
3936 my $t0 = AE::time;
3937
3486 # first touch the runtime file to show we are still running: 3938 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3939 # the fsync below can take a very very long time.
3488 3940
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3941 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3942
3491 my $guard = cf::lock_acquire "write_runtime"; 3943 my $guard = cf::lock_acquire "write_runtime";
3492 3944
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3945 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3946 or return;
3495 3947
3496 my $value = $cf::RUNTIME + 90 + 10; 3948 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3949 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3950 # 60 allows for the watchdog to kill the server.
3511 or return; 3963 or return;
3512 3964
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3965 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3966 and return;
3515 3967
3516 warn "runtime file written.\n"; 3968 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3969
3518 1 3970 1
3519} 3971}
3520 3972
3521our $uuid_lock; 3973our $uuid_lock;
3533 or return; 3985 or return;
3534 3986
3535 my $value = uuid_seq uuid_cur; 3987 my $value = uuid_seq uuid_cur;
3536 3988
3537 unless ($value) { 3989 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3990 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3991 return;
3540 } 3992 }
3541 3993
3542 my $value = uuid_str $value + $uuid_skip; 3994 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3995 $uuid_skip = 0;
3553 or return; 4005 or return;
3554 4006
3555 aio_rename "$uuid~", $uuid 4007 aio_rename "$uuid~", $uuid
3556 and return; 4008 and return;
3557 4009
3558 warn "uuid file written ($value).\n"; 4010 trace "uuid file written ($value).\n";
3559 4011
3560 1 4012 1
3561 4013
3562} 4014}
3563 4015
3569} 4021}
3570 4022
3571sub emergency_save() { 4023sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 4024 my $freeze_guard = cf::freeze_mainloop;
3573 4025
3574 warn "emergency_perl_save: enter\n"; 4026 info "emergency_perl_save: enter\n";
4027
4028 # this is a trade-off: we want to be very quick here, so
4029 # save all maps without fsync, and later call a global sync
4030 # (which in turn might be very very slow)
4031 local $USE_FSYNC = 0;
3575 4032
3576 cf::sync_job { 4033 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so 4034 cf::write_runtime_sync; # external watchdog should not bark
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581 4035
3582 # use a peculiar iteration method to avoid tripping on perl 4036 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 4037 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 4038 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 4039 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 4040 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 4041 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 4042 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4043 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 4044 $pl->save;
3591 } 4045 }
3592 warn "emergency_perl_save: end player save\n"; 4046 info "emergency_perl_save: end player save\n";
3593 4047
4048 cf::write_runtime_sync; # external watchdog should not bark
4049
3594 warn "emergency_perl_save: begin map save\n"; 4050 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 4051 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 4052 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 4053 $map->valid or next;
3598 $map->save; 4054 $map->save;
3599 } 4055 }
3600 warn "emergency_perl_save: end map save\n"; 4056 info "emergency_perl_save: end map save\n";
3601 4057
4058 cf::write_runtime_sync; # external watchdog should not bark
4059
3602 warn "emergency_perl_save: begin database checkpoint\n"; 4060 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 4061 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 4062 info "emergency_perl_save: end database checkpoint\n";
3605 4063
3606 warn "emergency_perl_save: begin write uuid\n"; 4064 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 4065 write_uuid_sync 1;
3608 warn "emergency_perl_save: end write uuid\n"; 4066 info "emergency_perl_save: end write uuid\n";
4067
4068 cf::write_runtime_sync; # external watchdog should not bark
4069
4070 trace "emergency_perl_save: syncing database to disk";
4071 BDB::db_env_txn_checkpoint $DB_ENV;
4072
4073 info "emergency_perl_save: starting sync\n";
4074 IO::AIO::aio_sync sub {
4075 info "emergency_perl_save: finished sync\n";
4076 };
4077
4078 cf::write_runtime_sync; # external watchdog should not bark
4079
4080 trace "emergency_perl_save: flushing outstanding aio requests";
4081 while (IO::AIO::nreqs || BDB::nreqs) {
4082 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4083 }
4084
4085 cf::write_runtime_sync; # external watchdog should not bark
3609 }; 4086 };
3610 4087
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3616 warn "emergency_perl_save: leave\n"; 4088 info "emergency_perl_save: leave\n";
3617} 4089}
3618 4090
3619sub post_cleanup { 4091sub post_cleanup {
3620 my ($make_core) = @_; 4092 my ($make_core) = @_;
3621 4093
4094 IO::AIO::flush;
4095
3622 warn Carp::longmess "post_cleanup backtrace" 4096 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 4097 if $make_core;
3624 4098
3625 my $fh = pidfile; 4099 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 4100 unlink $PIDFILE if <$fh> == $$;
3627} 4101}
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4121 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 4122 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 4123 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4124# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 4125 }
3652 warn "cleared package $pkg\n";#d#
3653} 4126}
3654 4127
3655sub do_reload_perl() { 4128sub do_reload_perl() {
3656 # can/must only be called in main 4129 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 4130 unless (in_main) {
3658 warn "can only reload from main coroutine"; 4131 error "can only reload from main coroutine";
3659 return; 4132 return;
3660 } 4133 }
3661 4134
3662 return if $RELOAD++; 4135 return if $RELOAD++;
3663 4136
3664 my $t1 = EV::time; 4137 my $t1 = AE::time;
3665 4138
3666 while ($RELOAD) { 4139 while ($RELOAD) {
3667 warn "reloading..."; 4140 cf::get_slot 0.1, -1, "reload_perl";
4141 info "perl_reload: reloading...";
3668 4142
3669 warn "entering sync_job"; 4143 trace "perl_reload: entering sync_job";
3670 4144
3671 cf::sync_job { 4145 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 4146 #cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark
3675 4147
3676 warn "syncing database to disk";
3677 BDB::db_env_txn_checkpoint $DB_ENV;
3678
3679 # if anything goes wrong in here, we should simply crash as we already saved
3680
3681 warn "flushing outstanding aio requests";
3682 while (IO::AIO::nreqs || BDB::nreqs) {
3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3684 }
3685
3686 warn "cancelling all extension coros"; 4148 trace "perl_reload: cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 4149 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 4150 %EXT_CORO = ();
3689 4151
3690 warn "removing commands"; 4152 trace "perl_reload: removing commands";
3691 %COMMAND = (); 4153 %COMMAND = ();
3692 4154
3693 warn "removing ext/exti commands"; 4155 trace "perl_reload: removing ext/exti commands";
3694 %EXTCMD = (); 4156 %EXTCMD = ();
3695 %EXTICMD = (); 4157 %EXTICMD = ();
3696 4158
3697 warn "unloading/nuking all extensions"; 4159 trace "perl_reload: unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 4160 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 4161 trace "... unloading $pkg";
3700 4162
3701 if (my $cb = $pkg->can ("unload")) { 4163 if (my $cb = $pkg->can ("unload")) {
3702 eval { 4164 eval {
3703 $cb->($pkg); 4165 $cb->($pkg);
3704 1 4166 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 4167 } or error "$pkg unloaded, but with errors: $@";
3706 } 4168 }
3707 4169
3708 warn "... clearing $pkg"; 4170 trace "... clearing $pkg";
3709 clear_package $pkg; 4171 clear_package $pkg;
3710 } 4172 }
3711 4173
3712 warn "unloading all perl modules loaded from $LIBDIR"; 4174 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 4175 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4176 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 4177
3716 warn "... unloading $k"; 4178 trace "... unloading $k";
3717 delete $INC{$k}; 4179 delete $INC{$k};
3718 4180
3719 $k =~ s/\.pm$//; 4181 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 4182 $k =~ s/\//::/g;
3721 4183
3724 } 4186 }
3725 4187
3726 clear_package $k; 4188 clear_package $k;
3727 } 4189 }
3728 4190
3729 warn "getting rid of safe::, as good as possible"; 4191 trace "perl_reload: getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 4192 clear_package "safe::$_"
3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4193 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3732 4194
3733 warn "unloading cf.pm \"a bit\""; 4195 trace "perl_reload: unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 4196 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4197 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 4198
3737 # don't, removes xs symbols, too, 4199 # don't, removes xs symbols, too,
3738 # and global variables created in xs 4200 # and global variables created in xs
3739 #clear_package __PACKAGE__; 4201 #clear_package __PACKAGE__;
3740 4202
3741 warn "unload completed, starting to reload now"; 4203 info "perl_reload: unload completed, starting to reload now";
3742 4204
3743 warn "reloading cf.pm"; 4205 trace "perl_reload: reloading cf.pm";
3744 require cf; 4206 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4207 cf::_connect_to_perl_1;
3746 4208
3747 warn "loading config and database again"; 4209 trace "perl_reload: loading config and database again";
3748 cf::reload_config; 4210 cf::reload_config;
3749 4211
3750 warn "loading extensions"; 4212 trace "perl_reload: loading extensions";
3751 cf::load_extensions; 4213 cf::load_extensions;
3752 4214
3753 if ($REATTACH_ON_RELOAD) { 4215 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 4216 trace "perl_reload: reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 4217 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 4218 trace "perl_reload: reattaching attachments to maps";
3757 reattach $_ for values %MAP; 4219 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 4220 trace "perl_reload: reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 4221 reattach $_ for values %PLAYER;
3760 } 4222 }
3761 4223
3762 warn "running post_init jobs"; 4224 cf::_post_init 1;
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764 4225
3765 warn "leaving sync_job"; 4226 trace "perl_reload: leaving sync_job";
3766 4227
3767 1 4228 1
3768 } or do { 4229 } or do {
3769 warn $@; 4230 error $@;
3770 cf::cleanup "error while reloading, exiting."; 4231 cf::cleanup "perl_reload: error, exiting.";
3771 }; 4232 };
3772 4233
3773 warn "reloaded";
3774 --$RELOAD; 4234 --$RELOAD;
3775 } 4235 }
3776 4236
3777 $t1 = EV::time - $t1; 4237 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 4238 info "perl_reload: completed in ${t1}s\n";
3779}; 4239};
3780 4240
3781our $RELOAD_WATCHER; # used only during reload 4241our $RELOAD_WATCHER; # used only during reload
3782 4242
3783sub reload_perl() { 4243sub reload_perl() {
3785 # coro crashes during coro_state_free->destroy here. 4245 # coro crashes during coro_state_free->destroy here.
3786 4246
3787 $RELOAD_WATCHER ||= cf::async { 4247 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 4248 Coro::AIO::aio_wait cache_extensions;
3789 4249
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4250 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 4251 do_reload_perl;
3792 undef $RELOAD_WATCHER; 4252 undef $RELOAD_WATCHER;
3793 }; 4253 };
3794 }; 4254 };
3795} 4255}
3804 reload_perl; 4264 reload_perl;
3805 }; 4265 };
3806 } 4266 }
3807}; 4267};
3808 4268
3809unshift @INC, $LIBDIR; 4269#############################################################################
3810 4270
3811my $bug_warning = 0; 4271my $bug_warning = 0;
3812 4272
3813our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN;
3815
3816sub wait_for_tick { 4273sub wait_for_tick() {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3818 4275
3819 my $signal = new Coro::Signal; 4276 $WAIT_FOR_TICK->wait;
3820 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait;
3822} 4277}
3823 4278
3824sub wait_for_tick_begin { 4279sub wait_for_tick_begin() {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4280 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3826 4281
3827 my $signal = new Coro::Signal; 4282 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4283 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4284 $signal->wait;
3830} 4285}
3834 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4289 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3835 unless ++$bug_warning > 10; 4290 unless ++$bug_warning > 10;
3836 return; 4291 return;
3837 } 4292 }
3838 4293
3839 cf::server_tick; # one server iteration 4294 cf::one_tick; # one server iteration
4295
4296 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3840 4297
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4298 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4299 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3843 Coro::async_pool { 4300 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4301 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4302 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4303 or error "ERROR: unable to write runtime file: $!";
3847 }; 4304 };
3848 } 4305 }
3849 4306
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4308 $sig->send;
3852 } 4309 }
3853 while (my $sig = shift @WAIT_FOR_TICK) { 4310 $WAIT_FOR_TICK->broadcast;
3854 $sig->send;
3855 }
3856 4311
3857 $LOAD = ($NOW - $TICK_START) / $TICK; 4312 $LOAD = ($NOW - $TICK_START) / $TICK;
3858 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4313 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3859 4314
3860 if (0) { 4315 if (0) {
3861 if ($NEXT_TICK) { 4316 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4317 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4318 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4319 debug "jitter $JITTER\n";#d#
3865 } 4320 }
3866 } 4321 }
3867} 4322}
3868 4323
3869{ 4324{
3870 # configure BDB 4325 # configure BDB
4326 info "initialising database";
3871 4327
3872 BDB::min_parallel 8; 4328 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4329 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4330 #$AnyEvent::BDB::WATCHER->priority (1);
3875 4331
3876 unless ($DB_ENV) { 4332 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4333 $DB_ENV = BDB::db_env_create;
3878 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4334 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3879 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4335 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3904 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4360 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3905 }; 4361 };
3906 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4362 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3907 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4363 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3908 }; 4364 };
4365
4366 info "database initialised";
3909} 4367}
3910 4368
3911{ 4369{
3912 # configure IO::AIO 4370 # configure IO::AIO
3913 4371
4372 info "initialising aio";
3914 IO::AIO::min_parallel 8; 4373 IO::AIO::min_parallel 8;
3915 IO::AIO::max_poll_time $TICK * 0.1; 4374 IO::AIO::max_poll_time $TICK * 0.1;
3916 undef $AnyEvent::AIO::WATCHER; 4375 undef $AnyEvent::AIO::WATCHER;
4376 info "aio initialised";
3917} 4377}
3918 4378
3919my $_log_backtrace; 4379our $_log_backtrace;
4380our $_log_backtrace_last;
3920 4381
3921sub _log_backtrace { 4382sub _log_backtrace {
3922 my ($msg, @addr) = @_; 4383 my ($msg, @addr) = @_;
3923 4384
3924 $msg =~ s/\n//; 4385 $msg =~ s/\n$//;
3925 4386
4387 if ($_log_backtrace_last eq $msg) {
4388 LOG llevInfo, "[ABT] $msg\n";
4389 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3926 # limit the # of concurrent backtraces 4390 # limit the # of concurrent backtraces
3927 if ($_log_backtrace < 2) { 4391 } elsif ($_log_backtrace < 2) {
4392 $_log_backtrace_last = $msg;
3928 ++$_log_backtrace; 4393 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg; 4394 my $perl_bt = Carp::longmess $msg;
3930 async { 4395 async {
3931 $Coro::current->{desc} = "abt $msg"; 4396 $Coro::current->{desc} = "abt $msg";
3932 4397
3952 LOG llevInfo, "[ABT] $_\n" for @bt; 4417 LOG llevInfo, "[ABT] $_\n" for @bt;
3953 --$_log_backtrace; 4418 --$_log_backtrace;
3954 }; 4419 };
3955 } else { 4420 } else {
3956 LOG llevInfo, "[ABT] $msg\n"; 4421 LOG llevInfo, "[ABT] $msg\n";
3957 LOG llevInfo, "[ABT] [suppressed]\n"; 4422 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3958 } 4423 }
3959} 4424}
3960 4425
3961# load additional modules 4426# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4427require "cf/$_.pm" for @EXTRA_MODULES;
4428cf::_connect_to_perl_2;
3963 4429
3964END { cf::emergency_save } 4430END { cf::emergency_save }
3965 4431
39661 44321
3967 4433

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines