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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.589 by root, Sun Nov 4 01:01:13 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
72 75
73# make sure c-lzf reinitialises itself 76# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 77Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 78Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 79
80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
82
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
78 86
79our %COMMAND = (); 87our %COMMAND = ();
80our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
81 89
82our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
87 95
88our $RELOAD; # number of reloads so far, non-zero while in reload 96our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
90 100
91our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
92our $DATADIR = datadir; 103our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
96our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 116
105our %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;
106 124
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 127our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 128our $USE_FSYNC = 1; # use fsync to write maps - default on
111 129
112our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 133our $DB_ENV;
116 134
117our @EXTRA_MODULES = qw(pod mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 136
119our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
120 139
121our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
123our $NOW; 143our $NOW;
124 144
125our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
126our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
127our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
134our $JITTER; # average jitter 154our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 155our $TICK_START; # for load detecting purposes
136 156
137our @POST_INIT; 157our @POST_INIT;
138 158
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
140 164
141binmode STDOUT; 165binmode STDOUT;
142binmode STDERR; 166binmode STDERR;
143 167
144# read virtual server time, if available 168# read virtual server time, if available
146 open my $fh, "<", $RUNTIMEFILE 170 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
149} 173}
150 174
175eval "sub TICK() { $TICK } 1" or die;
176
151mkdir $_ 177mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 179
154our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
155 181
156sub cf::map::normalise; 182sub cf::map::normalise;
157 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
158############################################################################# 188#############################################################################
159 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
160=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
161 202
162=over 4 203=over 4
163 204
164=item $cf::UPTIME 205=item $cf::UPTIME
165 206
166The 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.
167 223
168=item $cf::RUNTIME 224=item $cf::RUNTIME
169 225
170The 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
171every server tick. 227every server tick.
177Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
178directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
179unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
180database environment. 236database environment.
181 237
182=item $cf::NOW
183
184The time of the last (current) server tick.
185
186=item $cf::TICK
187
188The interval between server ticks, in seconds.
189
190=item $cf::LOADAVG 238=item $cf::LOADAVG
191 239
192The 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
193(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
194objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
203from wherever your confdir points to. 251from wherever your confdir points to.
204 252
205=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
206 254
207These 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
208returns 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
209per 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.
210 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
211=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
212 277
213This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
214C<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
215that call. 280that call.
216 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
217=back 288=back
218 289
219=cut 290=cut
220 291
221BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
222 *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 {
223 my $msg = join "", @_; 299 my $msg = join "", @_;
224 300
225 $msg .= "\n" 301 $msg .= "\n"
226 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
227 303
228 $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;
229 305
230 LOG llevError, $msg; 306 LOG llevWarn, $msg;
231 }; 307};
232}
233 308
234$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
236 311
237 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 316 return;#d#
240 }#d# 317 }#d#
241 318
242 # kill coroutine otherwise 319 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 320 Coro::terminate
245}; 321};
246
247$SIG{__DIE__} = sub { }; #d#?
248 322
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
266)) { 340)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 342}
269 343
270$EV::DIED = sub { 344$EV::DIED = sub {
271 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
272}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
273 352
274############################################################################# 353#############################################################################
275 354
276=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
277 356
298 $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;
299 $d 378 $d
300 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
301} 380}
302 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
303=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
304 435
305Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
306 437
307=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
313our $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
314 445
315sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
316sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
317 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
318=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
319 481
320Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
322 484
323The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
324is a reload or not. 486is a reload or not.
325 487
326=cut 488=cut
327 489
328sub post_init(&) { 490sub post_init(&) {
329 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 }
330} 509}
331 510
332=item cf::lock_wait $string 511=item cf::lock_wait $string
333 512
334Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
373} 552}
374 553
375=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
376 555
377Like 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
378get spread over timer. 557get spread over time.
379 558
380=cut 559=cut
381 560
382sub periodic($$) { 561sub periodic($$) {
383 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
387 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
388} 567}
389 568
390=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
391 570
392Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
393This 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
394of 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.
395 578
396The 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
397used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
398 581
399Useful for short background jobs. 582Useful for short background jobs.
400 583
401=cut 584=cut
402 585
403our @SLOT_QUEUE; 586our @SLOT_QUEUE;
404our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
405 589
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
409 593
410 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
411 596
412 while () { 597 while () {
413 next_job: 598 next_job:
599
414 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 601
416 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 606 $job->[2]->send;
420 Coro::cede; 607 Coro::cede;
421 goto next_job; 608 goto next_job;
422 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 611 }
424 } 612 }
425 613
426 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
427 # 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
428 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
429 $signal->wait;
430 } else { 617 } else {
618 $busy = 0;
431 Coro::schedule; 619 Coro::schedule;
432 } 620 }
433 } 621 }
434}; 622};
435 623
436sub get_slot($;$$) { 624sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
438 626
439 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
440 628
441 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
442 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
443 632
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
472=cut 661=cut
473 662
474sub sync_job(&) { 663sub sync_job(&) {
475 my ($job) = @_; 664 my ($job) = @_;
476 665
477 if ($Coro::current == $Coro::main) { 666 if (in_main) {
478 my $time = EV::time; 667 my $time = AE::time;
479 668
480 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
481 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
482 671
483 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
484 673
485 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
486 675
487 my $busy = 1; 676 my $busy = 1;
488 my @res; 677 my @res;
489 678
490 (async { 679 (async {
491 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
492 @res = eval { $job->() }; 681 @res = eval { $job->() };
493 warn $@ if $@; 682 error $@ if $@;
494 undef $busy; 683 undef $busy;
495 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
496 685
497 while ($busy) { 686 while ($busy) {
498 if (Coro::nready) { 687 if (Coro::nready) {
500 } else { 689 } else {
501 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
502 } 691 }
503 } 692 }
504 693
505 my $time = EV::time - $time; 694 my $time = AE::time - $time;
506 695
507 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
508 697
509 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
510 } else { 699 } else {
532 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
533 722
534 $coro 723 $coro
535} 724}
536 725
537=item fork_call { }, $args 726=item fork_call { }, @args
538 727
539Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
540process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
541Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
542never block itself or use any form of event handling. 731never block itself or use any form of event handling.
543 732
544=cut 733=cut
545 734
735sub post_fork {
736 reset_signals;
737}
738
546sub fork_call(&@) { 739sub fork_call(&@) {
547 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
548 741
549 # 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,
550 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
551 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
552 745
553 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
554 reset_signals; 747 cf::post_fork;
555 &$cb 748 &$cb
556 }, @args; 749 } @args;
557 750
558 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 )
559} 763}
560 764
561=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
562 766
563=cut 767=cut
600within each server. 804within each server.
601 805
602=cut 806=cut
603 807
604sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
605 my ($name) = @_; 812 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
607 814
608 eval { 815 eval {
609 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
619} 826}
620 827
621our $DB; 828our $DB;
622 829
623sub db_init { 830sub db_init {
624 cf::sync_job {
625 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
626 };
627} 832}
628 833
629sub db_get($$) { 834sub db_get($$) {
630 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
631 836
632 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
633 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
634 841
635 $! ? () 842 $! ? ()
636 : $data 843 : $data
637 }
638} 844}
639 845
640sub db_put($$$) { 846sub db_put($$$) {
641 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
642 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
670 876
671 my @data; 877 my @data;
672 my $md5; 878 my $md5;
673 879
674 for (0 .. $#$src) { 880 for (0 .. $#$src) {
675 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
676 or Carp::croak "$src->[$_]: $!";
677 } 882 }
678 883
679 # if processing is expensive, check 884 # if processing is expensive, check
680 # checksum first 885 # checksum first
681 if (1) { 886 if (1) {
698 903
699 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
700 my $data = $process->(\@data); 905 my $data = $process->(\@data);
701 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
702 907
703 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
704 909
705 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
706 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
707 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
708 913
718 923
719=cut 924=cut
720 925
721sub datalog($@) { 926sub datalog($@) {
722 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
723 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
724} 929}
725 930
726=back 931=back
727 932
728=cut 933=cut
923 1128
924 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
925 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
926 1131
927 } elsif (ref $type) { 1132 } elsif (ref $type) {
928 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
929 1134
930 } else { 1135 } else {
931 shift @arg; 1136 shift @arg;
932 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
933 } 1138 }
934 } 1139 }
935} 1140}
936 1141
937sub _object_attach { 1142sub _object_attach {
947 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
948 } 1153 }
949 1154
950 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
951 } else { 1156 } else {
952 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
953 } 1158 }
954 1159
955 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
956} 1161}
957 1162
1016 1221
1017 for (@$callbacks) { 1222 for (@$callbacks) {
1018 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1019 1224
1020 if ($@) { 1225 if ($@) {
1021 warn "$@";
1022 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1023 override; 1227 override;
1024 } 1228 }
1025 1229
1026 return 1 if $override; 1230 return 1 if $override;
1027 } 1231 }
1106 for (@$attach) { 1310 for (@$attach) {
1107 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1108 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1109 } 1313 }
1110 } else { 1314 } else {
1111 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1112 } 1316 }
1113 } 1317 }
1114} 1318}
1115 1319
1116cf::attachable->attach ( 1320cf::attachable->attach (
1143 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1144 1348
1145 sync_job { 1349 sync_job {
1146 if (length $$rdata) { 1350 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1148 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1149 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1150 1355
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1359 if ($cf::USE_FSYNC) {
1360 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1361 aio_fsync $fh;
1362 }
1155 aio_close $fh; 1363 aio_close $fh;
1156 1364
1157 if (@$objs) { 1365 if (@$objs) {
1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1366 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1159 aio_chmod $fh, SAVE_MODE; 1367 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1162 aio_fsync $fh if $cf::USE_FSYNC; 1370 if ($cf::USE_FSYNC) {
1371 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1372 aio_fsync $fh;
1373 }
1163 aio_close $fh; 1374 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1376 }
1166 } else { 1377 } else {
1167 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1170 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1171 1382
1172 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1174 } else { 1385 } else {
1175 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1176 } 1387 }
1177 } else { 1388 } else {
1178 aio_unlink $filename; 1389 aio_unlink $filename;
1179 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1180 } 1391 }
1204 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs}; 1416 $av = $st->{objs};
1206 } 1417 }
1207 1418
1208 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1209 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1210 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1211 1423
1212 ($data, $av) 1424 ($data, $av)
1213} 1425}
1214 1426
1215=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1274} 1486}
1275 1487
1276use File::Glob (); 1488use File::Glob ();
1277 1489
1278cf::player->attach ( 1490cf::player->attach (
1279 on_command => sub { 1491 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1281 1493
1282 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1283 or return; 1495 or return;
1284 1496
1292 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1293 1505
1294 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1295 1507
1296 if (ref $msg) { 1508 if (ref $msg) {
1297 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1298 "ARRAY" eq ref $msg
1299 ? @$msg
1300 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1301 1510
1302 my @reply; 1511 my @reply;
1303 1512
1304 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1305 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1307 1516
1308 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1309 if $reply; 1518 if $reply;
1310 1519
1311 } else { 1520 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1522 }
1314 1523
1315 cf::override; 1524 cf::override;
1316 }, 1525 },
1317); 1526);
1318 1527
1319# "readahead" all extensions 1528# "readahead" all extensions
1320sub cache_extensions { 1529sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1530 my $grp = IO::AIO::aio_group;
1322 1531
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1532 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1533 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1534 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1535 }
1327 }; 1536 };
1328 1537
1329 $grp 1538 $grp
1330} 1539}
1331 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
1332sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1333 cf::sync_job { 1557 cf::sync_job {
1334 my %todo; 1558 my %todo;
1335 1559
1336 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1337 next unless -r $path; 1561 next unless -r $path;
1355 1579
1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1358 1582
1359 $ext{source} = 1583 $ext{source} =
1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1361 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1362 . $source 1586 . $source
1363 . "\n};\n1"; 1587 . "\n};\n1";
1364 1588
1365 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1366 } 1590 }
1367 1591
1592 my $pass = 0;
1368 my %done; 1593 my %done;
1369 while (%todo) { 1594 while (%todo) {
1370 my $progress; 1595 my $progress;
1371 1596
1597 ++$pass;
1598
1599 ext:
1372 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1602 next ext
1375 unless exists $done{$_}; 1603 unless exists $done{$_};
1376 } 1604 }
1377 1605
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1607
1380 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 $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1621
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1623 if exists $v->{meta}{mandatory};
1388 1624
1389 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;
1390 } 1634 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1635 }
1396 1636
1397 skip: 1637 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 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 }
1400 } 1647 }
1401 }; 1648 };
1402} 1649}
1403 1650
1404############################################################################# 1651#############################################################################
1488 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1489 } 1736 }
1490 } 1737 }
1491} 1738}
1492 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
1493sub save($) { 1753sub save($) {
1494 my ($pl) = @_; 1754 my ($pl) = @_;
1495 1755
1496 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1497 1757
1502 1762
1503 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1505 1765
1506 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];
1507 1770
1508 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1772 cf::cede_to_tick;
1510} 1773}
1511 1774
1545 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1546 1809
1547 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1548 $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
1549 1812
1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1551 $pl->deactivate; 1814 $pl->deactivate;
1815
1552 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;
1553 $pl->ob->check_score;
1554 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1555 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1556 1821
1557 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1558 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1559 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1613 \@logins 1878 \@logins
1614} 1879}
1615 1880
1616=item $player->maps 1881=item $player->maps
1617 1882
1883=item cf::player::maps $login
1884
1618Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1619player. May block. 1886player. May block.
1620 1887
1621=cut 1888=cut
1622 1889
1684=cut 1951=cut
1685 1952
1686sub find_by_path($) { 1953sub find_by_path($) {
1687 my ($path) = @_; 1954 my ($path) = @_;
1688 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1689 my ($match, $specificity); 1958 my ($match, $specificity);
1690 1959
1691 for my $region (list) { 1960 for my $region (list) {
1692 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1693 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1721sub generate_random_map { 1990sub generate_random_map {
1722 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1723 1992
1724 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
1725 1994
1726 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1736 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1737 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1738 (cf::region::find $rmp->{region}), $rmp->{custom}
1739 )
1740} 1996}
1741 1997
1742=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1743 1999
1744Register 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
1749 2005
1750sub register { 2006sub register {
1751 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1752 my $pkg = caller; 2008 my $pkg = caller;
1753 2009
1754 no strict;
1755 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1756 2011
1757 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1758} 2013}
1759 2014
1760# also paths starting with '/' 2015# also paths starting with '/'
1761$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1762 2017
1763sub thawer_merge { 2018sub thawer_merge {
1764 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1765 2020
1766 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1771} 2026}
1772 2027
1773sub normalise { 2028sub normalise {
1774 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1775 2030
1776 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1777 2032
1778 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1779 2034
1780 # map plan: 2035 # map plan:
1781 # 2036 #
1796 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1797 $path = "$base/$path"; 2052 $path = "$base/$path";
1798 } 2053 }
1799 2054
1800 for ($path) { 2055 for ($path) {
1801 redo if s{//}{/};
1802 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1803 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1804 } 2058 }
1805 2059
1806 $path 2060 $path
1820 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1821 return $self; 2075 return $self;
1822 } 2076 }
1823 } 2077 }
1824 2078
1825 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1826 () 2080 ()
1827} 2081}
1828 2082
2083# may re-bless or do other evil things
1829sub init { 2084sub init {
1830 my ($self) = @_; 2085 my ($self) = @_;
1831 2086
1832 $self 2087 $self
1833} 2088}
1898 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1899 2154
1900 1 2155 1
1901} 2156}
1902 2157
2158# used to laod the header of an original map
1903sub load_header_orig { 2159sub load_header_orig {
1904 my ($self) = @_; 2160 my ($self) = @_;
1905 2161
1906 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1907} 2163}
1908 2164
2165# used to laod the header of an instantiated map
1909sub load_header_temp { 2166sub load_header_temp {
1910 my ($self) = @_; 2167 my ($self) = @_;
1911 2168
1912 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1913} 2170}
1914 2171
2172# called after loading the header from an instantiated map
1915sub prepare_temp { 2173sub prepare_temp {
1916 my ($self) = @_; 2174 my ($self) = @_;
1917 2175
1918 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1919 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1920 # safety 2178 # safety
1921 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1922 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1923} 2181}
1924 2182
2183# called after loading the header from an original map
1925sub prepare_orig { 2184sub prepare_orig {
1926 my ($self) = @_; 2185 my ($self) = @_;
1927 2186
1928 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1929 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1953 2212
1954sub find; 2213sub find;
1955sub find { 2214sub find {
1956 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1957 2216
2217 cf::cede_to_tick;
2218
1958 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1959 2220
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1961 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1962 2223
1963 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
1980 2241
1981 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
1982 } 2243 }
1983} 2244}
1984 2245
1985sub pre_load { } 2246sub pre_load { }
1986sub post_load { } 2247#sub post_load { } # XS
1987 2248
1988sub load { 2249sub load {
1989 my ($self) = @_; 2250 my ($self) = @_;
1990 2251
1991 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
1994 2255
1995 { 2256 {
1996 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
1997 2258
1998 return unless $self->valid; 2259 return unless $self->valid;
1999 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2000
2001 $self->in_memory (cf::MAP_LOADING);
2002 2261
2003 $self->alloc; 2262 $self->alloc;
2004 2263
2005 $self->pre_load; 2264 $self->pre_load;
2006 cf::cede_to_tick; 2265 cf::cede_to_tick;
2007 2266
2267 if (exists $self->{load_path}) {
2008 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2009 $f->skip_block; 2269 $f->skip_block;
2010 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2011 or return; 2271 or return;
2012 2272
2013 $self->post_load_original 2273 $self->post_load_original
2014 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2015 2275
2016 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2017 utf8::encode $uniq; 2277 utf8::encode $uniq;
2018 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2019 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2020 $self->clear_unique_items; 2280 $self->clear_unique_items;
2021 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2022 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2023 } 2284 }
2024 } 2285 }
2025 }
2026 2286
2027 $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);
2028 2294
2029 cf::cede_to_tick; 2295 cf::cede_to_tick;
2030 # now do the right thing for maps 2296 # now do the right thing for maps
2031 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2032 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2036 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2037 $self->decay_objects; 2303 $self->decay_objects;
2038 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2039 $self->update_buttons; 2305 $self->update_buttons;
2040 cf::cede_to_tick; 2306 cf::cede_to_tick;
2041 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2042 } 2308 }
2043 2309
2044 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2046
2047 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2312 }
2049 2313
2050 $self->post_load; 2314 $self->post_load;
2051}
2052 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
2053sub customise_for { 2322sub customise_for {
2054 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2055 2324
2056 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2326 if $self->per_player;
2060# if $self->per_party; 2329# if $self->per_party;
2061 2330
2062 $self 2331 $self
2063} 2332}
2064 2333
2065# find and load all maps in the 3x3 area around a map
2066sub load_neighbours {
2067 my ($map) = @_;
2068
2069 my @neigh; # diagonal neighbours
2070
2071 for (0 .. 3) {
2072 my $neigh = $map->tile_path ($_)
2073 or next;
2074 $neigh = find $neigh, $map
2075 or next;
2076 $neigh->load;
2077
2078 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 }
2082
2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
2085 my $neigh = find $path, $origin
2086 or next;
2087 $neigh->load;
2088 }
2089}
2090
2091sub find_sync { 2334sub find_sync {
2092 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2093 2336
2094 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
2095} 2342}
2096 2343
2097sub do_load_sync { 2344sub do_load_sync {
2098 my ($map) = @_; 2345 my ($map) = @_;
2099 2346
2347 # it's a bug to call this from the main context
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2102 2350
2103 cf::sync_job { $map->load }; 2351 $map->load;
2104} 2352}
2105 2353
2106our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2108 2356
2109sub find_async { 2357sub find_async {
2110 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2111 2359
2112 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2113 2361
2114 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2116 } 2364 }
2117 2365
2118 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2119 2367
2120 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2134 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2135 2383
2136 () 2384 ()
2137} 2385}
2138 2386
2387# common code, used by both ->save and ->swapout
2139sub save { 2388sub _save {
2140 my ($self) = @_; 2389 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2390
2144 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2145 2392
2146 return unless $self->dirty; 2393 return unless $self->dirty;
2147 2394
2167 } else { 2414 } else {
2168 $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);
2169 } 2416 }
2170} 2417}
2171 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2172sub swap_out { 2427sub swap_out {
2173 my ($self) = @_; 2428 my ($self) = @_;
2174 2429
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2180 return if $self->players; 2434 return if $self->players;
2181 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
2182 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2183 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
2184 $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};
2185 2486
2186 $self->deactivate; 2487 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2489 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2490
2234 $self->unlink_save; 2491 $self->unlink_save;
2235 $self->destroy; 2492 $self->destroy;
2236} 2493}
2237 2494
2245 2502
2246 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2247 2504
2248 $self->unlink_save; 2505 $self->unlink_save;
2249 2506
2250 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2512
2312 : normalise $_ 2569 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2571 ]
2315} 2572}
2316 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
2317=back 2606=back
2318 2607
2319=head3 cf::object 2608=head3 cf::object
2320 2609
2321=cut 2610=cut
2386 2675
2387our $SAY_CHANNEL = { 2676our $SAY_CHANNEL = {
2388 id => "say", 2677 id => "say",
2389 title => "Map", 2678 title => "Map",
2390 reply => "say ", 2679 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2680 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2681};
2393 2682
2394our $CHAT_CHANNEL = { 2683our $CHAT_CHANNEL = {
2395 id => "chat", 2684 id => "chat",
2396 title => "Chat", 2685 title => "Chat",
2453 2742
2454Freezes 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}>).
2455 2744
2456The 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.
2457for 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,
2458though, 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
2459map. 2748map.
2460 2749
2461Will never block. 2750Will never block.
2462 2751
2463=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2485 my ($self) = @_; 2774 my ($self) = @_;
2486 2775
2487 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2488 2777
2778 ++$self->{_link_recursion};
2779
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2781
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2493 2784
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2786}
2496 2787
2497sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2499 2790
2516 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2518 2809
2519 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2522 2813
2523 $map->load; 2814 $map->load;
2524 $map->load_neighbours;
2525 2815
2526 return unless $self->contr->active; 2816 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2817
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2532} 2820 # entering was successful
2821 delete $self->{_link_recursion};
2822 # only activate afterwards, to support waiting in hooks
2823 $self->activate_recursive;
2824 }
2533 2825
2826}
2827
2534=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)]])
2535 2829
2536Moves 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
2537her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2538that 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
2539the 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
2546 2840
2547our $GOTOGEN; 2841our $GOTOGEN;
2548 2842
2549sub cf::object::player::goto { 2843sub cf::object::player::goto {
2550 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 }
2551 2851
2552 # 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
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2854
2555 $self->enter_link; 2855 $self->enter_link;
2575 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2576 } 2876 }
2577 } 2877 }
2578 2878
2579 my $map = eval { 2879 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2581 2881
2582 if ($map) { 2882 if ($map) {
2583 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2885 } else {
2586 $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);
2587 } 2887 }
2588 2888
2589 $map 2889 $map
2597 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2600 } 2900 }
2601 2901
2602 $done->() if $done; 2902 $done->($self) if $done;
2603 })->prio (1); 2903 })->prio (1);
2604} 2904}
2605 2905
2606=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2607 2907
2675 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2676 2976
2677 unless (eval { 2977 unless (eval {
2678 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2679 2979
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2689 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2690 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 }
2691 3006
2692 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2693 3008
2694 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2700 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "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. "
2702 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2704 3019
2705 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 3021 $self->leave_link;
2707 } 3022 }
2708 })->prio (1); 3023 })->prio (1);
2709} 3024}
2710 3025
2722sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2724 3039
2725 utf8::encode $text; 3040 utf8::encode $text;
2726 $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);
2727} 3067}
2728 3068
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 3070
2731Send 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
2735 3075
2736=cut 3076=cut
2737 3077
2738# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2740 "c/identify" => { 3086 "c/identify" => {
2741 id => "infobox", 3087 id => "infobox",
2742 title => "Identify", 3088 title => "Identify",
2743 reply => undef, 3089 reply => undef,
2744 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2746 "c/examine" => { 3092 "c/examine" => {
2747 id => "infobox", 3093 id => "infobox",
2748 title => "Examine", 3094 title => "Examine",
2749 reply => undef, 3095 reply => undef,
2750 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",
2751 }, 3103 },
2752 "c/book" => { 3104 "c/book" => {
2753 id => "infobox", 3105 id => "infobox",
2754 title => "Book", 3106 title => "Book",
2755 reply => undef, 3107 reply => undef,
2783 id => "infobox", 3135 id => "infobox",
2784 title => "Skills", 3136 title => "Skills",
2785 reply => undef, 3137 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 3138 tooltip => "Shows your experience per skill and item power",
2787 }, 3139 },
3140 "c/shopitems" => {
3141 id => "infobox",
3142 title => "Shop Items",
3143 reply => undef,
3144 tooltip => "Shows the items currently for sale in this shop",
3145 },
2788 "c/resistances" => { 3146 "c/resistances" => {
2789 id => "infobox", 3147 id => "infobox",
2790 title => "Resistances", 3148 title => "Resistances",
2791 reply => undef, 3149 reply => undef,
2792 tooltip => "Shows your resistances", 3150 tooltip => "Shows your resistances",
2794 "c/pets" => { 3152 "c/pets" => {
2795 id => "infobox", 3153 id => "infobox",
2796 title => "Pets", 3154 title => "Pets",
2797 reply => undef, 3155 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 3156 tooltip => "Shows information abotu your pets/a specific pet",
3157 },
3158 "c/perceiveself" => {
3159 id => "infobox",
3160 title => "Perceive Self",
3161 reply => undef,
3162 tooltip => "You gained detailed knowledge about yourself",
2799 }, 3163 },
2800 "c/uptime" => { 3164 "c/uptime" => {
2801 id => "infobox", 3165 id => "infobox",
2802 title => "Uptime", 3166 title => "Uptime",
2803 reply => undef, 3167 reply => undef,
2859 my $pkt = "msg " 3223 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3226 );
2863 3227
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2875} 3229}
2876 3230
2877=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2878 3232
2879Sends an ext event to the client. 3233Sends an ext event to the client.
2882 3236
2883sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2885 3239
2886 if ($self->extcmd == 2) { 3240 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove 3242 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type"; 3243 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3244 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 } 3245 }
2892} 3246}
2893 3247
2894=item $client->ext_reply ($msgid, @msg) 3248=item $client->ext_reply ($msgid, @msg)
2895 3249
2898=cut 3252=cut
2899 3253
2900sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
2902 3256
2903 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 }
2910} 3260}
2911 3261
2912=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
2913 3263
2914Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
2969 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
2970 3320
2971 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2972 3322
2973 if (ref $msg) { 3323 if (ref $msg) {
2974 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2975 "ARRAY" eq ref $msg
2976 ? @$msg
2977 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2978 3325
2979 my @reply; 3326 my @reply;
2980 3327
2981 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
2982 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
2984 3331
2985 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
2986 if $reply; 3333 if $reply;
2987 3334
2988 } else { 3335 } else {
2989 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2990 } 3337 }
2991 3338
2992 cf::override; 3339 cf::override;
2993 }, 3340 },
2994); 3341);
3014 3361
3015 $coro 3362 $coro
3016} 3363}
3017 3364
3018cf::client->attach ( 3365cf::client->attach (
3019 on_destroy => sub { 3366 on_client_destroy => sub {
3020 my ($ns) = @_; 3367 my ($ns) = @_;
3021 3368
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3370 },
3024); 3371);
3040our $safe_hole = new Safe::Hole; 3387our $safe_hole = new Safe::Hole;
3041 3388
3042$SIG{FPE} = 'IGNORE'; 3389$SIG{FPE} = 'IGNORE';
3043 3390
3044$safe->permit_only (Opcode::opset qw( 3391$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3392 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3393 grepstart grepwhile mapstart mapwhile
3047 sort time 3394 sort time
3048)); 3395));
3049 3396
3050# here we export the classes and methods available to script code 3397# here we export the classes and methods available to script code
3075 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3076 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3077 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3078 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3079) { 3426) {
3080 no strict 'refs';
3081 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3083 for @funs; 3429 for @funs;
3084} 3430}
3085 3431
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3448 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3449 $qcode =~ s/\n/\\n/g;
3104 3450
3105 %vars = (_dummy => 0) unless %vars; 3451 %vars = (_dummy => 0) unless %vars;
3106 3452
3453 my @res;
3107 local $_; 3454 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3455
3110 my $eval = 3456 my $eval =
3111 "do {\n" 3457 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3458 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3459 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3460 . $code
3115 . "\n}" 3461 . "\n}"
3116 ; 3462 ;
3117 3463
3464 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3465 sub_generation_inc;
3466 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3467 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3468 sub_generation_inc;
3469 } else {
3470 local @cf::_safe_eval_args = values %vars;
3471 @res = wantarray ? eval eval : scalar eval $eval;
3472 }
3121 3473
3122 if ($@) { 3474 if ($@) {
3123 warn "$@"; 3475 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3126 } 3478 }
3127 3479
3128 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3129} 3481}
3130 3482
3144=cut 3496=cut
3145 3497
3146sub register_script_function { 3498sub register_script_function {
3147 my ($fun, $cb) = @_; 3499 my ($fun, $cb) = @_;
3148 3500
3149 no strict 'refs'; 3501 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3502 *$fun = $safe_hole->wrap ($cb);
3151} 3503}
3152 3504
3153=back 3505=back
3154 3506
3155=cut 3507=cut
3156 3508
3157############################################################################# 3509#############################################################################
3158# the server's init and main functions 3510# the server's init and main functions
3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3514# internal api, not fianlised
3515sub add_face {
3516 my ($name, $type, $data) = @_;
3517
3518 my $idx = cf::face::find $name;
3519
3520 if ($idx) {
3521 delete $FACEHASH{cf::face::get_chksum $idx};
3522 } else {
3523 $idx = cf::face::alloc $name;
3524 }
3525
3526 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3527
3528 cf::face::set_type $idx, $type;
3529 cf::face::set_data $idx, 0, $data, $hash;
3530 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3531 $FACEHASH{$hash} = $idx;#d#
3532
3533 $idx
3534}
3159 3535
3160sub load_facedata($) { 3536sub load_facedata($) {
3161 my ($path) = @_; 3537 my ($path) = @_;
3162 3538
3163 # HACK to clear player env face cache, we need some signal framework 3539 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?) 3540 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3541 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3542
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3543 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3544
3169 warn "loading facedata from $path\n"; 3545 trace "loading facedata from $path\n";
3170 3546
3171 my $facedata; 3547 my $facedata = decode_storable load_file $path;
3172 0 < aio_load $path, $facedata
3173 or die "$path: $!";
3174
3175 $facedata = Coro::Storable::thaw $facedata;
3176 3548
3177 $facedata->{version} == 2 3549 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3550 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3551
3180 # patch in the exptable
3181 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3184 };
3185 cf::cede_to_tick; 3552 cf::cede_to_tick;
3186 3553
3187 { 3554 {
3188 my $faces = $facedata->{faceinfo}; 3555 my $faces = $facedata->{faceinfo};
3189 3556
3190 while (my ($face, $info) = each %$faces) { 3557 for my $face (sort keys %$faces) {
3558 my $info = $faces->{$face};
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3559 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3560
3193 cf::face::set_visibility $idx, $info->{visibility}; 3561 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3562 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3563 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3564 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3565 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3566 $FACEHASH{$info->{hash64}} = $idx;#d#
3197 3567
3198 cf::cede_to_tick; 3568 cf::cede_to_tick;
3199 } 3569 }
3200 3570
3201 while (my ($face, $info) = each %$faces) { 3571 while (my ($face, $info) = each %$faces) {
3206 3576
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3577 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3578 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3579 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3580 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3581 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3582 }
3213 3583
3214 cf::cede_to_tick; 3584 cf::cede_to_tick;
3215 } 3585 }
3216 } 3586 }
3225 3595
3226 cf::anim::invalidate_all; # d'oh 3596 cf::anim::invalidate_all; # d'oh
3227 } 3597 }
3228 3598
3229 { 3599 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3600 my $res = $facedata->{resource};
3233 3601
3234 while (my ($name, $info) = each %$res) { 3602 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3603 if (defined (my $type = $info->{type})) {
3604 # TODO: different hash - must free and use new index, or cache ixface data queue
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3605 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3606
3239 if ($info->{type} & 1) {
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3607 cf::face::set_type $idx, $type;
3608 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3609 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3610 $FACEHASH{$info->{hash}} = $idx;#d#
3254 } else { 3611 } else {
3255 $RESOURCE{$name} = $info; 3612# $RESOURCE{$name} = $info; # unused
3256 } 3613 }
3257 3614
3258 cf::cede_to_tick; 3615 cf::cede_to_tick;
3259 } 3616 }
3260 } 3617 }
3261 3618
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3619 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3620
3264 1 3621 1
3265} 3622}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3623
3287register_exticmd fx_want => sub { 3624register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3625 my ($ns, $want) = @_;
3289 3626
3290 while (my ($k, $v) = each %$want) { 3627 while (my ($k, $v) = each %$want) {
3298 my $status = load_resource_file_ $_[0]; 3635 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100; 3636 get_slot 0.1, 100;
3300 cf::arch::commit_load; 3637 cf::arch::commit_load;
3301 3638
3302 $status 3639 $status
3640}
3641
3642sub reload_exp_table {
3643 _reload_exp_table;
3644
3645 add_face "res/exp_table" => FT_RSRC,
3646 JSON::XS->new->utf8->canonical->encode (
3647 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3648 );
3649}
3650
3651sub reload_materials {
3652 _reload_materials;
3303} 3653}
3304 3654
3305sub reload_regions { 3655sub reload_regions {
3306 # HACK to clear player env face cache, we need some signal framework 3656 # HACK to clear player env face cache, we need some signal framework
3307 # for this (global event?) 3657 # for this (global event?)
3322} 3672}
3323 3673
3324sub reload_archetypes { 3674sub reload_archetypes {
3325 load_resource_file "$DATADIR/archetypes" 3675 load_resource_file "$DATADIR/archetypes"
3326 or die "unable to load archetypes\n"; 3676 or die "unable to load archetypes\n";
3677
3678 add_face "res/skill_info" => FT_RSRC,
3679 JSON::XS->new->utf8->canonical->encode (
3680 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3681 );
3682 add_face "res/spell_paths" => FT_RSRC,
3683 JSON::XS->new->utf8->canonical->encode (
3684 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3685 );
3327} 3686}
3328 3687
3329sub reload_treasures { 3688sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3689 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3690 or die "unable to load treasurelists\n";
3332} 3691}
3333 3692
3693sub reload_sound {
3694 trace "loading sound config from $DATADIR/sound\n";
3695
3696 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3697
3698 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3699 my $sound = $soundconf->{compat}[$_]
3700 or next;
3701
3702 my $face = cf::face::find "sound/$sound->[1]";
3703 cf::sound::set $sound->[0] => $face;
3704 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3705 }
3706
3707 while (my ($k, $v) = each %{$soundconf->{event}}) {
3708 my $face = cf::face::find "sound/$v";
3709 cf::sound::set $k => $face;
3710 }
3711}
3712
3334sub reload_resources { 3713sub reload_resources {
3335 warn "reloading resource files...\n"; 3714 trace "reloading resource files...\n";
3336 3715
3716 reload_materials;
3337 reload_facedata; 3717 reload_facedata;
3718 reload_exp_table;
3719 reload_sound;
3338 reload_archetypes; 3720 reload_archetypes;
3339 reload_regions; 3721 reload_regions;
3340 reload_treasures; 3722 reload_treasures;
3341 3723
3342 warn "finished reloading resource files\n"; 3724 trace "finished reloading resource files\n";
3343} 3725}
3344 3726
3345sub reload_config { 3727sub reload_config {
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3728 trace "reloading config file...\n";
3347 or return;
3348 3729
3349 local $/; 3730 my $config = load_file "$CONFDIR/config";
3350 *CFG = YAML::Load <$fh>; 3731 utf8::decode $config;
3732 *CFG = decode_yaml $config;
3351 3733
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3734 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3735
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3736 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3737 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356 3738
3357 if (exists $CFG{mlockall}) { 3739 if (exists $CFG{mlockall}) {
3380 3762
3381 seek $fh, 0, 0; 3763 seek $fh, 0, 0;
3382 print $fh $$; 3764 print $fh $$;
3383} 3765}
3384 3766
3767sub main_loop {
3768 trace "EV::loop starting\n";
3769 if (1) {
3770 EV::loop;
3771 }
3772 trace "EV::loop returned\n";
3773 goto &main_loop unless $REALLY_UNLOOP;
3774}
3775
3385sub main { 3776sub main {
3386 cf::init_globals; # initialise logging 3777 cf::init_globals; # initialise logging
3387 3778
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3779 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3780 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3781 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3782 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392 3783
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3784 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3785
3400 # we must not ever block the main coroutine 3786 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3787 $Coro::idle = sub {
3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3788 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3403 (async { 3789 (async {
3404 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3790 $Coro::current->{desc} = "IDLE BUG HANDLER";
3405 EV::loop EV::LOOP_ONESHOT; 3791 EV::loop EV::LOOP_ONESHOT;
3406 })->prio (Coro::PRIO_MAX); 3792 })->prio (Coro::PRIO_MAX);
3407 }; 3793 };
3408 3794
3409 evthread_start IO::AIO::poll_fileno; 3795 evthread_start IO::AIO::poll_fileno;
3410 3796
3411 cf::sync_job { 3797 cf::sync_job {
3798 cf::incloader::init ();
3799
3800 cf::init_anim;
3801 cf::init_attackmess;
3802 cf::init_dynamic;
3803
3804 cf::load_settings;
3805
3412 reload_resources; 3806 reload_resources;
3413 reload_config; 3807 reload_config;
3414 db_init; 3808 db_init;
3415 3809
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3810 cf::init_uuid;
3419 cf::init_signals; 3811 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3812 cf::init_skills;
3422 3813
3423 cf::init_beforeplay; 3814 cf::init_beforeplay;
3424 3815
3425 atomic; 3816 atomic;
3427 load_extensions; 3818 load_extensions;
3428 3819
3429 utime time, time, $RUNTIMEFILE; 3820 utime time, time, $RUNTIMEFILE;
3430 3821
3431 # no (long-running) fork's whatsoever before this point(!) 3822 # no (long-running) fork's whatsoever before this point(!)
3823 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3824 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3825
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3826 cf::_post_init 0;
3435 }; 3827 };
3436 3828
3437 EV::loop; 3829 cf::object::thawer::errors_are_fatal 0;
3830 info "parse errors in files are no longer fatal from this point on.\n";
3831
3832 AE::postpone {
3833 undef &main; # free gobs of memory :)
3834 };
3835
3836 goto &main_loop;
3438} 3837}
3439 3838
3440############################################################################# 3839#############################################################################
3441# initialisation and cleanup 3840# initialisation and cleanup
3442 3841
3443# install some emergency cleanup handlers 3842# install some emergency cleanup handlers
3444BEGIN { 3843BEGIN {
3445 our %SIGWATCHER = (); 3844 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3845 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3846 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3847 cf::cleanup "SIG$signal";
3449 }; 3848 };
3450 } 3849 }
3451} 3850}
3452 3851
3453sub write_runtime_sync { 3852sub write_runtime_sync {
3853 my $t0 = AE::time;
3854
3454 # first touch the runtime file to show we are still running: 3855 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3856 # the fsync below can take a very very long time.
3456 3857
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3858 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3859
3459 my $guard = cf::lock_acquire "write_runtime"; 3860 my $guard = cf::lock_acquire "write_runtime";
3460 3861
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3862 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3863 or return;
3463 3864
3464 my $value = $cf::RUNTIME + 90 + 10; 3865 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3866 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3867 # 60 allows for the watchdog to kill the server.
3479 or return; 3880 or return;
3480 3881
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3882 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3883 and return;
3483 3884
3484 warn "runtime file written.\n"; 3885 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3886
3486 1 3887 1
3487} 3888}
3488 3889
3489our $uuid_lock; 3890our $uuid_lock;
3501 or return; 3902 or return;
3502 3903
3503 my $value = uuid_seq uuid_cur; 3904 my $value = uuid_seq uuid_cur;
3504 3905
3505 unless ($value) { 3906 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3907 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3908 return;
3508 } 3909 }
3509 3910
3510 my $value = uuid_str $value + $uuid_skip; 3911 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3912 $uuid_skip = 0;
3521 or return; 3922 or return;
3522 3923
3523 aio_rename "$uuid~", $uuid 3924 aio_rename "$uuid~", $uuid
3524 and return; 3925 and return;
3525 3926
3526 warn "uuid file written ($value).\n"; 3927 trace "uuid file written ($value).\n";
3527 3928
3528 1 3929 1
3529 3930
3530} 3931}
3531 3932
3537} 3938}
3538 3939
3539sub emergency_save() { 3940sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3941 my $freeze_guard = cf::freeze_mainloop;
3541 3942
3542 warn "emergency_perl_save: enter\n"; 3943 info "emergency_perl_save: enter\n";
3944
3945 # this is a trade-off: we want to be very quick here, so
3946 # save all maps without fsync, and later call a global sync
3947 # (which in turn might be very very slow)
3948 local $USE_FSYNC = 0;
3543 3949
3544 cf::sync_job { 3950 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 3951 cf::write_runtime_sync; # external watchdog should not bark
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549 3952
3550 # use a peculiar iteration method to avoid tripping on perl 3953 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 3954 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 3955 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 3956 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 3957 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 3958 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 3959 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3960 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 3961 $pl->save;
3559 } 3962 }
3560 warn "emergency_perl_save: end player save\n"; 3963 info "emergency_perl_save: end player save\n";
3561 3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3966
3562 warn "emergency_perl_save: begin map save\n"; 3967 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 3968 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 3969 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 3970 $map->valid or next;
3566 $map->save; 3971 $map->save;
3567 } 3972 }
3568 warn "emergency_perl_save: end map save\n"; 3973 info "emergency_perl_save: end map save\n";
3569 3974
3975 cf::write_runtime_sync; # external watchdog should not bark
3976
3570 warn "emergency_perl_save: begin database checkpoint\n"; 3977 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 3978 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 3979 info "emergency_perl_save: end database checkpoint\n";
3573 3980
3574 warn "emergency_perl_save: begin write uuid\n"; 3981 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 3982 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n"; 3983 info "emergency_perl_save: end write uuid\n";
3984
3985 cf::write_runtime_sync; # external watchdog should not bark
3986
3987 trace "emergency_perl_save: syncing database to disk";
3988 BDB::db_env_txn_checkpoint $DB_ENV;
3989
3990 info "emergency_perl_save: starting sync\n";
3991 IO::AIO::aio_sync sub {
3992 info "emergency_perl_save: finished sync\n";
3993 };
3994
3995 cf::write_runtime_sync; # external watchdog should not bark
3996
3997 trace "emergency_perl_save: flushing outstanding aio requests";
3998 while (IO::AIO::nreqs || BDB::nreqs) {
3999 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4000 }
4001
4002 cf::write_runtime_sync; # external watchdog should not bark
3577 }; 4003 };
3578 4004
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3584 warn "emergency_perl_save: leave\n"; 4005 info "emergency_perl_save: leave\n";
3585} 4006}
3586 4007
3587sub post_cleanup { 4008sub post_cleanup {
3588 my ($make_core) = @_; 4009 my ($make_core) = @_;
3589 4010
4011 IO::AIO::flush;
4012
3590 warn Carp::longmess "post_cleanup backtrace" 4013 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 4014 if $make_core;
3592 4015
3593 my $fh = pidfile; 4016 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 4017 unlink $PIDFILE if <$fh> == $$;
3595} 4018}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4038 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 4039 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 4040 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4041# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 4042 }
3620 warn "cleared package $pkg\n";#d#
3621} 4043}
3622 4044
3623sub do_reload_perl() { 4045sub do_reload_perl() {
3624 # can/must only be called in main 4046 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 4047 unless (in_main) {
3626 warn "can only reload from main coroutine"; 4048 error "can only reload from main coroutine";
3627 return; 4049 return;
3628 } 4050 }
3629 4051
3630 return if $RELOAD++; 4052 return if $RELOAD++;
3631 4053
3632 my $t1 = EV::time; 4054 my $t1 = AE::time;
3633 4055
3634 while ($RELOAD) { 4056 while ($RELOAD) {
3635 warn "reloading..."; 4057 cf::get_slot 0.1, -1, "reload_perl";
4058 info "perl_reload: reloading...";
3636 4059
3637 warn "entering sync_job"; 4060 trace "perl_reload: entering sync_job";
3638 4061
3639 cf::sync_job { 4062 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 4063 #cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 4064
3644 warn "syncing database to disk";
3645 BDB::db_env_txn_checkpoint $DB_ENV;
3646
3647 # if anything goes wrong in here, we should simply crash as we already saved
3648
3649 warn "flushing outstanding aio requests";
3650 while (IO::AIO::nreqs || BDB::nreqs) {
3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3652 }
3653
3654 warn "cancelling all extension coros"; 4065 trace "perl_reload: cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 4066 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 4067 %EXT_CORO = ();
3657 4068
3658 warn "removing commands"; 4069 trace "perl_reload: removing commands";
3659 %COMMAND = (); 4070 %COMMAND = ();
3660 4071
3661 warn "removing ext/exti commands"; 4072 trace "perl_reload: removing ext/exti commands";
3662 %EXTCMD = (); 4073 %EXTCMD = ();
3663 %EXTICMD = (); 4074 %EXTICMD = ();
3664 4075
3665 warn "unloading/nuking all extensions"; 4076 trace "perl_reload: unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 4077 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 4078 trace "... unloading $pkg";
3668 4079
3669 if (my $cb = $pkg->can ("unload")) { 4080 if (my $cb = $pkg->can ("unload")) {
3670 eval { 4081 eval {
3671 $cb->($pkg); 4082 $cb->($pkg);
3672 1 4083 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 4084 } or error "$pkg unloaded, but with errors: $@";
3674 } 4085 }
3675 4086
3676 warn "... clearing $pkg"; 4087 trace "... clearing $pkg";
3677 clear_package $pkg; 4088 clear_package $pkg;
3678 } 4089 }
3679 4090
3680 warn "unloading all perl modules loaded from $LIBDIR"; 4091 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 4092 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4093 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 4094
3684 warn "... unloading $k"; 4095 trace "... unloading $k";
3685 delete $INC{$k}; 4096 delete $INC{$k};
3686 4097
3687 $k =~ s/\.pm$//; 4098 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 4099 $k =~ s/\//::/g;
3689 4100
3692 } 4103 }
3693 4104
3694 clear_package $k; 4105 clear_package $k;
3695 } 4106 }
3696 4107
3697 warn "getting rid of safe::, as good as possible"; 4108 trace "perl_reload: getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 4109 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4110 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 4111
3701 warn "unloading cf.pm \"a bit\""; 4112 trace "perl_reload: unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 4113 delete $INC{"cf.pm"};
3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4114 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 4115
3705 # don't, removes xs symbols, too, 4116 # don't, removes xs symbols, too,
3706 # and global variables created in xs 4117 # and global variables created in xs
3707 #clear_package __PACKAGE__; 4118 #clear_package __PACKAGE__;
3708 4119
3709 warn "unload completed, starting to reload now"; 4120 info "perl_reload: unload completed, starting to reload now";
3710 4121
3711 warn "reloading cf.pm"; 4122 trace "perl_reload: reloading cf.pm";
3712 require cf; 4123 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4124 cf::_connect_to_perl_1;
3714 4125
3715 warn "loading config and database again"; 4126 trace "perl_reload: loading config and database again";
3716 cf::reload_config; 4127 cf::reload_config;
3717 4128
3718 warn "loading extensions"; 4129 trace "perl_reload: loading extensions";
3719 cf::load_extensions; 4130 cf::load_extensions;
3720 4131
3721 if ($REATTACH_ON_RELOAD) { 4132 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 4133 trace "perl_reload: reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 4134 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 4135 trace "perl_reload: reattaching attachments to maps";
3725 reattach $_ for values %MAP; 4136 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 4137 trace "perl_reload: reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 4138 reattach $_ for values %PLAYER;
3728 } 4139 }
3729 4140
3730 warn "running post_init jobs"; 4141 cf::_post_init 1;
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732 4142
3733 warn "leaving sync_job"; 4143 trace "perl_reload: leaving sync_job";
3734 4144
3735 1 4145 1
3736 } or do { 4146 } or do {
3737 warn $@; 4147 error $@;
3738 cf::cleanup "error while reloading, exiting."; 4148 cf::cleanup "perl_reload: error, exiting.";
3739 }; 4149 };
3740 4150
3741 warn "reloaded";
3742 --$RELOAD; 4151 --$RELOAD;
3743 } 4152 }
3744 4153
3745 $t1 = EV::time - $t1; 4154 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 4155 info "perl_reload: completed in ${t1}s\n";
3747}; 4156};
3748 4157
3749our $RELOAD_WATCHER; # used only during reload 4158our $RELOAD_WATCHER; # used only during reload
3750 4159
3751sub reload_perl() { 4160sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 4162 # coro crashes during coro_state_free->destroy here.
3754 4163
3755 $RELOAD_WATCHER ||= cf::async { 4164 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 4165 Coro::AIO::aio_wait cache_extensions;
3757 4166
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4167 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 4168 do_reload_perl;
3760 undef $RELOAD_WATCHER; 4169 undef $RELOAD_WATCHER;
3761 }; 4170 };
3762 }; 4171 };
3763} 4172}
3772 reload_perl; 4181 reload_perl;
3773 }; 4182 };
3774 } 4183 }
3775}; 4184};
3776 4185
3777unshift @INC, $LIBDIR; 4186#############################################################################
3778 4187
3779my $bug_warning = 0; 4188my $bug_warning = 0;
3780 4189
3781our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN;
3783
3784sub wait_for_tick { 4190sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4191 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3786 4192
3787 my $signal = new Coro::Signal; 4193 $WAIT_FOR_TICK->wait;
3788 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait;
3790} 4194}
3791 4195
3792sub wait_for_tick_begin { 4196sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4197 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794 4198
3795 my $signal = new Coro::Signal; 4199 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4200 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4201 $signal->wait;
3798} 4202}
3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4206 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3803 unless ++$bug_warning > 10; 4207 unless ++$bug_warning > 10;
3804 return; 4208 return;
3805 } 4209 }
3806 4210
3807 cf::server_tick; # one server iteration 4211 cf::one_tick; # one server iteration
4212
4213 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 4214
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4215 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4216 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4217 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4218 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4219 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4220 or error "ERROR: unable to write runtime file: $!";
3815 }; 4221 };
3816 } 4222 }
3817 4223
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4224 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4225 $sig->send;
3820 } 4226 }
3821 while (my $sig = shift @WAIT_FOR_TICK) { 4227 $WAIT_FOR_TICK->broadcast;
3822 $sig->send;
3823 }
3824 4228
3825 $LOAD = ($NOW - $TICK_START) / $TICK; 4229 $LOAD = ($NOW - $TICK_START) / $TICK;
3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4230 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3827 4231
3828 if (0) { 4232 if (0) {
3829 if ($NEXT_TICK) { 4233 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4234 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4235 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4236 debug "jitter $JITTER\n";#d#
3833 } 4237 }
3834 } 4238 }
3835} 4239}
3836 4240
3837{ 4241{
3838 # configure BDB 4242 # configure BDB
3839 4243
3840 BDB::min_parallel 8; 4244 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4245 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4246 #$AnyEvent::BDB::WATCHER->priority (1);
3843 4247
3844 unless ($DB_ENV) { 4248 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4249 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4250 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4251 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 IO::AIO::min_parallel 8; 4286 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4287 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4288 undef $AnyEvent::AIO::WATCHER;
3885} 4289}
3886 4290
3887my $_log_backtrace; 4291our $_log_backtrace;
4292our $_log_backtrace_last;
3888 4293
3889sub _log_backtrace { 4294sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4295 my ($msg, @addr) = @_;
3891 4296
3892 $msg =~ s/\n//; 4297 $msg =~ s/\n$//;
3893 4298
4299 if ($_log_backtrace_last eq $msg) {
4300 LOG llevInfo, "[ABT] $msg\n";
4301 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4302 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4303 } elsif ($_log_backtrace < 2) {
4304 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4305 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4306 my $perl_bt = Carp::longmess $msg;
3898 async { 4307 async {
3899 $Coro::current->{desc} = "abt $msg"; 4308 $Coro::current->{desc} = "abt $msg";
3900 4309
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4329 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4330 --$_log_backtrace;
3922 }; 4331 };
3923 } else { 4332 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4333 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4334 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4335 }
3927} 4336}
3928 4337
3929# load additional modules 4338# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4339require "cf/$_.pm" for @EXTRA_MODULES;
4340cf::_connect_to_perl_2;
3931 4341
3932END { cf::emergency_save } 4342END { cf::emergency_save }
3933 4343
39341 43441
3935 4345

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines