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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines