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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines