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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines