ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines