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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.608 by root, Sun Nov 18 09:53:57 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
64AnyEvent::detect; 66AnyEvent::detect;
65 67
77# strictly for debugging 79# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 81
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
81 83
84our @ORIG_INC;
85
82our %COMMAND = (); 86our %COMMAND = ();
83our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
84 88
85our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
86our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
87our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
88our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
90 96
91our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
93 101
94our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
95our $DATADIR = datadir; 104our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
99our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 117
108our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
109 125
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 128our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 134our $DB_ENV;
119 135
120our @EXTRA_MODULES = qw(pod mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 137
122our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
123 140
124our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
126our $NOW; 144our $NOW;
127 145
128our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
139 157
140our @POST_INIT; 158our @POST_INIT;
141 159
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
144 165
145binmode STDOUT; 166binmode STDOUT;
146binmode STDERR; 167binmode STDERR;
147 168
148# read virtual server time, if available 169# read virtual server time, if available
159 180
160our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
161 182
162sub cf::map::normalise; 183sub cf::map::normalise;
163 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
164############################################################################# 189#############################################################################
165 190
191%REFLECT = ();
192for (@REFLECT) {
193 my $reflect = JSON::XS::decode_json $_;
194 $REFLECT{$reflect->{class}} = $reflect;
195}
196
197# this is decidedly evil
198$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
199
200#############################################################################
201
166=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
167 203
168=over 4 204=over 4
169 205
170=item $cf::UPTIME 206=item $cf::UPTIME
171 207
172The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
173 224
174=item $cf::RUNTIME 225=item $cf::RUNTIME
175 226
176The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
177every server tick. 228every server tick.
178 229
179=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
180$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
181$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
182 233
183Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
186database environment. 237database environment.
187 238
188=item $cf::NOW
189
190The time of the last (current) server tick.
191
192=item $cf::TICK
193
194The interval between server ticks, in seconds.
195
196=item $cf::LOADAVG 239=item $cf::LOADAVG
197 240
198The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
199(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
200objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
208Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
209from wherever your confdir points to. 252from wherever your confdir points to.
210 253
211=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
212 255
213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
214returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
216 277
217=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
218 279
219This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 282that call.
222 283
284=item %cf::REFLECT
285
286Contains, for each (C++) class name, a hash reference with information
287about object members (methods, scalars, arrays and flags) and other
288metadata, which is useful for introspection.
289
223=back 290=back
224 291
225=cut 292=cut
226 293
227BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
228 *CORE::GLOBAL::warn = sub { 295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
300$Coro::State::WARNHOOK = sub {
229 my $msg = join "", @_; 301 my $msg = join "", @_;
230 302
231 $msg .= "\n" 303 $msg .= "\n"
232 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
233 305
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 307
236 LOG llevError, $msg; 308 LOG llevWarn, $msg;
237 }; 309};
238}
239 310
240$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
242 313
243 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 318 return;#d#
246 }#d# 319 }#d#
247 320
248 # kill coroutine otherwise 321 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 322 Coro::terminate
251}; 323};
252
253$SIG{__DIE__} = sub { }; #d#?
254 324
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 342)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 344}
275 345
276$EV::DIED = sub { 346$EV::DIED = sub {
277 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
278}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
279 354
280############################################################################# 355#############################################################################
281 356
282=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
283 358
304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
305 $d 380 $d
306 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
307} 382}
308 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
309=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
310 437
311Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
312 439
313=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320 447
321sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
323 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
324=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
325 483
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
328 486
329The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 488is a reload or not.
331 489
332=cut 490=cut
333 491
334sub post_init(&) { 492sub post_init(&) {
335 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
336} 511}
337 512
338=item cf::lock_wait $string 513=item cf::lock_wait $string
339 514
340Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
379} 554}
380 555
381=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
382 557
383Like EV::periodic, but randomly selects a starting point so that the actions 558Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer. 559get spread over time.
385 560
386=cut 561=cut
387 562
388sub periodic($$) { 563sub periodic($$) {
389 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
393 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
394} 569}
395 570
396=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
397 572
398Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
399This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
400of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority 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 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2834
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2544} 2837 # entering was successful
2838 delete $self->{_link_recursion};
2839 # only activate afterwards, to support waiting in hooks
2840 $self->activate_recursive;
2841 }
2545 2842
2843}
2844
2546=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)]])
2547 2846
2548Moves 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
2549her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2550that 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
2551the 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
2558 2857
2559our $GOTOGEN; 2858our $GOTOGEN;
2560 2859
2561sub cf::object::player::goto { 2860sub cf::object::player::goto {
2562 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 }
2563 2868
2564 # 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
2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566 2871
2567 $self->enter_link; 2872 $self->enter_link;
2587 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2588 } 2893 }
2589 } 2894 }
2590 2895
2591 my $map = eval { 2896 my $map = eval {
2592 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2593 2898
2594 if ($map) { 2899 if ($map) {
2595 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2596 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2597 } else { 2902 } else {
2598 $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);
2599 } 2904 }
2600 2905
2601 $map 2906 $map
2609 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2610 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2611 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2612 } 2917 }
2613 2918
2614 $done->() if $done; 2919 $done->($self) if $done;
2615 })->prio (1); 2920 })->prio (1);
2616} 2921}
2617 2922
2618=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2619 2924
2687 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2688 2993
2689 unless (eval { 2994 unless (eval {
2690 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2691 2996
2692 # random map handling
2693 {
2694 my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696 prepare_random_map $exit
2697 if $exit->slaying eq "/!";
2698 }
2699
2700 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2701 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2702 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 }
2703 3023
2704 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2705 3025
2706 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2707 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2712 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2713 . "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. "
2714 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2715 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2716 3036
2717 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2718 $self->leave_link; 3038 $self->leave_link;
2719 } 3039 }
2720 })->prio (1); 3040 })->prio (1);
2721} 3041}
2722 3042
2723=head3 cf::client 3043=head3 cf::client
2724 3044
2725=over 4 3045=over 4
2726 3046
2727=item $client->send_drawinfo ($text, $flags) 3047=item $client->send_big_packet ($pkt)
2728 3048
2729Sends a drawinfo packet to the client. Circumvents output buffering so 3049Like C<send_packet>, but tries to compress large packets, and fragments
2730should not be used under normal circumstances. 3050them as required.
2731 3051
2732=cut 3052=cut
2733 3053
3054our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3055
2734sub cf::client::send_drawinfo { 3056sub cf::client::send_big_packet {
2735 my ($self, $text, $flags) = @_; 3057 my ($self, $pkt) = @_;
2736 3058
2737 utf8::encode $text; 3059 # try lzf for large packets
2738 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3060 $pkt = "lzf " . Compress::LZF::compress $pkt
3061 if 1024 <= length $pkt and $self->{can_lzf};
3062
3063 # split very large packets
3064 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3065 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3066 $pkt = "frag";
3067 }
3068
3069 $self->send_packet ($pkt);
2739} 3070}
2740 3071
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 3073
2743Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
2744client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
2745the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
2746the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
2747 3078
2748=cut 3079=cut
2749 3080
2750# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 3082our %CHANNEL = (
3083 "c/motd" => {
3084 id => "infobox",
3085 title => "MOTD",
3086 reply => undef,
3087 tooltip => "The message of the day",
3088 },
2752 "c/identify" => { 3089 "c/identify" => {
2753 id => "infobox", 3090 id => "infobox",
2754 title => "Identify", 3091 title => "Identify",
2755 reply => undef, 3092 reply => undef,
2756 tooltip => "Items recently identified", 3093 tooltip => "Items recently identified",
2758 "c/examine" => { 3095 "c/examine" => {
2759 id => "infobox", 3096 id => "infobox",
2760 title => "Examine", 3097 title => "Examine",
2761 reply => undef, 3098 reply => undef,
2762 tooltip => "Signs and other items you examined", 3099 tooltip => "Signs and other items you examined",
3100 },
3101 "c/shopinfo" => {
3102 id => "infobox",
3103 title => "Shop Info",
3104 reply => undef,
3105 tooltip => "What your bargaining skill tells you about the shop",
2763 }, 3106 },
2764 "c/book" => { 3107 "c/book" => {
2765 id => "infobox", 3108 id => "infobox",
2766 title => "Book", 3109 title => "Book",
2767 reply => undef, 3110 reply => undef,
2843 id => "death", 3186 id => "death",
2844 title => "Death", 3187 title => "Death",
2845 reply => undef, 3188 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
2847 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
2848 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
2850); 3199);
2851 3200
2852sub cf::client::send_msg { 3201sub cf::client::send_msg {
2883 my $pkt = "msg " 3232 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 3233 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3234 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 3235 );
2887 3236
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 3237 $self->send_big_packet ($pkt);
2899} 3238}
2900 3239
2901=item $client->ext_msg ($type, @msg) 3240=item $client->ext_msg ($type, @msg)
2902 3241
2903Sends an ext event to the client. 3242Sends an ext event to the client.
2905=cut 3244=cut
2906 3245
2907sub cf::client::ext_msg($$@) { 3246sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3247 my ($self, $type, @msg) = @_;
2909 3248
2910 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3249 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 }
2916}
2917
2918=item $client->ext_reply ($msgid, @msg)
2919
2920Sends an ext reply to the client.
2921
2922=cut
2923
2924sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_;
2926
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 }
2934} 3250}
2935 3251
2936=item $success = $client->query ($flags, "text", \&cb) 3252=item $success = $client->query ($flags, "text", \&cb)
2937 3253
2938Queues a query to the client, calling the given callback with 3254Queues a query to the client, calling the given callback with
2993 my ($ns, $buf) = @_; 3309 my ($ns, $buf) = @_;
2994 3310
2995 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3311 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2996 3312
2997 if (ref $msg) { 3313 if (ref $msg) {
2998 my ($type, $reply, @payload) = 3314 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2999 "ARRAY" eq ref $msg
3000 ? @$msg
3001 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3002 3315
3003 my @reply;
3004
3005 if (my $cb = $EXTICMD{$type}) { 3316 if (my $cb = $EXTIACMD{$type}) {
3317 $cb->(
3318 $ns,
3319 sub {
3320 $ns->ext_msg ("reply-$reply", @_)
3321 if $reply;
3322 },
3323 @payload
3324 );
3325 } else {
3326 my @reply;
3327
3328 if (my $cb = $EXTICMD{$type}) {
3006 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
3330 }
3331
3332 $ns->ext_msg ("reply-$reply", @reply)
3333 if $reply;
3007 } 3334 }
3008
3009 $ns->ext_reply ($reply, @reply)
3010 if $reply;
3011
3012 } else { 3335 } else {
3013 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014 } 3337 }
3015 3338
3016 cf::override; 3339 cf::override;
3017 }, 3340 },
3018); 3341);
3038 3361
3039 $coro 3362 $coro
3040} 3363}
3041 3364
3042cf::client->attach ( 3365cf::client->attach (
3043 on_destroy => sub { 3366 on_client_destroy => sub {
3044 my ($ns) = @_; 3367 my ($ns) = @_;
3045 3368
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3370 },
3048); 3371);
3064our $safe_hole = new Safe::Hole; 3387our $safe_hole = new Safe::Hole;
3065 3388
3066$SIG{FPE} = 'IGNORE'; 3389$SIG{FPE} = 'IGNORE';
3067 3390
3068$safe->permit_only (Opcode::opset qw( 3391$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3392 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3393 grepstart grepwhile mapstart mapwhile
3071 sort time 3394 sort time
3072)); 3395));
3073 3396
3074# here we export the classes and methods available to script code 3397# here we export the classes and methods available to script code
3099 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3103) { 3426) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3429 for @funs;
3108} 3430}
3109 3431
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3448 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3449 $qcode =~ s/\n/\\n/g;
3128 3450
3129 %vars = (_dummy => 0) unless %vars; 3451 %vars = (_dummy => 0) unless %vars;
3130 3452
3453 my @res;
3131 local $_; 3454 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3455
3134 my $eval = 3456 my $eval =
3135 "do {\n" 3457 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3458 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3459 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3460 . $code
3139 . "\n}" 3461 . "\n}"
3140 ; 3462 ;
3141 3463
3464 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3465 sub_generation_inc;
3466 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3467 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 sub_generation_inc; 3468 sub_generation_inc;
3469 } else {
3470 local @cf::_safe_eval_args = values %vars;
3471 @res = wantarray ? eval eval : scalar eval $eval;
3472 }
3145 3473
3146 if ($@) { 3474 if ($@) {
3147 warn "$@"; 3475 warn "$@",
3148 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3150 } 3478 }
3151 3479
3152 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3153} 3481}
3154 3482
3168=cut 3496=cut
3169 3497
3170sub register_script_function { 3498sub register_script_function {
3171 my ($fun, $cb) = @_; 3499 my ($fun, $cb) = @_;
3172 3500
3173 no strict 'refs'; 3501 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3502 *$fun = $safe_hole->wrap ($cb);
3175} 3503}
3176 3504
3177=back 3505=back
3178 3506
3179=cut 3507=cut
3180 3508
3181############################################################################# 3509#############################################################################
3182# the server's init and main functions 3510# the server's init and main functions
3183 3511
3512{
3513 package cf::face;
3514
3515 our %HASH; # hash => idx
3516 our @DATA; # dynamically-created facedata, only faceste 0 used
3517 our @FOFS; # file offset, if > 0
3518 our @SIZE; # size of face, in octets
3519 our @META; # meta hash of face, if any
3520 our $DATAFH; # facedata filehandle
3521
3522 # internal api, not finalised
3523 sub set {
3524 my ($name, $type, $data) = @_;
3525
3526 my $idx = cf::face::find $name;
3527
3528 if ($idx) {
3529 delete $HASH{cf::face::get_csum $idx};
3530 } else {
3531 $idx = cf::face::alloc $name;
3532 }
3533
3534 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3535
3536 cf::face::set_type $idx, $type;
3537 cf::face::set_csum $idx, 0, $hash;
3538
3539 # we need to destroy the SV itself, not just modify it, as a running ix
3540 # might hold a reference to it: "delete" achieves that.
3541 delete $FOFS[0][$idx];
3542 delete $DATA[0][$idx];
3543 $DATA[0][$idx] = $data;
3544 $SIZE[0][$idx] = length $data;
3545 delete $META[$idx];
3546 $HASH{$hash} = $idx;#d#
3547
3548 $idx
3549 }
3550
3551 sub _get_data($$$) {
3552 my ($idx, $set, $cb) = @_;
3553
3554 if (defined $DATA[$set][$idx]) {
3555 $cb->($DATA[$set][$idx]);
3556 } elsif (my $fofs = $FOFS[$set][$idx]) {
3557 my $size = $SIZE[$set][$idx];
3558 my $buf;
3559 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3560 if ($_[0] == $size) {
3561 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3562 $cb->($buf);
3563 } else {
3564 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3565 }
3566 };
3567 } else {
3568 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3569 }
3570 }
3571
3572 # rather ineffient
3573 sub cf::face::get_data($;$) {
3574 my ($idx, $set) = @_;
3575
3576 _get_data $idx, $set, Coro::rouse_cb;
3577 Coro::rouse_wait
3578 }
3579
3580 sub cf::face::ix {
3581 my ($ns, $set, $idx, $pri) = @_;
3582
3583 _get_data $idx, $set, sub {
3584 $ns->ix_send ($idx, $pri, $_[0]);
3585 };
3586 }
3587}
3588
3184sub load_facedata($) { 3589sub load_facedata($) {
3185 my ($path) = @_; 3590 my ($path) = @_;
3186 3591
3187 # HACK to clear player env face cache, we need some signal framework
3188 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = ();
3190
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3592 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192 3593
3193 warn "loading facedata from $path\n"; 3594 trace "loading facedata from $path\n";
3194 3595
3195 my $facedata; 3596 my $facedata = decode_storable load_file "$path/faceinfo";
3196 0 < aio_load $path, $facedata
3197 or die "$path: $!";
3198
3199 $facedata = Coro::Storable::thaw $facedata;
3200 3597
3201 $facedata->{version} == 2 3598 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3599 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3203 3600
3204 # patch in the exptable 3601 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3205 $facedata->{resource}{"res/exp_table"} = { 3602 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3206 type => FT_RSRC, 3603
3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3604 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3208 }; 3605
3209 cf::cede_to_tick; 3606 # BEGIN ATOMIC
3607 # from here on, everything must be atomic - no thread switch allowed
3608 my $t1 = EV::time;
3210 3609
3211 { 3610 {
3212 my $faces = $facedata->{faceinfo}; 3611 my $faces = $facedata->{faceinfo};
3213 3612
3214 while (my ($face, $info) = each %$faces) { 3613 for my $face (sort keys %$faces) {
3614 my $info = $faces->{$face};
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3615 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3616
3217 cf::face::set_visibility $idx, $info->{visibility}; 3617 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3618 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3619 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3620 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3221 3621 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3222 cf::cede_to_tick; 3622 $cf::face::HASH{$info->{hash64}} = $idx;
3623 delete $cf::face::META[$idx];
3223 } 3624 }
3224 3625
3225 while (my ($face, $info) = each %$faces) { 3626 while (my ($face, $info) = each %$faces) {
3226 next unless $info->{smooth}; 3627 next unless $info->{smooth};
3227 3628
3230 3631
3231 if (my $smooth = cf::face::find $info->{smooth}) { 3632 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth; 3633 cf::face::set_smooth $idx, $smooth;
3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3634 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234 } else { 3635 } else {
3235 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3636 error "smooth face '$info->{smooth}' not found for face '$face'";
3236 } 3637 }
3237
3238 cf::cede_to_tick;
3239 } 3638 }
3240 } 3639 }
3241 3640
3242 { 3641 {
3243 my $anims = $facedata->{animinfo}; 3642 my $anims = $facedata->{animinfo};
3244 3643
3245 while (my ($anim, $info) = each %$anims) { 3644 while (my ($anim, $info) = each %$anims) {
3246 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3645 cf::anim::set $anim, $info->{frames}, $info->{facings};
3247 cf::cede_to_tick;
3248 } 3646 }
3249 3647
3250 cf::anim::invalidate_all; # d'oh 3648 cf::anim::invalidate_all; # d'oh
3251 } 3649 }
3252 3650
3253 { 3651 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3652 my $res = $facedata->{resource};
3257 3653
3258 while (my ($name, $info) = each %$res) { 3654 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3655 if (defined (my $type = $info->{type})) {
3656 # TODO: different hash - must free and use new index, or cache ixface data queue
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3657 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3658
3263 if ($info->{type} & 1) {
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type}; 3659 cf::face::set_type $idx, $type;
3660 cf::face::set_csum $idx, 0, $info->{hash};
3661 $cf::face::SIZE[0][$idx] = $info->{size};
3662 $cf::face::FOFS[0][$idx] = $info->{fofs};
3663 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3664 $cf::face::HASH{$info->{hash}} = $idx;
3278 } else { 3665 } else {
3279 $RESOURCE{$name} = $info; 3666# $RESOURCE{$name} = $info; # unused
3280 } 3667 }
3281
3282 cf::cede_to_tick;
3283 } 3668 }
3284 } 3669 }
3670
3671 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3672
3673 # HACK to clear player env face cache, we need some signal framework
3674 # for this (global event?)
3675 %ext::player_env::MUSIC_FACE_CACHE = ();
3676
3677 # END ATOMIC
3678
3679 cf::debug "facedata atomic update time ", EV::time - $t1;
3285 3680
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3681 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287 3682
3683 aio_close $fh if $fh; # close old facedata
3684
3288 1 3685 1
3289} 3686}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3310 3687
3311register_exticmd fx_want => sub { 3688register_exticmd fx_want => sub {
3312 my ($ns, $want) = @_; 3689 my ($ns, $want) = @_;
3313 3690
3314 while (my ($k, $v) = each %$want) { 3691 while (my ($k, $v) = each %$want) {
3322 my $status = load_resource_file_ $_[0]; 3699 my $status = load_resource_file_ $_[0];
3323 get_slot 0.1, 100; 3700 get_slot 0.1, 100;
3324 cf::arch::commit_load; 3701 cf::arch::commit_load;
3325 3702
3326 $status 3703 $status
3704}
3705
3706sub reload_exp_table {
3707 _reload_exp_table;
3708
3709 cf::face::set
3710 "res/exp_table" => FT_RSRC,
3711 JSON::XS->new->utf8->canonical->encode (
3712 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3713 );
3714}
3715
3716sub reload_materials {
3717 _reload_materials;
3327} 3718}
3328 3719
3329sub reload_regions { 3720sub reload_regions {
3330 # HACK to clear player env face cache, we need some signal framework 3721 # HACK to clear player env face cache, we need some signal framework
3331 # for this (global event?) 3722 # for this (global event?)
3339 if exists $_->{match}; 3730 if exists $_->{match};
3340 } 3731 }
3341} 3732}
3342 3733
3343sub reload_facedata { 3734sub reload_facedata {
3344 load_facedata "$DATADIR/facedata" 3735 load_facedata $DATADIR
3345 or die "unable to load facedata\n"; 3736 or die "unable to load facedata\n";
3346} 3737}
3347 3738
3348sub reload_archetypes { 3739sub reload_archetypes {
3349 load_resource_file "$DATADIR/archetypes" 3740 load_resource_file "$DATADIR/archetypes"
3350 or die "unable to load archetypes\n"; 3741 or die "unable to load archetypes\n";
3742
3743 cf::face::set
3744 "res/skill_info" => FT_RSRC,
3745 JSON::XS->new->utf8->canonical->encode (
3746 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3747 );
3748
3749 cf::face::set
3750 "res/spell_paths" => FT_RSRC,
3751 JSON::XS->new->utf8->canonical->encode (
3752 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3753 );
3351} 3754}
3352 3755
3353sub reload_treasures { 3756sub reload_treasures {
3354 load_resource_file "$DATADIR/treasures" 3757 load_resource_file "$DATADIR/treasures"
3355 or die "unable to load treasurelists\n"; 3758 or die "unable to load treasurelists\n";
3356} 3759}
3357 3760
3761sub reload_sound {
3762 trace "loading sound config from $DATADIR/sound\n";
3763
3764 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3765
3766 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3767 my $sound = $soundconf->{compat}[$_]
3768 or next;
3769
3770 my $face = cf::face::find "sound/$sound->[1]";
3771 cf::sound::set $sound->[0] => $face;
3772 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3773 }
3774
3775 while (my ($k, $v) = each %{$soundconf->{event}}) {
3776 my $face = cf::face::find "sound/$v";
3777 cf::sound::set $k => $face;
3778 }
3779}
3780
3358sub reload_resources { 3781sub reload_resources {
3359 warn "reloading resource files...\n"; 3782 trace "reloading resource files...\n";
3360 3783
3784 reload_materials;
3361 reload_facedata; 3785 reload_facedata;
3786 reload_exp_table;
3787 reload_sound;
3362 reload_archetypes; 3788 reload_archetypes;
3363 reload_regions; 3789 reload_regions;
3364 reload_treasures; 3790 reload_treasures;
3365 3791
3366 warn "finished reloading resource files\n"; 3792 trace "finished reloading resource files\n";
3367} 3793}
3368 3794
3369sub reload_config { 3795sub reload_config {
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3796 trace "reloading config file...\n";
3371 or return;
3372 3797
3373 local $/; 3798 my $config = load_file "$CONFDIR/config";
3374 *CFG = YAML::Load <$fh>; 3799 utf8::decode $config;
3800 *CFG = decode_yaml $config;
3375 3801
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3802 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377 3803
3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3804 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3805 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380 3806
3381 if (exists $CFG{mlockall}) { 3807 if (exists $CFG{mlockall}) {
3405 seek $fh, 0, 0; 3831 seek $fh, 0, 0;
3406 print $fh $$; 3832 print $fh $$;
3407} 3833}
3408 3834
3409sub main_loop { 3835sub main_loop {
3410 warn "EV::loop starting\n"; 3836 trace "EV::loop starting\n";
3411 if (1) { 3837 if (1) {
3412 EV::loop; 3838 EV::loop;
3413 } 3839 }
3414 warn "EV::loop returned\n"; 3840 trace "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP; 3841 goto &main_loop unless $REALLY_UNLOOP;
3416} 3842}
3417 3843
3418sub main { 3844sub main {
3419 cf::init_globals; # initialise logging 3845 cf::init_globals; # initialise logging
3420 3846
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3847 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3848 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3849 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3850 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425 3851
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3852 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432 3853
3433 # we must not ever block the main coroutine 3854 # we must not ever block the main coroutine
3434 local $Coro::idle = sub { 3855 $Coro::idle = sub {
3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3856 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3436 (async { 3857 (async {
3437 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3858 $Coro::current->{desc} = "IDLE BUG HANDLER";
3438 EV::loop EV::LOOP_ONESHOT; 3859 EV::loop EV::LOOP_ONESHOT;
3439 })->prio (Coro::PRIO_MAX); 3860 })->prio (Coro::PRIO_MAX);
3440 }; 3861 };
3441 3862
3442 evthread_start IO::AIO::poll_fileno; 3863 evthread_start IO::AIO::poll_fileno;
3443 3864
3444 cf::sync_job { 3865 cf::sync_job {
3866 cf::incloader::init ();
3867
3868 db_init;
3869
3870 cf::init_anim;
3871 cf::init_attackmess;
3872 cf::init_dynamic;
3873
3874 cf::load_settings;
3875
3445 reload_resources; 3876 reload_resources;
3446 reload_config; 3877 reload_config;
3447 db_init;
3448 3878
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3879 cf::init_uuid;
3452 cf::init_signals; 3880 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3881 cf::init_skills;
3455 3882
3456 cf::init_beforeplay; 3883 cf::init_beforeplay;
3457 3884
3458 atomic; 3885 atomic;
3460 load_extensions; 3887 load_extensions;
3461 3888
3462 utime time, time, $RUNTIMEFILE; 3889 utime time, time, $RUNTIMEFILE;
3463 3890
3464 # no (long-running) fork's whatsoever before this point(!) 3891 # no (long-running) fork's whatsoever before this point(!)
3892 use POSIX ();
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3893 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466 3894
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3895 cf::_post_init 0;
3468 }; 3896 };
3469 3897
3898 cf::object::thawer::errors_are_fatal 0;
3899 info "parse errors in files are no longer fatal from this point on.\n";
3900
3901 AE::postpone {
3902 undef &main; # free gobs of memory :)
3903 };
3904
3470 main_loop; 3905 goto &main_loop;
3471} 3906}
3472 3907
3473############################################################################# 3908#############################################################################
3474# initialisation and cleanup 3909# initialisation and cleanup
3475 3910
3476# install some emergency cleanup handlers 3911# install some emergency cleanup handlers
3477BEGIN { 3912BEGIN {
3478 our %SIGWATCHER = (); 3913 our %SIGWATCHER = ();
3479 for my $signal (qw(INT HUP TERM)) { 3914 for my $signal (qw(INT HUP TERM)) {
3480 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3915 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3481 cf::cleanup "SIG$signal"; 3916 cf::cleanup "SIG$signal";
3482 }; 3917 };
3483 } 3918 }
3484} 3919}
3485 3920
3486sub write_runtime_sync { 3921sub write_runtime_sync {
3922 my $t0 = AE::time;
3923
3487 # first touch the runtime file to show we are still running: 3924 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3925 # the fsync below can take a very very long time.
3489 3926
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3927 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3928
3492 my $guard = cf::lock_acquire "write_runtime"; 3929 my $guard = cf::lock_acquire "write_runtime";
3493 3930
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3931 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3932 or return;
3496 3933
3497 my $value = $cf::RUNTIME + 90 + 10; 3934 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3935 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3936 # 60 allows for the watchdog to kill the server.
3512 or return; 3949 or return;
3513 3950
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3951 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3952 and return;
3516 3953
3517 warn "runtime file written.\n"; 3954 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3955
3519 1 3956 1
3520} 3957}
3521 3958
3522our $uuid_lock; 3959our $uuid_lock;
3534 or return; 3971 or return;
3535 3972
3536 my $value = uuid_seq uuid_cur; 3973 my $value = uuid_seq uuid_cur;
3537 3974
3538 unless ($value) { 3975 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n"; 3976 info "cowardly refusing to write zero uuid value!\n";
3540 return; 3977 return;
3541 } 3978 }
3542 3979
3543 my $value = uuid_str $value + $uuid_skip; 3980 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0; 3981 $uuid_skip = 0;
3554 or return; 3991 or return;
3555 3992
3556 aio_rename "$uuid~", $uuid 3993 aio_rename "$uuid~", $uuid
3557 and return; 3994 and return;
3558 3995
3559 warn "uuid file written ($value).\n"; 3996 trace "uuid file written ($value).\n";
3560 3997
3561 1 3998 1
3562 3999
3563} 4000}
3564 4001
3570} 4007}
3571 4008
3572sub emergency_save() { 4009sub emergency_save() {
3573 my $freeze_guard = cf::freeze_mainloop; 4010 my $freeze_guard = cf::freeze_mainloop;
3574 4011
3575 warn "emergency_perl_save: enter\n"; 4012 info "emergency_perl_save: enter\n";
4013
4014 # this is a trade-off: we want to be very quick here, so
4015 # save all maps without fsync, and later call a global sync
4016 # (which in turn might be very very slow)
4017 local $USE_FSYNC = 0;
3576 4018
3577 cf::sync_job { 4019 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so 4020 cf::write_runtime_sync; # external watchdog should not bark
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582 4021
3583 # use a peculiar iteration method to avoid tripping on perl 4022 # use a peculiar iteration method to avoid tripping on perl
3584 # refcount bugs in for. also avoids problems with players 4023 # refcount bugs in for. also avoids problems with players
3585 # and maps saved/destroyed asynchronously. 4024 # and maps saved/destroyed asynchronously.
3586 warn "emergency_perl_save: begin player save\n"; 4025 info "emergency_perl_save: begin player save\n";
3587 for my $login (keys %cf::PLAYER) { 4026 for my $login (keys %cf::PLAYER) {
3588 my $pl = $cf::PLAYER{$login} or next; 4027 my $pl = $cf::PLAYER{$login} or next;
3589 $pl->valid or next; 4028 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4029 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591 $pl->save; 4030 $pl->save;
3592 } 4031 }
3593 warn "emergency_perl_save: end player save\n"; 4032 info "emergency_perl_save: end player save\n";
3594 4033
4034 cf::write_runtime_sync; # external watchdog should not bark
4035
3595 warn "emergency_perl_save: begin map save\n"; 4036 info "emergency_perl_save: begin map save\n";
3596 for my $path (keys %cf::MAP) { 4037 for my $path (keys %cf::MAP) {
3597 my $map = $cf::MAP{$path} or next; 4038 my $map = $cf::MAP{$path} or next;
3598 $map->valid or next; 4039 $map->valid or next;
3599 $map->save; 4040 $map->save;
3600 } 4041 }
3601 warn "emergency_perl_save: end map save\n"; 4042 info "emergency_perl_save: end map save\n";
3602 4043
4044 cf::write_runtime_sync; # external watchdog should not bark
4045
3603 warn "emergency_perl_save: begin database checkpoint\n"; 4046 info "emergency_perl_save: begin database checkpoint\n";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 4047 BDB::db_env_txn_checkpoint $DB_ENV;
3605 warn "emergency_perl_save: end database checkpoint\n"; 4048 info "emergency_perl_save: end database checkpoint\n";
3606 4049
3607 warn "emergency_perl_save: begin write uuid\n"; 4050 info "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1; 4051 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n"; 4052 info "emergency_perl_save: end write uuid\n";
4053
4054 cf::write_runtime_sync; # external watchdog should not bark
4055
4056 trace "emergency_perl_save: syncing database to disk";
4057 BDB::db_env_txn_checkpoint $DB_ENV;
4058
4059 info "emergency_perl_save: starting sync\n";
4060 IO::AIO::aio_sync sub {
4061 info "emergency_perl_save: finished sync\n";
4062 };
4063
4064 cf::write_runtime_sync; # external watchdog should not bark
4065
4066 trace "emergency_perl_save: flushing outstanding aio requests";
4067 while (IO::AIO::nreqs || BDB::nreqs) {
4068 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4069 }
4070
4071 cf::write_runtime_sync; # external watchdog should not bark
3610 }; 4072 };
3611 4073
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3617 warn "emergency_perl_save: leave\n"; 4074 info "emergency_perl_save: leave\n";
3618} 4075}
3619 4076
3620sub post_cleanup { 4077sub post_cleanup {
3621 my ($make_core) = @_; 4078 my ($make_core) = @_;
3622 4079
4080 IO::AIO::flush;
4081
3623 warn Carp::longmess "post_cleanup backtrace" 4082 error Carp::longmess "post_cleanup backtrace"
3624 if $make_core; 4083 if $make_core;
3625 4084
3626 my $fh = pidfile; 4085 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$; 4086 unlink $PIDFILE if <$fh> == $$;
3628} 4087}
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4107 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) { 4108 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"}; 4109 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4110# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 } 4111 }
3653 warn "cleared package $pkg\n";#d#
3654} 4112}
3655 4113
3656sub do_reload_perl() { 4114sub do_reload_perl() {
3657 # can/must only be called in main 4115 # can/must only be called in main
3658 if ($Coro::current != $Coro::main) { 4116 unless (in_main) {
3659 warn "can only reload from main coroutine"; 4117 error "can only reload from main coroutine";
3660 return; 4118 return;
3661 } 4119 }
3662 4120
3663 return if $RELOAD++; 4121 return if $RELOAD++;
3664 4122
3665 my $t1 = EV::time; 4123 my $t1 = AE::time;
3666 4124
3667 while ($RELOAD) { 4125 while ($RELOAD) {
3668 warn "reloading..."; 4126 cf::get_slot 0.1, -1, "reload_perl";
4127 info "perl_reload: reloading...";
3669 4128
3670 warn "entering sync_job"; 4129 trace "perl_reload: entering sync_job";
3671 4130
3672 cf::sync_job { 4131 cf::sync_job {
3673 cf::write_runtime_sync; # external watchdog should not bark
3674 cf::emergency_save; 4132 #cf::emergency_save;
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 4133
3677 warn "syncing database to disk";
3678 BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680 # if anything goes wrong in here, we should simply crash as we already saved
3681
3682 warn "flushing outstanding aio requests";
3683 while (IO::AIO::nreqs || BDB::nreqs) {
3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685 }
3686
3687 warn "cancelling all extension coros"; 4134 trace "perl_reload: cancelling all extension coros";
3688 $_->cancel for values %EXT_CORO; 4135 $_->cancel for values %EXT_CORO;
3689 %EXT_CORO = (); 4136 %EXT_CORO = ();
3690 4137
3691 warn "removing commands"; 4138 trace "perl_reload: removing commands";
3692 %COMMAND = (); 4139 %COMMAND = ();
3693 4140
3694 warn "removing ext/exti commands"; 4141 trace "perl_reload: removing ext/exti commands";
3695 %EXTCMD = (); 4142 %EXTCMD = ();
3696 %EXTICMD = (); 4143 %EXTICMD = ();
3697 4144
3698 warn "unloading/nuking all extensions"; 4145 trace "perl_reload: unloading/nuking all extensions";
3699 for my $pkg (@EXTS) { 4146 for my $pkg (@EXTS) {
3700 warn "... unloading $pkg"; 4147 trace "... unloading $pkg";
3701 4148
3702 if (my $cb = $pkg->can ("unload")) { 4149 if (my $cb = $pkg->can ("unload")) {
3703 eval { 4150 eval {
3704 $cb->($pkg); 4151 $cb->($pkg);
3705 1 4152 1
3706 } or warn "$pkg unloaded, but with errors: $@"; 4153 } or error "$pkg unloaded, but with errors: $@";
3707 } 4154 }
3708 4155
3709 warn "... clearing $pkg"; 4156 trace "... clearing $pkg";
3710 clear_package $pkg; 4157 clear_package $pkg;
3711 } 4158 }
3712 4159
3713 warn "unloading all perl modules loaded from $LIBDIR"; 4160 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) { 4161 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4162 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716 4163
3717 warn "... unloading $k"; 4164 trace "... unloading $k";
3718 delete $INC{$k}; 4165 delete $INC{$k};
3719 4166
3720 $k =~ s/\.pm$//; 4167 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g; 4168 $k =~ s/\//::/g;
3722 4169
3725 } 4172 }
3726 4173
3727 clear_package $k; 4174 clear_package $k;
3728 } 4175 }
3729 4176
3730 warn "getting rid of safe::, as good as possible"; 4177 trace "perl_reload: getting rid of safe::, as good as possible";
3731 clear_package "safe::$_" 4178 clear_package "safe::$_"
3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4179 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3733 4180
3734 warn "unloading cf.pm \"a bit\""; 4181 trace "perl_reload: unloading cf.pm \"a bit\"";
3735 delete $INC{"cf.pm"}; 4182 delete $INC{"cf.pm"};
3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4183 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737 4184
3738 # don't, removes xs symbols, too, 4185 # don't, removes xs symbols, too,
3739 # and global variables created in xs 4186 # and global variables created in xs
3740 #clear_package __PACKAGE__; 4187 #clear_package __PACKAGE__;
3741 4188
3742 warn "unload completed, starting to reload now"; 4189 info "perl_reload: unload completed, starting to reload now";
3743 4190
3744 warn "reloading cf.pm"; 4191 trace "perl_reload: reloading cf.pm";
3745 require cf; 4192 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4193 cf::_connect_to_perl_1;
3747 4194
3748 warn "loading config and database again"; 4195 trace "perl_reload: loading config and database again";
3749 cf::reload_config; 4196 cf::reload_config;
3750 4197
3751 warn "loading extensions"; 4198 trace "perl_reload: loading extensions";
3752 cf::load_extensions; 4199 cf::load_extensions;
3753 4200
3754 if ($REATTACH_ON_RELOAD) { 4201 if ($REATTACH_ON_RELOAD) {
3755 warn "reattaching attachments to objects/players"; 4202 trace "perl_reload: reattaching attachments to objects/players";
3756 _global_reattach; # objects, sockets 4203 _global_reattach; # objects, sockets
3757 warn "reattaching attachments to maps"; 4204 trace "perl_reload: reattaching attachments to maps";
3758 reattach $_ for values %MAP; 4205 reattach $_ for values %MAP;
3759 warn "reattaching attachments to players"; 4206 trace "perl_reload: reattaching attachments to players";
3760 reattach $_ for values %PLAYER; 4207 reattach $_ for values %PLAYER;
3761 } 4208 }
3762 4209
3763 warn "running post_init jobs"; 4210 cf::_post_init 1;
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765 4211
3766 warn "leaving sync_job"; 4212 trace "perl_reload: leaving sync_job";
3767 4213
3768 1 4214 1
3769 } or do { 4215 } or do {
3770 warn $@; 4216 error $@;
3771 cf::cleanup "error while reloading, exiting."; 4217 cf::cleanup "perl_reload: error, exiting.";
3772 }; 4218 };
3773 4219
3774 warn "reloaded";
3775 --$RELOAD; 4220 --$RELOAD;
3776 } 4221 }
3777 4222
3778 $t1 = EV::time - $t1; 4223 $t1 = AE::time - $t1;
3779 warn "reload completed in ${t1}s\n"; 4224 info "perl_reload: completed in ${t1}s\n";
3780}; 4225};
3781 4226
3782our $RELOAD_WATCHER; # used only during reload 4227our $RELOAD_WATCHER; # used only during reload
3783 4228
3784sub reload_perl() { 4229sub reload_perl() {
3786 # coro crashes during coro_state_free->destroy here. 4231 # coro crashes during coro_state_free->destroy here.
3787 4232
3788 $RELOAD_WATCHER ||= cf::async { 4233 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions; 4234 Coro::AIO::aio_wait cache_extensions;
3790 4235
3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4236 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl; 4237 do_reload_perl;
3793 undef $RELOAD_WATCHER; 4238 undef $RELOAD_WATCHER;
3794 }; 4239 };
3795 }; 4240 };
3796} 4241}
3805 reload_perl; 4250 reload_perl;
3806 }; 4251 };
3807 } 4252 }
3808}; 4253};
3809 4254
3810unshift @INC, $LIBDIR; 4255#############################################################################
3811 4256
3812my $bug_warning = 0; 4257my $bug_warning = 0;
3813 4258
3814our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN;
3816
3817sub wait_for_tick { 4259sub wait_for_tick() {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 4260 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3819 4261
3820 my $signal = new Coro::Signal; 4262 $WAIT_FOR_TICK->wait;
3821 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait;
3823} 4263}
3824 4264
3825sub wait_for_tick_begin { 4265sub wait_for_tick_begin() {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 4266 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3827 4267
3828 my $signal = new Coro::Signal; 4268 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 4269 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 4270 $signal->wait;
3831} 4271}
3835 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4275 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3836 unless ++$bug_warning > 10; 4276 unless ++$bug_warning > 10;
3837 return; 4277 return;
3838 } 4278 }
3839 4279
3840 cf::server_tick; # one server iteration 4280 cf::one_tick; # one server iteration
4281
4282 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3841 4283
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4284 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4285 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3844 Coro::async_pool { 4286 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 4287 $Coro::current->{desc} = "runtime saver";
3846 write_runtime_sync 4288 write_runtime_sync
3847 or warn "ERROR: unable to write runtime file: $!"; 4289 or error "ERROR: unable to write runtime file: $!";
3848 }; 4290 };
3849 } 4291 }
3850 4292
3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4293 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852 $sig->send; 4294 $sig->send;
3853 } 4295 }
3854 while (my $sig = shift @WAIT_FOR_TICK) { 4296 $WAIT_FOR_TICK->broadcast;
3855 $sig->send;
3856 }
3857 4297
3858 $LOAD = ($NOW - $TICK_START) / $TICK; 4298 $LOAD = ($NOW - $TICK_START) / $TICK;
3859 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4299 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3860 4300
3861 if (0) { 4301 if (0) {
3862 if ($NEXT_TICK) { 4302 if ($NEXT_TICK) {
3863 my $jitter = $TICK_START - $NEXT_TICK; 4303 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4304 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d# 4305 debug "jitter $JITTER\n";#d#
3866 } 4306 }
3867 } 4307 }
3868} 4308}
3869 4309
3870{ 4310{
3871 # configure BDB 4311 # configure BDB
4312 info "initialising database";
3872 4313
3873 BDB::min_parallel 8; 4314 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 4315 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 4316 #$AnyEvent::BDB::WATCHER->priority (1);
3876 4317
3877 unless ($DB_ENV) { 4318 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 4319 $DB_ENV = BDB::db_env_create;
3879 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4320 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3880 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4321 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3905 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4346 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3906 }; 4347 };
3907 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4348 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3908 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4349 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3909 }; 4350 };
4351
4352 info "database initialised";
3910} 4353}
3911 4354
3912{ 4355{
3913 # configure IO::AIO 4356 # configure IO::AIO
3914 4357
4358 info "initialising aio";
3915 IO::AIO::min_parallel 8; 4359 IO::AIO::min_parallel 8;
3916 IO::AIO::max_poll_time $TICK * 0.1; 4360 IO::AIO::max_poll_time $TICK * 0.1;
3917 undef $AnyEvent::AIO::WATCHER; 4361 undef $AnyEvent::AIO::WATCHER;
4362 info "aio initialised";
3918} 4363}
3919 4364
3920my $_log_backtrace; 4365our $_log_backtrace;
4366our $_log_backtrace_last;
3921 4367
3922sub _log_backtrace { 4368sub _log_backtrace {
3923 my ($msg, @addr) = @_; 4369 my ($msg, @addr) = @_;
3924 4370
3925 $msg =~ s/\n//; 4371 $msg =~ s/\n$//;
3926 4372
4373 if ($_log_backtrace_last eq $msg) {
4374 LOG llevInfo, "[ABT] $msg\n";
4375 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3927 # limit the # of concurrent backtraces 4376 # limit the # of concurrent backtraces
3928 if ($_log_backtrace < 2) { 4377 } elsif ($_log_backtrace < 2) {
4378 $_log_backtrace_last = $msg;
3929 ++$_log_backtrace; 4379 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg; 4380 my $perl_bt = Carp::longmess $msg;
3931 async { 4381 async {
3932 $Coro::current->{desc} = "abt $msg"; 4382 $Coro::current->{desc} = "abt $msg";
3933 4383
3953 LOG llevInfo, "[ABT] $_\n" for @bt; 4403 LOG llevInfo, "[ABT] $_\n" for @bt;
3954 --$_log_backtrace; 4404 --$_log_backtrace;
3955 }; 4405 };
3956 } else { 4406 } else {
3957 LOG llevInfo, "[ABT] $msg\n"; 4407 LOG llevInfo, "[ABT] $msg\n";
3958 LOG llevInfo, "[ABT] [suppressed]\n"; 4408 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3959 } 4409 }
3960} 4410}
3961 4411
3962# load additional modules 4412# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4413require "cf/$_.pm" for @EXTRA_MODULES;
4414cf::_connect_to_perl_2;
3964 4415
3965END { cf::emergency_save } 4416END { cf::emergency_save }
3966 4417
39671 44181
3968 4419

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines