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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.590 by root, Sun Nov 4 02:20:11 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
76 79
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
84
85our @ORIG_INC;
81 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
88our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
90 95
91our $RELOAD; # number of reloads so far, non-zero while in reload 96our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
93 100
94our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
95our $DATADIR = datadir; 103our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
99our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 116
108our %RESOURCE; 117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
109 124
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 127our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 133our $DB_ENV;
119 134
120our @EXTRA_MODULES = qw(pod mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 136
122our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
123 139
124our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
126our $NOW; 143our $NOW;
127 144
128our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
139 156
140our @POST_INIT; 157our @POST_INIT;
141 158
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
144 164
145binmode STDOUT; 165binmode STDOUT;
146binmode STDERR; 166binmode STDERR;
147 167
148# read virtual server time, if available 168# read virtual server time, if available
159 179
160our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
161 181
162sub cf::map::normalise; 182sub cf::map::normalise;
163 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
164############################################################################# 188#############################################################################
165 189
190%REFLECT = ();
191for (@REFLECT) {
192 my $reflect = JSON::XS::decode_json $_;
193 $REFLECT{$reflect->{class}} = $reflect;
194}
195
196# this is decidedly evil
197$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
198
199#############################################################################
200
166=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
167 202
168=over 4 203=over 4
169 204
170=item $cf::UPTIME 205=item $cf::UPTIME
171 206
172The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
173 223
174=item $cf::RUNTIME 224=item $cf::RUNTIME
175 225
176The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
177every server tick. 227every server tick.
183Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
186database environment. 236database environment.
187 237
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 238=item $cf::LOADAVG
197 239
198The current CPU load on the server (alpha-smoothed), as a value between 0 240The 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 241(none) and 1 (overloaded), indicating how much time is spent on processing
200objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
209from wherever your confdir points to. 251from wherever your confdir points to.
210 252
211=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
212 254
213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These 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 256returns 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. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
275
217=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
218 277
219This array contains the results of the last C<invoke ()> call. When 278This 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 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 280that call.
222 281
282=item %cf::REFLECT
283
284Contains, for each (C++) class name, a hash reference with information
285about object members (methods, scalars, arrays and flags) and other
286metadata, which is useful for introspection.
287
223=back 288=back
224 289
225=cut 290=cut
226 291
227BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
228 *CORE::GLOBAL::warn = sub { 293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
298$Coro::State::WARNHOOK = sub {
229 my $msg = join "", @_; 299 my $msg = join "", @_;
230 300
231 $msg .= "\n" 301 $msg .= "\n"
232 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
233 303
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 305
236 LOG llevError, $msg; 306 LOG llevWarn, $msg;
237 }; 307};
238}
239 308
240$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
242 311
243 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 316 return;#d#
246 }#d# 317 }#d#
247 318
248 # kill coroutine otherwise 319 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 320 Coro::terminate
251}; 321};
252
253$SIG{__DIE__} = sub { }; #d#?
254 322
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 340)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 342}
275 343
276$EV::DIED = sub { 344$EV::DIED = sub {
277 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
278}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
279 352
280############################################################################# 353#############################################################################
281 354
282=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
283 356
304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
305 $d 378 $d
306 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
307} 380}
308 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
309=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
310 435
311Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
312 437
313=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320 445
321sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
323 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
324=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
325 481
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
328 484
329The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 486is a reload or not.
331 487
332=cut 488=cut
333 489
334sub post_init(&) { 490sub post_init(&) {
335 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
336} 509}
337 510
338=item cf::lock_wait $string 511=item cf::lock_wait $string
339 512
340Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
379} 552}
380 553
381=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
382 555
383Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer. 557get spread over time.
385 558
386=cut 559=cut
387 560
388sub periodic($$) { 561sub periodic($$) {
389 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
393 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
394} 567}
395 568
396=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
397 570
398Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
399This call blocks and returns only when you have at least C<$time> seconds 572(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. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
401 578
402The optional C<$name> can be used to identify the job to run. It might be 579The 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. 580used for statistical purposes and should identify the same time-class.
404 581
405Useful for short background jobs. 582Useful for short background jobs.
406 583
407=cut 584=cut
408 585
409our @SLOT_QUEUE; 586our @SLOT_QUEUE;
410our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
411 589
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
415 593
416 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
417 596
418 while () { 597 while () {
419 next_job: 598 next_job:
599
420 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 601
422 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 606 $job->[2]->send;
426 Coro::cede; 607 Coro::cede;
427 goto next_job; 608 goto next_job;
428 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 611 }
430 } 612 }
431 613
432 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
435 $signal->wait;
436 } else { 617 } else {
618 $busy = 0;
437 Coro::schedule; 619 Coro::schedule;
438 } 620 }
439 } 621 }
440}; 622};
441 623
442sub get_slot($;$$) { 624sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
444 626
445 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
446 628
447 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
448 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
449 632
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
478=cut 661=cut
479 662
480sub sync_job(&) { 663sub sync_job(&) {
481 my ($job) = @_; 664 my ($job) = @_;
482 665
483 if ($Coro::current == $Coro::main) { 666 if (in_main) {
484 my $time = EV::time; 667 my $time = AE::time;
485 668
486 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
488 671
489 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
490 673
491 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
492 675
493 my $busy = 1; 676 my $busy = 1;
494 my @res; 677 my @res;
495 678
496 (async { 679 (async {
497 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 681 @res = eval { $job->() };
499 warn $@ if $@; 682 error $@ if $@;
500 undef $busy; 683 undef $busy;
501 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
502 685
503 while ($busy) { 686 while ($busy) {
504 if (Coro::nready) { 687 if (Coro::nready) {
506 } else { 689 } else {
507 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
508 } 691 }
509 } 692 }
510 693
511 my $time = EV::time - $time; 694 my $time = AE::time - $time;
512 695
513 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
514 697
515 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
516 } else { 699 } else {
538 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
539 722
540 $coro 723 $coro
541} 724}
542 725
543=item fork_call { }, $args 726=item fork_call { }, @args
544 727
545Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
546process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
547Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 731never block itself or use any form of event handling.
549 732
550=cut 733=cut
551 734
735sub post_fork {
736 reset_signals;
737}
738
552sub fork_call(&@) { 739sub fork_call(&@) {
553 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
554 741
555 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
556 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
558 745
559 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
560 reset_signals; 747 cf::post_fork;
561 &$cb 748 &$cb
562 }, @args; 749 } @args;
563 750
564 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
565} 763}
566 764
567=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
568 766
569=cut 767=cut
606within each server. 804within each server.
607 805
608=cut 806=cut
609 807
610sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
611 my ($name) = @_; 812 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
613 814
614 eval { 815 eval {
615 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
625} 826}
626 827
627our $DB; 828our $DB;
628 829
629sub db_init { 830sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
632 };
633} 832}
634 833
635sub db_get($$) { 834sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
637 836
638 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
639 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
640 841
641 $! ? () 842 $! ? ()
642 : $data 843 : $data
643 }
644} 844}
645 845
646sub db_put($$$) { 846sub db_put($$$) {
647 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
676 876
677 my @data; 877 my @data;
678 my $md5; 878 my $md5;
679 879
680 for (0 .. $#$src) { 880 for (0 .. $#$src) {
681 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
682 or Carp::croak "$src->[$_]: $!";
683 } 882 }
684 883
685 # if processing is expensive, check 884 # if processing is expensive, check
686 # checksum first 885 # checksum first
687 if (1) { 886 if (1) {
704 903
705 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
706 my $data = $process->(\@data); 905 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
708 907
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 909
711 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
714 913
724 923
725=cut 924=cut
726 925
727sub datalog($@) { 926sub datalog($@) {
728 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 929}
731 930
732=back 931=back
733 932
734=cut 933=cut
929 1128
930 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 1131
933 } elsif (ref $type) { 1132 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
935 1134
936 } else { 1135 } else {
937 shift @arg; 1136 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
939 } 1138 }
940 } 1139 }
941} 1140}
942 1141
943sub _object_attach { 1142sub _object_attach {
953 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
954 } 1153 }
955 1154
956 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
957 } else { 1156 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1158 }
960 1159
961 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
962} 1161}
963 1162
1022 1221
1023 for (@$callbacks) { 1222 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1025 1224
1026 if ($@) { 1225 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1227 override;
1030 } 1228 }
1031 1229
1032 return 1 if $override; 1230 return 1 if $override;
1033 } 1231 }
1112 for (@$attach) { 1310 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1115 } 1313 }
1116 } else { 1314 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1316 }
1119 } 1317 }
1120} 1318}
1121 1319
1122cf::attachable->attach ( 1320cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1150 1348
1151 sync_job { 1349 sync_job {
1152 if (length $$rdata) { 1350 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1156 1355
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1183 1382
1184 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1385 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1188 } 1387 }
1189 } else { 1388 } else {
1190 aio_unlink $filename; 1389 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1192 } 1391 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1416 $av = $st->{objs};
1218 } 1417 }
1219 1418
1220 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1223 1423
1224 ($data, $av) 1424 ($data, $av)
1225} 1425}
1226 1426
1227=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1286} 1486}
1287 1487
1288use File::Glob (); 1488use File::Glob ();
1289 1489
1290cf::player->attach ( 1490cf::player->attach (
1291 on_command => sub { 1491 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1293 1493
1294 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1295 or return; 1495 or return;
1296 1496
1304 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1305 1505
1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1307 1507
1308 if (ref $msg) { 1508 if (ref $msg) {
1309 my ($type, $reply, @payload) = 1509 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 1510
1314 my @reply; 1511 my @reply;
1315 1512
1316 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1317 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1319 1516
1320 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1518 if $reply;
1322 1519
1323 } else { 1520 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1522 }
1326 1523
1327 cf::override; 1524 cf::override;
1328 }, 1525 },
1329); 1526);
1339 }; 1536 };
1340 1537
1341 $grp 1538 $grp
1342} 1539}
1343 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1344sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1345 cf::sync_job { 1557 cf::sync_job {
1346 my %todo; 1558 my %todo;
1347 1559
1348 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1561 next unless -r $path;
1367 1579
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1582
1371 $ext{source} = 1583 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1374 . $source 1586 . $source
1375 . "\n};\n1"; 1587 . "\n};\n1";
1376 1588
1377 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1378 } 1590 }
1379 1591
1592 my $pass = 0;
1380 my %done; 1593 my %done;
1381 while (%todo) { 1594 while (%todo) {
1382 my $progress; 1595 my $progress;
1383 1596
1597 ++$pass;
1598
1599 ext:
1384 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1602 next ext
1387 unless exists $done{$_}; 1603 unless exists $done{$_};
1388 } 1604 }
1389 1605
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1607
1392 unless (eval $v->{source}) { 1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1617 my $active = eval $source;
1618
1619 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1621
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1623 if exists $v->{meta}{mandatory};
1400 1624
1401 warn $msg; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1627 } else {
1628 $done{$k} = delete $todo{$k};
1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1402 } 1634 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1635 }
1408 1636
1409 skip: 1637 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1639
1640 while (my ($k, $v) = each %todo) {
1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1642 if exists $v->{meta}{mandatory};
1643 }
1644
1645 last;
1646 }
1412 } 1647 }
1413 }; 1648 };
1414} 1649}
1415 1650
1416############################################################################# 1651#############################################################################
1500 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1501 } 1736 }
1502 } 1737 }
1503} 1738}
1504 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1505sub save($) { 1753sub save($) {
1506 my ($pl) = @_; 1754 my ($pl) = @_;
1507 1755
1508 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1509 1757
1514 1762
1515 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1517 1765
1518 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1770
1520 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1772 cf::cede_to_tick;
1522} 1773}
1523 1774
1557 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1558 1809
1559 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1561 1812
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563 $pl->deactivate; 1814 $pl->deactivate;
1815
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1567 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1568 1821
1569 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1571 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1625 \@logins 1878 \@logins
1626} 1879}
1627 1880
1628=item $player->maps 1881=item $player->maps
1629 1882
1883=item cf::player::maps $login
1884
1630Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1631player. May block. 1886player. May block.
1632 1887
1633=cut 1888=cut
1634 1889
1696=cut 1951=cut
1697 1952
1698sub find_by_path($) { 1953sub find_by_path($) {
1699 my ($path) = @_; 1954 my ($path) = @_;
1700 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1701 my ($match, $specificity); 1958 my ($match, $specificity);
1702 1959
1703 for my $region (list) { 1960 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1733sub generate_random_map { 1990sub generate_random_map {
1734 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1735 1992
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1994
1738 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1995 $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} 1996}
1753 1997
1754=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1755 1999
1756Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
1761 2005
1762sub register { 2006sub register {
1763 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 2008 my $pkg = caller;
1765 2009
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 2011
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 2013}
1771 2014
1772# also paths starting with '/' 2015# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 2017
1775sub thawer_merge { 2018sub thawer_merge {
1776 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1777 2020
1778 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1783} 2026}
1784 2027
1785sub normalise { 2028sub normalise {
1786 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1787 2030
1788 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1789 2032
1790 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1791 2034
1792 # map plan: 2035 # map plan:
1793 # 2036 #
1808 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1809 $path = "$base/$path"; 2052 $path = "$base/$path";
1810 } 2053 }
1811 2054
1812 for ($path) { 2055 for ($path) {
1813 redo if s{//}{/};
1814 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1815 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1816 } 2058 }
1817 2059
1818 $path 2060 $path
1832 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1833 return $self; 2075 return $self;
1834 } 2076 }
1835 } 2077 }
1836 2078
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 2080 ()
1839} 2081}
1840 2082
2083# may re-bless or do other evil things
1841sub init { 2084sub init {
1842 my ($self) = @_; 2085 my ($self) = @_;
1843 2086
1844 $self 2087 $self
1845} 2088}
1910 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1911 2154
1912 1 2155 1
1913} 2156}
1914 2157
2158# used to laod the header of an original map
1915sub load_header_orig { 2159sub load_header_orig {
1916 my ($self) = @_; 2160 my ($self) = @_;
1917 2161
1918 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1919} 2163}
1920 2164
2165# used to laod the header of an instantiated map
1921sub load_header_temp { 2166sub load_header_temp {
1922 my ($self) = @_; 2167 my ($self) = @_;
1923 2168
1924 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1925} 2170}
1926 2171
2172# called after loading the header from an instantiated map
1927sub prepare_temp { 2173sub prepare_temp {
1928 my ($self) = @_; 2174 my ($self) = @_;
1929 2175
1930 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1932 # safety 2178 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2181}
1936 2182
2183# called after loading the header from an original map
1937sub prepare_orig { 2184sub prepare_orig {
1938 my ($self) = @_; 2185 my ($self) = @_;
1939 2186
1940 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1965 2212
1966sub find; 2213sub find;
1967sub find { 2214sub find {
1968 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1969 2216
2217 cf::cede_to_tick;
2218
1970 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1971 2220
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2223
1975 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
1992 2241
1993 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
1994 } 2243 }
1995} 2244}
1996 2245
1997sub pre_load { } 2246sub pre_load { }
1998sub post_load { } 2247#sub post_load { } # XS
1999 2248
2000sub load { 2249sub load {
2001 my ($self) = @_; 2250 my ($self) = @_;
2002 2251
2003 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
2006 2255
2007 { 2256 {
2008 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2009 2258
2010 return unless $self->valid; 2259 return unless $self->valid;
2011 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2012
2013 $self->in_memory (cf::MAP_LOADING);
2014 2261
2015 $self->alloc; 2262 $self->alloc;
2016 2263
2017 $self->pre_load; 2264 $self->pre_load;
2018 cf::cede_to_tick; 2265 cf::cede_to_tick;
2019 2266
2267 if (exists $self->{load_path}) {
2020 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block; 2269 $f->skip_block;
2022 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2023 or return; 2271 or return;
2024 2272
2025 $self->post_load_original 2273 $self->post_load_original
2026 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2027 2275
2028 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2029 utf8::encode $uniq; 2277 utf8::encode $uniq;
2030 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2032 $self->clear_unique_items; 2280 $self->clear_unique_items;
2033 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2035 } 2284 }
2036 } 2285 }
2037 }
2038 2286
2039 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2040 2294
2041 cf::cede_to_tick; 2295 cf::cede_to_tick;
2042 # now do the right thing for maps 2296 # now do the right thing for maps
2043 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2044 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2048 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2049 $self->decay_objects; 2303 $self->decay_objects;
2050 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2051 $self->update_buttons; 2305 $self->update_buttons;
2052 cf::cede_to_tick; 2306 cf::cede_to_tick;
2053 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2054 } 2308 }
2055 2309
2056 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2057 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2058
2059 $self->in_memory (cf::MAP_ACTIVE);
2060 } 2312 }
2061 2313
2062 $self->post_load; 2314 $self->post_load;
2063}
2064 2315
2316 1
2317}
2318
2319# customize the map for a given player, i.e.
2320# return the _real_ map. used by e.g. per-player
2321# maps to change the path to ~playername/mappath
2065sub customise_for { 2322sub customise_for {
2066 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2067 2324
2068 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2326 if $self->per_player;
2072# if $self->per_party; 2329# if $self->per_party;
2073 2330
2074 $self 2331 $self
2075} 2332}
2076 2333
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 { 2334sub find_sync {
2104 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2105 2336
2106 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2107} 2342}
2108 2343
2109sub do_load_sync { 2344sub do_load_sync {
2110 my ($map) = @_; 2345 my ($map) = @_;
2111 2346
2347 # it's a bug to call this from the main context
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2114 2350
2115 cf::sync_job { $map->load }; 2351 $map->load;
2116} 2352}
2117 2353
2118our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2120 2356
2121sub find_async { 2357sub find_async {
2122 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2123 2359
2124 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2125 2361
2126 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2128 } 2364 }
2129 2365
2130 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2131 2367
2132 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2146 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2147 2383
2148 () 2384 ()
2149} 2385}
2150 2386
2387# common code, used by both ->save and ->swapout
2151sub save { 2388sub _save {
2152 my ($self) = @_; 2389 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2390
2156 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2157 2392
2158 return unless $self->dirty; 2393 return unless $self->dirty;
2159 2394
2179 } else { 2414 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2416 }
2182} 2417}
2183 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2184sub swap_out { 2427sub swap_out {
2185 my ($self) = @_; 2428 my ($self) = @_;
2186 2429
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2192 return if $self->players; 2434 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2194 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2195 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2196 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2197 2486
2198 $self->deactivate; 2487 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2489 $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 2490
2246 $self->unlink_save; 2491 $self->unlink_save;
2247 $self->destroy; 2492 $self->destroy;
2248} 2493}
2249 2494
2257 2502
2258 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2259 2504
2260 $self->unlink_save; 2505 $self->unlink_save;
2261 2506
2262 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2512
2324 : normalise $_ 2569 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2571 ]
2327} 2572}
2328 2573
2574=item cf::map::static_maps
2575
2576Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2577file in the shared directory excluding F</styles> and F</editor>). May
2578block.
2579
2580=cut
2581
2582sub static_maps() {
2583 my @dirs = "";
2584 my @maps;
2585
2586 while (@dirs) {
2587 my $dir = shift @dirs;
2588
2589 next if $dir eq "/styles" || $dir eq "/editor";
2590
2591 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2592 or return;
2593
2594 for (@$files) {
2595 s/\.map$// or next;
2596 utf8::decode $_;
2597 push @maps, "$dir/$_";
2598 }
2599
2600 push @dirs, map "$dir/$_", @$dirs;
2601 }
2602
2603 \@maps
2604}
2605
2329=back 2606=back
2330 2607
2331=head3 cf::object 2608=head3 cf::object
2332 2609
2333=cut 2610=cut
2465 2742
2466Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2467 2744
2468The player should be reasonably safe there for short amounts of time (e.g. 2745The 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, 2746for 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 2747though, as the player cannot control the character while it is on the link
2471map. 2748map.
2472 2749
2473Will never block. 2750Will never block.
2474 2751
2475=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2497 my ($self) = @_; 2774 my ($self) = @_;
2498 2775
2499 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2500 2777
2778 ++$self->{_link_recursion};
2779
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2781
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2505 2784
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2786}
2508 2787
2509sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2511 2790
2528 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2530 2809
2531 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2534 2813
2535 $map->load; 2814 $map->load;
2536 $map->load_neighbours;
2537 2815
2538 return unless $self->contr->active; 2816 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2817
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2544} 2820 # entering was successful
2821 delete $self->{_link_recursion};
2822 # only activate afterwards, to support waiting in hooks
2823 $self->activate_recursive;
2824 }
2545 2825
2826}
2827
2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2547 2829
2548Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2549her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2550that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2551the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
2558 2840
2559our $GOTOGEN; 2841our $GOTOGEN;
2560 2842
2561sub cf::object::player::goto { 2843sub cf::object::player::goto {
2562 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2563 2851
2564 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566 2854
2567 $self->enter_link; 2855 $self->enter_link;
2587 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2588 } 2876 }
2589 } 2877 }
2590 2878
2591 my $map = eval { 2879 my $map = eval {
2592 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2593 2881
2594 if ($map) { 2882 if ($map) {
2595 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2596 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2597 } else { 2885 } else {
2598 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2599 } 2887 }
2600 2888
2601 $map 2889 $map
2609 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2610 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2611 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2612 } 2900 }
2613 2901
2614 $done->() if $done; 2902 $done->($self) if $done;
2615 })->prio (1); 2903 })->prio (1);
2616} 2904}
2617 2905
2618=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2619 2907
2687 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2688 2976
2689 unless (eval { 2977 unless (eval {
2690 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2691 2979
2692 # random map handling
2693 {
2694 my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696 prepare_random_map $exit
2697 if $exit->slaying eq "/!";
2698 }
2699
2700 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2701 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2702 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2703 3006
2704 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2705 3008
2706 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2707 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2712 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2713 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2714 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2715 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2716 3019
2717 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2718 $self->leave_link; 3021 $self->leave_link;
2719 } 3022 }
2720 })->prio (1); 3023 })->prio (1);
2721} 3024}
2722 3025
2734sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2735 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2736 3039
2737 utf8::encode $text; 3040 utf8::encode $text;
2738 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3041 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3042}
3043
3044=item $client->send_big_packet ($pkt)
3045
3046Like C<send_packet>, but tries to compress large packets, and fragments
3047them as required.
3048
3049=cut
3050
3051our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3052
3053sub cf::client::send_big_packet {
3054 my ($self, $pkt) = @_;
3055
3056 # try lzf for large packets
3057 $pkt = "lzf " . Compress::LZF::compress $pkt
3058 if 1024 <= length $pkt and $self->{can_lzf};
3059
3060 # split very large packets
3061 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3062 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3063 $pkt = "frag";
3064 }
3065
3066 $self->send_packet ($pkt);
2739} 3067}
2740 3068
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 3070
2743Send a drawinfo or msg packet to the client, formatting the msg for the 3071Send a drawinfo or msg packet to the client, formatting the msg for the
2747 3075
2748=cut 3076=cut
2749 3077
2750# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2752 "c/identify" => { 3086 "c/identify" => {
2753 id => "infobox", 3087 id => "infobox",
2754 title => "Identify", 3088 title => "Identify",
2755 reply => undef, 3089 reply => undef,
2756 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2758 "c/examine" => { 3092 "c/examine" => {
2759 id => "infobox", 3093 id => "infobox",
2760 title => "Examine", 3094 title => "Examine",
2761 reply => undef, 3095 reply => undef,
2762 tooltip => "Signs and other items you examined", 3096 tooltip => "Signs and other items you examined",
3097 },
3098 "c/shopinfo" => {
3099 id => "infobox",
3100 title => "Shop Info",
3101 reply => undef,
3102 tooltip => "What your bargaining skill tells you about the shop",
2763 }, 3103 },
2764 "c/book" => { 3104 "c/book" => {
2765 id => "infobox", 3105 id => "infobox",
2766 title => "Book", 3106 title => "Book",
2767 reply => undef, 3107 reply => undef,
2883 my $pkt = "msg " 3223 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 3226 );
2887 3227
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2899} 3229}
2900 3230
2901=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2902 3232
2903Sends an ext event to the client. 3233Sends an ext event to the client.
2905=cut 3235=cut
2906 3236
2907sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2909 3239
2910 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 }
2916} 3241}
2917 3242
2918=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
2919 3244
2920Sends an ext reply to the client. 3245Sends an ext reply to the client.
2922=cut 3247=cut
2923 3248
2924sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
2926 3251
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 }
2934} 3253}
2935 3254
2936=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
2937 3256
2938Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
2993 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
2994 3313
2995 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2996 3315
2997 if (ref $msg) { 3316 if (ref $msg) {
2998 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2999 "ARRAY" eq ref $msg
3000 ? @$msg
3001 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3002 3318
3003 my @reply; 3319 my @reply;
3004 3320
3005 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3006 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
3008 3324
3009 $ns->ext_reply ($reply, @reply) 3325 $ns->ext_reply ($reply, @reply)
3010 if $reply; 3326 if $reply;
3011 3327
3012 } else { 3328 } else {
3013 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3329 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014 } 3330 }
3015 3331
3016 cf::override; 3332 cf::override;
3017 }, 3333 },
3018); 3334);
3038 3354
3039 $coro 3355 $coro
3040} 3356}
3041 3357
3042cf::client->attach ( 3358cf::client->attach (
3043 on_destroy => sub { 3359 on_client_destroy => sub {
3044 my ($ns) = @_; 3360 my ($ns) = @_;
3045 3361
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3362 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3363 },
3048); 3364);
3064our $safe_hole = new Safe::Hole; 3380our $safe_hole = new Safe::Hole;
3065 3381
3066$SIG{FPE} = 'IGNORE'; 3382$SIG{FPE} = 'IGNORE';
3067 3383
3068$safe->permit_only (Opcode::opset qw( 3384$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3385 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3386 grepstart grepwhile mapstart mapwhile
3071 sort time 3387 sort time
3072)); 3388));
3073 3389
3074# here we export the classes and methods available to script code 3390# here we export the classes and methods available to script code
3099 decrease split destroy change_exp value msg lore send_msg)], 3415 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3416 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful send_msg)], 3417 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3418 ["cf::map" => qw(trigger)],
3103) { 3419) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3420 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3421 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3422 for @funs;
3108} 3423}
3109 3424
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3441 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3442 $qcode =~ s/\n/\\n/g;
3128 3443
3129 %vars = (_dummy => 0) unless %vars; 3444 %vars = (_dummy => 0) unless %vars;
3130 3445
3446 my @res;
3131 local $_; 3447 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3448
3134 my $eval = 3449 my $eval =
3135 "do {\n" 3450 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3451 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3452 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3453 . $code
3139 . "\n}" 3454 . "\n}"
3140 ; 3455 ;
3141 3456
3457 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3458 sub_generation_inc;
3459 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3460 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 sub_generation_inc; 3461 sub_generation_inc;
3462 } else {
3463 local @cf::_safe_eval_args = values %vars;
3464 @res = wantarray ? eval eval : scalar eval $eval;
3465 }
3145 3466
3146 if ($@) { 3467 if ($@) {
3147 warn "$@"; 3468 warn "$@",
3148 warn "while executing safe code '$code'\n"; 3469 "while executing safe code '$code'\n",
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3470 "with arguments " . (join " ", %vars) . "\n";
3150 } 3471 }
3151 3472
3152 wantarray ? @res : $res[0] 3473 wantarray ? @res : $res[0]
3153} 3474}
3154 3475
3168=cut 3489=cut
3169 3490
3170sub register_script_function { 3491sub register_script_function {
3171 my ($fun, $cb) = @_; 3492 my ($fun, $cb) = @_;
3172 3493
3173 no strict 'refs'; 3494 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3495 *$fun = $safe_hole->wrap ($cb);
3175} 3496}
3176 3497
3177=back 3498=back
3178 3499
3179=cut 3500=cut
3180 3501
3181############################################################################# 3502#############################################################################
3182# the server's init and main functions 3503# the server's init and main functions
3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3183 3528
3184sub load_facedata($) { 3529sub load_facedata($) {
3185 my ($path) = @_; 3530 my ($path) = @_;
3186 3531
3187 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3188 # for this (global event?) 3533 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = (); 3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3190 3535
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192 3537
3193 warn "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3194 3539
3195 my $facedata; 3540 my $facedata = decode_storable load_file $path;
3196 0 < aio_load $path, $facedata
3197 or die "$path: $!";
3198
3199 $facedata = Coro::Storable::thaw $facedata;
3200 3541
3201 $facedata->{version} == 2 3542 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3203 3544
3204 # patch in the exptable
3205 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC,
3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3208 };
3209 cf::cede_to_tick; 3545 cf::cede_to_tick;
3210 3546
3211 { 3547 {
3212 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3213 3549
3214 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3553
3217 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3221 3560
3222 cf::cede_to_tick; 3561 cf::cede_to_tick;
3223 } 3562 }
3224 3563
3225 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
3230 3569
3231 if (my $smooth = cf::face::find $info->{smooth}) { 3570 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth; 3571 cf::face::set_smooth $idx, $smooth;
3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234 } else { 3573 } else {
3235 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3574 error "smooth face '$info->{smooth}' not found for face '$face'";
3236 } 3575 }
3237 3576
3238 cf::cede_to_tick; 3577 cf::cede_to_tick;
3239 } 3578 }
3240 } 3579 }
3249 3588
3250 cf::anim::invalidate_all; # d'oh 3589 cf::anim::invalidate_all; # d'oh
3251 } 3590 }
3252 3591
3253 { 3592 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3257 3594
3258 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3599
3263 if ($info->{type} & 1) {
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type}; 3600 cf::face::set_type $idx, $type;
3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3278 } else { 3604 } else {
3279 $RESOURCE{$name} = $info; 3605# $RESOURCE{$name} = $info; # unused
3280 } 3606 }
3281 3607
3282 cf::cede_to_tick; 3608 cf::cede_to_tick;
3283 } 3609 }
3284 } 3610 }
3285 3611
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287 3613
3288 1 3614 1
3289} 3615}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3310 3616
3311register_exticmd fx_want => sub { 3617register_exticmd fx_want => sub {
3312 my ($ns, $want) = @_; 3618 my ($ns, $want) = @_;
3313 3619
3314 while (my ($k, $v) = each %$want) { 3620 while (my ($k, $v) = each %$want) {
3322 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3323 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3324 cf::arch::commit_load; 3630 cf::arch::commit_load;
3325 3631
3326 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3327} 3646}
3328 3647
3329sub reload_regions { 3648sub reload_regions {
3330 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3331 # for this (global event?) 3650 # for this (global event?)
3346} 3665}
3347 3666
3348sub reload_archetypes { 3667sub reload_archetypes {
3349 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3350 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3351} 3679}
3352 3680
3353sub reload_treasures { 3681sub reload_treasures {
3354 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3355 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3356} 3684}
3357 3685
3686sub reload_sound {
3687 trace "loading sound config from $DATADIR/sound\n";
3688
3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3690
3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3692 my $sound = $soundconf->{compat}[$_]
3693 or next;
3694
3695 my $face = cf::face::find "sound/$sound->[1]";
3696 cf::sound::set $sound->[0] => $face;
3697 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3698 }
3699
3700 while (my ($k, $v) = each %{$soundconf->{event}}) {
3701 my $face = cf::face::find "sound/$v";
3702 cf::sound::set $k => $face;
3703 }
3704}
3705
3358sub reload_resources { 3706sub reload_resources {
3359 warn "reloading resource files...\n"; 3707 trace "reloading resource files...\n";
3360 3708
3709 reload_materials;
3361 reload_facedata; 3710 reload_facedata;
3711 reload_exp_table;
3712 reload_sound;
3362 reload_archetypes; 3713 reload_archetypes;
3363 reload_regions; 3714 reload_regions;
3364 reload_treasures; 3715 reload_treasures;
3365 3716
3366 warn "finished reloading resource files\n"; 3717 trace "finished reloading resource files\n";
3367} 3718}
3368 3719
3369sub reload_config { 3720sub reload_config {
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3721 trace "reloading config file...\n";
3371 or return;
3372 3722
3373 local $/; 3723 my $config = load_file "$CONFDIR/config";
3374 *CFG = YAML::Load <$fh>; 3724 utf8::decode $config;
3725 *CFG = decode_yaml $config;
3375 3726
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3727 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377 3728
3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3729 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3730 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3380 3731
3381 if (exists $CFG{mlockall}) { 3732 if (exists $CFG{mlockall}) {
3405 seek $fh, 0, 0; 3756 seek $fh, 0, 0;
3406 print $fh $$; 3757 print $fh $$;
3407} 3758}
3408 3759
3409sub main_loop { 3760sub main_loop {
3410 warn "EV::loop starting\n"; 3761 trace "EV::loop starting\n";
3411 if (1) { 3762 if (1) {
3412 EV::loop; 3763 EV::loop;
3413 } 3764 }
3414 warn "EV::loop returned\n"; 3765 trace "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP; 3766 goto &main_loop unless $REALLY_UNLOOP;
3416} 3767}
3417 3768
3418sub main { 3769sub main {
3419 cf::init_globals; # initialise logging 3770 cf::init_globals; # initialise logging
3420 3771
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3772 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3773 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3774 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3775 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425 3776
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3777 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432 3778
3433 # we must not ever block the main coroutine 3779 # we must not ever block the main coroutine
3434 local $Coro::idle = sub { 3780 $Coro::idle = sub {
3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3781 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3436 (async { 3782 (async {
3437 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3783 $Coro::current->{desc} = "IDLE BUG HANDLER";
3438 EV::loop EV::LOOP_ONESHOT; 3784 EV::loop EV::LOOP_ONESHOT;
3439 })->prio (Coro::PRIO_MAX); 3785 })->prio (Coro::PRIO_MAX);
3440 }; 3786 };
3441 3787
3442 evthread_start IO::AIO::poll_fileno; 3788 evthread_start IO::AIO::poll_fileno;
3443 3789
3444 cf::sync_job { 3790 cf::sync_job {
3791 cf::incloader::init ();
3792
3793 cf::init_anim;
3794 cf::init_attackmess;
3795 cf::init_dynamic;
3796
3797 cf::load_settings;
3798
3445 reload_resources; 3799 reload_resources;
3446 reload_config; 3800 reload_config;
3447 db_init; 3801 db_init;
3448 3802
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3803 cf::init_uuid;
3452 cf::init_signals; 3804 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3805 cf::init_skills;
3455 3806
3456 cf::init_beforeplay; 3807 cf::init_beforeplay;
3457 3808
3458 atomic; 3809 atomic;
3460 load_extensions; 3811 load_extensions;
3461 3812
3462 utime time, time, $RUNTIMEFILE; 3813 utime time, time, $RUNTIMEFILE;
3463 3814
3464 # no (long-running) fork's whatsoever before this point(!) 3815 # no (long-running) fork's whatsoever before this point(!)
3816 use POSIX ();
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3817 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466 3818
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3819 cf::_post_init 0;
3468 }; 3820 };
3469 3821
3822 cf::object::thawer::errors_are_fatal 0;
3823 info "parse errors in files are no longer fatal from this point on.\n";
3824
3825 AE::postpone {
3826 undef &main; # free gobs of memory :)
3827 };
3828
3470 main_loop; 3829 goto &main_loop;
3471} 3830}
3472 3831
3473############################################################################# 3832#############################################################################
3474# initialisation and cleanup 3833# initialisation and cleanup
3475 3834
3476# install some emergency cleanup handlers 3835# install some emergency cleanup handlers
3477BEGIN { 3836BEGIN {
3478 our %SIGWATCHER = (); 3837 our %SIGWATCHER = ();
3479 for my $signal (qw(INT HUP TERM)) { 3838 for my $signal (qw(INT HUP TERM)) {
3480 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3839 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3481 cf::cleanup "SIG$signal"; 3840 cf::cleanup "SIG$signal";
3482 }; 3841 };
3483 } 3842 }
3484} 3843}
3485 3844
3486sub write_runtime_sync { 3845sub write_runtime_sync {
3846 my $t0 = AE::time;
3847
3487 # first touch the runtime file to show we are still running: 3848 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3849 # the fsync below can take a very very long time.
3489 3850
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3851 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3852
3492 my $guard = cf::lock_acquire "write_runtime"; 3853 my $guard = cf::lock_acquire "write_runtime";
3493 3854
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3855 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3856 or return;
3496 3857
3497 my $value = $cf::RUNTIME + 90 + 10; 3858 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3859 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3860 # 60 allows for the watchdog to kill the server.
3512 or return; 3873 or return;
3513 3874
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3875 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3876 and return;
3516 3877
3517 warn "runtime file written.\n"; 3878 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3879
3519 1 3880 1
3520} 3881}
3521 3882
3522our $uuid_lock; 3883our $uuid_lock;
3534 or return; 3895 or return;
3535 3896
3536 my $value = uuid_seq uuid_cur; 3897 my $value = uuid_seq uuid_cur;
3537 3898
3538 unless ($value) { 3899 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n"; 3900 info "cowardly refusing to write zero uuid value!\n";
3540 return; 3901 return;
3541 } 3902 }
3542 3903
3543 my $value = uuid_str $value + $uuid_skip; 3904 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0; 3905 $uuid_skip = 0;
3554 or return; 3915 or return;
3555 3916
3556 aio_rename "$uuid~", $uuid 3917 aio_rename "$uuid~", $uuid
3557 and return; 3918 and return;
3558 3919
3559 warn "uuid file written ($value).\n"; 3920 trace "uuid file written ($value).\n";
3560 3921
3561 1 3922 1
3562 3923
3563} 3924}
3564 3925
3570} 3931}
3571 3932
3572sub emergency_save() { 3933sub emergency_save() {
3573 my $freeze_guard = cf::freeze_mainloop; 3934 my $freeze_guard = cf::freeze_mainloop;
3574 3935
3575 warn "emergency_perl_save: enter\n"; 3936 info "emergency_perl_save: enter\n";
3937
3938 # this is a trade-off: we want to be very quick here, so
3939 # save all maps without fsync, and later call a global sync
3940 # (which in turn might be very very slow)
3941 local $USE_FSYNC = 0;
3576 3942
3577 cf::sync_job { 3943 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so 3944 cf::write_runtime_sync; # external watchdog should not bark
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582 3945
3583 # use a peculiar iteration method to avoid tripping on perl 3946 # use a peculiar iteration method to avoid tripping on perl
3584 # refcount bugs in for. also avoids problems with players 3947 # refcount bugs in for. also avoids problems with players
3585 # and maps saved/destroyed asynchronously. 3948 # and maps saved/destroyed asynchronously.
3586 warn "emergency_perl_save: begin player save\n"; 3949 info "emergency_perl_save: begin player save\n";
3587 for my $login (keys %cf::PLAYER) { 3950 for my $login (keys %cf::PLAYER) {
3588 my $pl = $cf::PLAYER{$login} or next; 3951 my $pl = $cf::PLAYER{$login} or next;
3589 $pl->valid or next; 3952 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3953 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591 $pl->save; 3954 $pl->save;
3592 } 3955 }
3593 warn "emergency_perl_save: end player save\n"; 3956 info "emergency_perl_save: end player save\n";
3594 3957
3958 cf::write_runtime_sync; # external watchdog should not bark
3959
3595 warn "emergency_perl_save: begin map save\n"; 3960 info "emergency_perl_save: begin map save\n";
3596 for my $path (keys %cf::MAP) { 3961 for my $path (keys %cf::MAP) {
3597 my $map = $cf::MAP{$path} or next; 3962 my $map = $cf::MAP{$path} or next;
3598 $map->valid or next; 3963 $map->valid or next;
3599 $map->save; 3964 $map->save;
3600 } 3965 }
3601 warn "emergency_perl_save: end map save\n"; 3966 info "emergency_perl_save: end map save\n";
3602 3967
3968 cf::write_runtime_sync; # external watchdog should not bark
3969
3603 warn "emergency_perl_save: begin database checkpoint\n"; 3970 info "emergency_perl_save: begin database checkpoint\n";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 3971 BDB::db_env_txn_checkpoint $DB_ENV;
3605 warn "emergency_perl_save: end database checkpoint\n"; 3972 info "emergency_perl_save: end database checkpoint\n";
3606 3973
3607 warn "emergency_perl_save: begin write uuid\n"; 3974 info "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1; 3975 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n"; 3976 info "emergency_perl_save: end write uuid\n";
3977
3978 cf::write_runtime_sync; # external watchdog should not bark
3979
3980 trace "emergency_perl_save: syncing database to disk";
3981 BDB::db_env_txn_checkpoint $DB_ENV;
3982
3983 info "emergency_perl_save: starting sync\n";
3984 IO::AIO::aio_sync sub {
3985 info "emergency_perl_save: finished sync\n";
3986 };
3987
3988 cf::write_runtime_sync; # external watchdog should not bark
3989
3990 trace "emergency_perl_save: flushing outstanding aio requests";
3991 while (IO::AIO::nreqs || BDB::nreqs) {
3992 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3993 }
3994
3995 cf::write_runtime_sync; # external watchdog should not bark
3610 }; 3996 };
3611 3997
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3617 warn "emergency_perl_save: leave\n"; 3998 info "emergency_perl_save: leave\n";
3618} 3999}
3619 4000
3620sub post_cleanup { 4001sub post_cleanup {
3621 my ($make_core) = @_; 4002 my ($make_core) = @_;
3622 4003
4004 IO::AIO::flush;
4005
3623 warn Carp::longmess "post_cleanup backtrace" 4006 error Carp::longmess "post_cleanup backtrace"
3624 if $make_core; 4007 if $make_core;
3625 4008
3626 my $fh = pidfile; 4009 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$; 4010 unlink $PIDFILE if <$fh> == $$;
3628} 4011}
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4031 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) { 4032 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"}; 4033 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4034# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 } 4035 }
3653 warn "cleared package $pkg\n";#d#
3654} 4036}
3655 4037
3656sub do_reload_perl() { 4038sub do_reload_perl() {
3657 # can/must only be called in main 4039 # can/must only be called in main
3658 if ($Coro::current != $Coro::main) { 4040 unless (in_main) {
3659 warn "can only reload from main coroutine"; 4041 error "can only reload from main coroutine";
3660 return; 4042 return;
3661 } 4043 }
3662 4044
3663 return if $RELOAD++; 4045 return if $RELOAD++;
3664 4046
3665 my $t1 = EV::time; 4047 my $t1 = AE::time;
3666 4048
3667 while ($RELOAD) { 4049 while ($RELOAD) {
3668 warn "reloading..."; 4050 cf::get_slot 0.1, -1, "reload_perl";
4051 info "perl_reload: reloading...";
3669 4052
3670 warn "entering sync_job"; 4053 trace "perl_reload: entering sync_job";
3671 4054
3672 cf::sync_job { 4055 cf::sync_job {
3673 cf::write_runtime_sync; # external watchdog should not bark
3674 cf::emergency_save; 4056 #cf::emergency_save;
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 4057
3677 warn "syncing database to disk";
3678 BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680 # if anything goes wrong in here, we should simply crash as we already saved
3681
3682 warn "flushing outstanding aio requests";
3683 while (IO::AIO::nreqs || BDB::nreqs) {
3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685 }
3686
3687 warn "cancelling all extension coros"; 4058 trace "perl_reload: cancelling all extension coros";
3688 $_->cancel for values %EXT_CORO; 4059 $_->cancel for values %EXT_CORO;
3689 %EXT_CORO = (); 4060 %EXT_CORO = ();
3690 4061
3691 warn "removing commands"; 4062 trace "perl_reload: removing commands";
3692 %COMMAND = (); 4063 %COMMAND = ();
3693 4064
3694 warn "removing ext/exti commands"; 4065 trace "perl_reload: removing ext/exti commands";
3695 %EXTCMD = (); 4066 %EXTCMD = ();
3696 %EXTICMD = (); 4067 %EXTICMD = ();
3697 4068
3698 warn "unloading/nuking all extensions"; 4069 trace "perl_reload: unloading/nuking all extensions";
3699 for my $pkg (@EXTS) { 4070 for my $pkg (@EXTS) {
3700 warn "... unloading $pkg"; 4071 trace "... unloading $pkg";
3701 4072
3702 if (my $cb = $pkg->can ("unload")) { 4073 if (my $cb = $pkg->can ("unload")) {
3703 eval { 4074 eval {
3704 $cb->($pkg); 4075 $cb->($pkg);
3705 1 4076 1
3706 } or warn "$pkg unloaded, but with errors: $@"; 4077 } or error "$pkg unloaded, but with errors: $@";
3707 } 4078 }
3708 4079
3709 warn "... clearing $pkg"; 4080 trace "... clearing $pkg";
3710 clear_package $pkg; 4081 clear_package $pkg;
3711 } 4082 }
3712 4083
3713 warn "unloading all perl modules loaded from $LIBDIR"; 4084 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) { 4085 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4086 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716 4087
3717 warn "... unloading $k"; 4088 trace "... unloading $k";
3718 delete $INC{$k}; 4089 delete $INC{$k};
3719 4090
3720 $k =~ s/\.pm$//; 4091 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g; 4092 $k =~ s/\//::/g;
3722 4093
3725 } 4096 }
3726 4097
3727 clear_package $k; 4098 clear_package $k;
3728 } 4099 }
3729 4100
3730 warn "getting rid of safe::, as good as possible"; 4101 trace "perl_reload: getting rid of safe::, as good as possible";
3731 clear_package "safe::$_" 4102 clear_package "safe::$_"
3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4103 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3733 4104
3734 warn "unloading cf.pm \"a bit\""; 4105 trace "perl_reload: unloading cf.pm \"a bit\"";
3735 delete $INC{"cf.pm"}; 4106 delete $INC{"cf.pm"};
3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4107 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737 4108
3738 # don't, removes xs symbols, too, 4109 # don't, removes xs symbols, too,
3739 # and global variables created in xs 4110 # and global variables created in xs
3740 #clear_package __PACKAGE__; 4111 #clear_package __PACKAGE__;
3741 4112
3742 warn "unload completed, starting to reload now"; 4113 info "perl_reload: unload completed, starting to reload now";
3743 4114
3744 warn "reloading cf.pm"; 4115 trace "perl_reload: reloading cf.pm";
3745 require cf; 4116 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4117 cf::_connect_to_perl_1;
3747 4118
3748 warn "loading config and database again"; 4119 trace "perl_reload: loading config and database again";
3749 cf::reload_config; 4120 cf::reload_config;
3750 4121
3751 warn "loading extensions"; 4122 trace "perl_reload: loading extensions";
3752 cf::load_extensions; 4123 cf::load_extensions;
3753 4124
3754 if ($REATTACH_ON_RELOAD) { 4125 if ($REATTACH_ON_RELOAD) {
3755 warn "reattaching attachments to objects/players"; 4126 trace "perl_reload: reattaching attachments to objects/players";
3756 _global_reattach; # objects, sockets 4127 _global_reattach; # objects, sockets
3757 warn "reattaching attachments to maps"; 4128 trace "perl_reload: reattaching attachments to maps";
3758 reattach $_ for values %MAP; 4129 reattach $_ for values %MAP;
3759 warn "reattaching attachments to players"; 4130 trace "perl_reload: reattaching attachments to players";
3760 reattach $_ for values %PLAYER; 4131 reattach $_ for values %PLAYER;
3761 } 4132 }
3762 4133
3763 warn "running post_init jobs"; 4134 cf::_post_init 1;
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765 4135
3766 warn "leaving sync_job"; 4136 trace "perl_reload: leaving sync_job";
3767 4137
3768 1 4138 1
3769 } or do { 4139 } or do {
3770 warn $@; 4140 error $@;
3771 cf::cleanup "error while reloading, exiting."; 4141 cf::cleanup "perl_reload: error, exiting.";
3772 }; 4142 };
3773 4143
3774 warn "reloaded";
3775 --$RELOAD; 4144 --$RELOAD;
3776 } 4145 }
3777 4146
3778 $t1 = EV::time - $t1; 4147 $t1 = AE::time - $t1;
3779 warn "reload completed in ${t1}s\n"; 4148 info "perl_reload: completed in ${t1}s\n";
3780}; 4149};
3781 4150
3782our $RELOAD_WATCHER; # used only during reload 4151our $RELOAD_WATCHER; # used only during reload
3783 4152
3784sub reload_perl() { 4153sub reload_perl() {
3786 # coro crashes during coro_state_free->destroy here. 4155 # coro crashes during coro_state_free->destroy here.
3787 4156
3788 $RELOAD_WATCHER ||= cf::async { 4157 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions; 4158 Coro::AIO::aio_wait cache_extensions;
3790 4159
3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4160 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl; 4161 do_reload_perl;
3793 undef $RELOAD_WATCHER; 4162 undef $RELOAD_WATCHER;
3794 }; 4163 };
3795 }; 4164 };
3796} 4165}
3805 reload_perl; 4174 reload_perl;
3806 }; 4175 };
3807 } 4176 }
3808}; 4177};
3809 4178
3810unshift @INC, $LIBDIR; 4179#############################################################################
3811 4180
3812my $bug_warning = 0; 4181my $bug_warning = 0;
3813 4182
3814our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN;
3816
3817sub wait_for_tick { 4183sub wait_for_tick() {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 4184 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3819 4185
3820 my $signal = new Coro::Signal; 4186 $WAIT_FOR_TICK->wait;
3821 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait;
3823} 4187}
3824 4188
3825sub wait_for_tick_begin { 4189sub wait_for_tick_begin() {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 4190 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3827 4191
3828 my $signal = new Coro::Signal; 4192 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 4193 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 4194 $signal->wait;
3831} 4195}
3835 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4199 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3836 unless ++$bug_warning > 10; 4200 unless ++$bug_warning > 10;
3837 return; 4201 return;
3838 } 4202 }
3839 4203
3840 cf::server_tick; # one server iteration 4204 cf::one_tick; # one server iteration
4205
4206 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3841 4207
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4208 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4209 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3844 Coro::async_pool { 4210 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 4211 $Coro::current->{desc} = "runtime saver";
3846 write_runtime_sync 4212 write_runtime_sync
3847 or warn "ERROR: unable to write runtime file: $!"; 4213 or error "ERROR: unable to write runtime file: $!";
3848 }; 4214 };
3849 } 4215 }
3850 4216
3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4217 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852 $sig->send; 4218 $sig->send;
3853 } 4219 }
3854 while (my $sig = shift @WAIT_FOR_TICK) { 4220 $WAIT_FOR_TICK->broadcast;
3855 $sig->send;
3856 }
3857 4221
3858 $LOAD = ($NOW - $TICK_START) / $TICK; 4222 $LOAD = ($NOW - $TICK_START) / $TICK;
3859 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3860 4224
3861 if (0) { 4225 if (0) {
3862 if ($NEXT_TICK) { 4226 if ($NEXT_TICK) {
3863 my $jitter = $TICK_START - $NEXT_TICK; 4227 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4228 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d# 4229 debug "jitter $JITTER\n";#d#
3866 } 4230 }
3867 } 4231 }
3868} 4232}
3869 4233
3870{ 4234{
3871 # configure BDB 4235 # configure BDB
3872 4236
3873 BDB::min_parallel 8; 4237 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 4238 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 4239 #$AnyEvent::BDB::WATCHER->priority (1);
3876 4240
3877 unless ($DB_ENV) { 4241 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 4242 $DB_ENV = BDB::db_env_create;
3879 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4243 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3880 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4244 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3915 IO::AIO::min_parallel 8; 4279 IO::AIO::min_parallel 8;
3916 IO::AIO::max_poll_time $TICK * 0.1; 4280 IO::AIO::max_poll_time $TICK * 0.1;
3917 undef $AnyEvent::AIO::WATCHER; 4281 undef $AnyEvent::AIO::WATCHER;
3918} 4282}
3919 4283
3920my $_log_backtrace; 4284our $_log_backtrace;
4285our $_log_backtrace_last;
3921 4286
3922sub _log_backtrace { 4287sub _log_backtrace {
3923 my ($msg, @addr) = @_; 4288 my ($msg, @addr) = @_;
3924 4289
3925 $msg =~ s/\n//; 4290 $msg =~ s/\n$//;
3926 4291
4292 if ($_log_backtrace_last eq $msg) {
4293 LOG llevInfo, "[ABT] $msg\n";
4294 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3927 # limit the # of concurrent backtraces 4295 # limit the # of concurrent backtraces
3928 if ($_log_backtrace < 2) { 4296 } elsif ($_log_backtrace < 2) {
4297 $_log_backtrace_last = $msg;
3929 ++$_log_backtrace; 4298 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg; 4299 my $perl_bt = Carp::longmess $msg;
3931 async { 4300 async {
3932 $Coro::current->{desc} = "abt $msg"; 4301 $Coro::current->{desc} = "abt $msg";
3933 4302
3953 LOG llevInfo, "[ABT] $_\n" for @bt; 4322 LOG llevInfo, "[ABT] $_\n" for @bt;
3954 --$_log_backtrace; 4323 --$_log_backtrace;
3955 }; 4324 };
3956 } else { 4325 } else {
3957 LOG llevInfo, "[ABT] $msg\n"; 4326 LOG llevInfo, "[ABT] $msg\n";
3958 LOG llevInfo, "[ABT] [suppressed]\n"; 4327 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3959 } 4328 }
3960} 4329}
3961 4330
3962# load additional modules 4331# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4332require "cf/$_.pm" for @EXTRA_MODULES;
4333cf::_connect_to_perl_2;
3964 4334
3965END { cf::emergency_save } 4335END { cf::emergency_save }
3966 4336
39671 43371
3968 4338

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines