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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines