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.581 by root, Fri Feb 3 02:04:11 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 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 ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %RESOURCE; 113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
117our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 132
119our %CFG; 133our %CFG;
120 134
121our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
123our $NOW; 138our $NOW;
124 139
125our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
126our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
127our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
134our $JITTER; # average jitter 149our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
136 151
137our @POST_INIT; 152our @POST_INIT;
138 153
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
140 159
141binmode STDOUT; 160binmode STDOUT;
142binmode STDERR; 161binmode STDERR;
143 162
144# read virtual server time, if available 163# read virtual server time, if available
155 174
156our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
157 176
158sub cf::map::normalise; 177sub cf::map::normalise;
159 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
160############################################################################# 183#############################################################################
161 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
162=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
163 197
164=over 4 198=over 4
165 199
166=item $cf::UPTIME 200=item $cf::UPTIME
167 201
168The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
169 218
170=item $cf::RUNTIME 219=item $cf::RUNTIME
171 220
172The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
173every server tick. 222every server tick.
179Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
180directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
181unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
182database environment. 231database environment.
183 232
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 233=item $cf::LOADAVG
193 234
194The current CPU load on the server (alpha-smoothed), as a value between 0 235The 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 236(none) and 1 (overloaded), indicating how much time is spent on processing
196objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
205from wherever your confdir points to. 246from wherever your confdir points to.
206 247
207=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
208 249
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These 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 251returns 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. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
213=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
214 272
215This array contains the results of the last C<invoke ()> call. When 273This 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 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 275that call.
218 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
219=back 283=back
220 284
221=cut 285=cut
222 286
223BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 294 my $msg = join "", @_;
226 295
227 $msg .= "\n" 296 $msg .= "\n"
228 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
229 298
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 300
232 LOG llevError, $msg; 301 LOG llevWarn, $msg;
233 }; 302};
234}
235 303
236$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
238 306
239 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 311 return;#d#
242 }#d# 312 }#d#
243 313
244 # kill coroutine otherwise 314 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 315 Coro::terminate
247}; 316};
248
249$SIG{__DIE__} = sub { }; #d#?
250 317
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 335)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 337}
271 338
272$EV::DIED = sub { 339$EV::DIED = sub {
273 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
274}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
275 347
276############################################################################# 348#############################################################################
277 349
278=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
279 351
300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
301 $d 373 $d
302 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
303} 375}
304 376
377=item $scalar = cf::load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
305=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
306 430
307Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
308 432
309=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316 440
317sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
319 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
452=item $ref = cf::decode_yaml $scalar
453
454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
455
456=cut
457
458sub decode_yaml($) {
459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
473}
474
320=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
321 476
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 478but I<before> the server starts ticking again.
324 479
325The cdoeblock will have a single boolean argument to indicate whether this 480The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 481is a reload or not.
327 482
328=cut 483=cut
329 484
330sub post_init(&) { 485sub post_init(&) {
331 push @POST_INIT, shift; 486 push @POST_INIT, shift;
487}
488
489sub _post_init {
490 trace "running post_init jobs";
491
492 # run them in parallel...
493
494 my @join;
495
496 while () {
497 push @join, map &Coro::async ($_, 0), @POST_INIT;
498 @POST_INIT = ();
499
500 @join or last;
501
502 (pop @join)->join;
503 }
332} 504}
333 505
334=item cf::lock_wait $string 506=item cf::lock_wait $string
335 507
336Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
375} 547}
376 548
377=item cf::periodic $interval, $cb 549=item cf::periodic $interval, $cb
378 550
379Like EV::periodic, but randomly selects a starting point so that the actions 551Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 552get spread over time.
381 553
382=cut 554=cut
383 555
384sub periodic($$) { 556sub periodic($$) {
385 my ($interval, $cb) = @_; 557 my ($interval, $cb) = @_;
389 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
390} 562}
391 563
392=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
393 565
394Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
395This call blocks and returns only when you have at least C<$time> seconds 567(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. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
397 573
398The optional C<$name> can be used to identify the job to run. It might be 574The 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. 575used for statistical purposes and should identify the same time-class.
400 576
401Useful for short background jobs. 577Useful for short background jobs.
402 578
403=cut 579=cut
404 580
405our @SLOT_QUEUE; 581our @SLOT_QUEUE;
406our $SLOT_QUEUE; 582our $SLOT_QUEUE;
583our $SLOT_DECAY = 0.9;
407 584
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 585$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 586$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 587 $Coro::current->desc ("timeslot manager");
411 588
412 my $signal = new Coro::Signal; 589 my $signal = new Coro::Signal;
590 my $busy;
413 591
414 while () { 592 while () {
415 next_job: 593 next_job:
594
416 my $avail = cf::till_tick; 595 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 596
418 for (0 .. $#SLOT_QUEUE) { 597 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 598 if ($SLOT_QUEUE[$_][0] <= $avail) {
599 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 600 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 601 $job->[2]->send;
422 Coro::cede; 602 Coro::cede;
423 goto next_job; 603 goto next_job;
424 } 604 } else {
605 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 606 }
426 } 607 }
427 608
428 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
431 $signal->wait;
432 } else { 612 } else {
613 $busy = 0;
433 Coro::schedule; 614 Coro::schedule;
434 } 615 }
435 } 616 }
436}; 617};
437 618
438sub get_slot($;$$) { 619sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 620 return if tick_inhibit || $Coro::current == $Coro::main;
440 621
441 my ($time, $pri, $name) = @_; 622 my ($time, $pri, $name) = @_;
442 623
443 $time = $TICK * .6 if $time > $TICK * .6; 624 $time = clamp $time, 0.01, $TICK * .6;
625
444 my $sig = new Coro::Signal; 626 my $sig = new Coro::Signal;
445 627
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 628 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 629 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 630 $SLOT_QUEUE->ready;
474=cut 656=cut
475 657
476sub sync_job(&) { 658sub sync_job(&) {
477 my ($job) = @_; 659 my ($job) = @_;
478 660
479 if ($Coro::current == $Coro::main) { 661 if (in_main) {
480 my $time = EV::time; 662 my $time = AE::time;
481 663
482 # this is the main coro, too bad, we have to block 664 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 665 # till the operation succeeds, freezing the server :/
484 666
485 LOG llevError, Carp::longmess "sync job";#d# 667 #LOG llevError, Carp::longmess "sync job";#d#
486 668
487 my $freeze_guard = freeze_mainloop; 669 my $freeze_guard = freeze_mainloop;
488 670
489 my $busy = 1; 671 my $busy = 1;
490 my @res; 672 my @res;
491 673
492 (async { 674 (async {
493 $Coro::current->desc ("sync job coro"); 675 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 676 @res = eval { $job->() };
495 warn $@ if $@; 677 error $@ if $@;
496 undef $busy; 678 undef $busy;
497 })->prio (Coro::PRIO_MAX); 679 })->prio (Coro::PRIO_MAX);
498 680
499 while ($busy) { 681 while ($busy) {
500 if (Coro::nready) { 682 if (Coro::nready) {
502 } else { 684 } else {
503 EV::loop EV::LOOP_ONESHOT; 685 EV::loop EV::LOOP_ONESHOT;
504 } 686 }
505 } 687 }
506 688
507 my $time = EV::time - $time; 689 my $time = AE::time - $time;
508 690
509 $TICK_START += $time; # do not account sync jobs to server load 691 $TICK_START += $time; # do not account sync jobs to server load
510 692
511 wantarray ? @res : $res[0] 693 wantarray ? @res : $res[0]
512 } else { 694 } else {
534 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
535 717
536 $coro 718 $coro
537} 719}
538 720
539=item fork_call { }, $args 721=item fork_call { }, @args
540 722
541Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 726never block itself or use any form of event handling.
545 727
546=cut 728=cut
547 729
730sub post_fork {
731 reset_signals;
732}
733
548sub fork_call(&@) { 734sub fork_call(&@) {
549 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
550 736
551 # we seemingly have to make a local copy of the whole thing, 737 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/ 738 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
554 740
555 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
556 reset_signals; 742 cf::post_fork;
557 &$cb 743 &$cb
558 }, @args; 744 } @args;
559 745
560 wantarray ? @res : $res[-1] 746 wantarray ? @res : $res[-1]
747}
748
749sub objinfo {
750 (
751 "counter value" => cf::object::object_count,
752 "objects created" => cf::object::create_count,
753 "objects destroyed" => cf::object::destroy_count,
754 "freelist size" => cf::object::free_count,
755 "allocated objects" => cf::object::objects_size,
756 "active objects" => cf::object::actives_size,
757 )
561} 758}
562 759
563=item $coin = coin_from_name $name 760=item $coin = coin_from_name $name
564 761
565=cut 762=cut
602within each server. 799within each server.
603 800
604=cut 801=cut
605 802
606sub db_table($) { 803sub db_table($) {
804 cf::error "db_get called from main context"
805 if $Coro::current == $Coro::main;
806
607 my ($name) = @_; 807 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 808 my $db = BDB::db_create $DB_ENV;
609 809
610 eval { 810 eval {
611 $db->set_flags (BDB::CHKSUM); 811 $db->set_flags (BDB::CHKSUM);
621} 821}
622 822
623our $DB; 823our $DB;
624 824
625sub db_init { 825sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 826 $DB ||= db_table "db";
628 };
629} 827}
630 828
631sub db_get($$) { 829sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 830 my $key = "$_[0]/$_[1]";
633 831
634 cf::sync_job { 832 cf::error "db_get called from main context"
833 if $Coro::current == $Coro::main;
834
635 BDB::db_get $DB, undef, $key, my $data; 835 BDB::db_get $DB, undef, $key, my $data;
636 836
637 $! ? () 837 $! ? ()
638 : $data 838 : $data
639 }
640} 839}
641 840
642sub db_put($$$) { 841sub db_put($$$) {
643 BDB::dbreq_pri 4; 842 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 843 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
672 871
673 my @data; 872 my @data;
674 my $md5; 873 my $md5;
675 874
676 for (0 .. $#$src) { 875 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
678 or Carp::croak "$src->[$_]: $!";
679 } 877 }
680 878
681 # if processing is expensive, check 879 # if processing is expensive, check
682 # checksum first 880 # checksum first
683 if (1) { 881 if (1) {
700 898
701 my $t1 = Time::HiRes::time; 899 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 900 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 901 my $t2 = Time::HiRes::time;
704 902
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 903 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 904
707 db_put cache => "$id/data", $data; 905 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 906 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 907 db_put cache => "$id/meta", $meta;
710 908
720 918
721=cut 919=cut
722 920
723sub datalog($@) { 921sub datalog($@) {
724 my ($type, %kv) = @_; 922 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 923 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 924}
727 925
728=back 926=back
729 927
730=cut 928=cut
925 1123
926 } elsif (exists $cb_id{$type}) { 1124 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1125 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1126
929 } elsif (ref $type) { 1127 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1128 error "attaching objects not supported, ignoring.\n";
931 1129
932 } else { 1130 } else {
933 shift @arg; 1131 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1132 error "attach argument '$type' not supported, ignoring.\n";
935 } 1133 }
936 } 1134 }
937} 1135}
938 1136
939sub _object_attach { 1137sub _object_attach {
949 _attach $registry, $klass, @attach; 1147 _attach $registry, $klass, @attach;
950 } 1148 }
951 1149
952 $obj->{$name} = \%arg; 1150 $obj->{$name} = \%arg;
953 } else { 1151 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1152 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1153 }
956 1154
957 $obj->{_attachment}{$name} = undef; 1155 $obj->{_attachment}{$name} = undef;
958} 1156}
959 1157
1018 1216
1019 for (@$callbacks) { 1217 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1218 eval { &{$_->[1]} };
1021 1219
1022 if ($@) { 1220 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1221 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1222 override;
1026 } 1223 }
1027 1224
1028 return 1 if $override; 1225 return 1 if $override;
1029 } 1226 }
1108 for (@$attach) { 1305 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1306 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1307 _attach $registry, $klass, @attach;
1111 } 1308 }
1112 } else { 1309 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1310 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1311 }
1115 } 1312 }
1116} 1313}
1117 1314
1118cf::attachable->attach ( 1315cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1342 my ($filename, $rdata, $objs) = @_;
1146 1343
1147 sync_job { 1344 sync_job {
1148 if (length $$rdata) { 1345 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1346 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1347 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1348 $decname, length $$rdata, scalar @$objs
1349 if $VERBOSE_IO;
1152 1350
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1351 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1352 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1353 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1354 if ($cf::USE_FSYNC) {
1355 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;
1356 aio_fsync $fh;
1357 }
1157 aio_close $fh; 1358 aio_close $fh;
1158 1359
1159 if (@$objs) { 1360 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1361 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1362 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1363 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1364 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1365 if ($cf::USE_FSYNC) {
1366 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;
1367 aio_fsync $fh;
1368 }
1165 aio_close $fh; 1369 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1370 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1371 }
1168 } else { 1372 } else {
1169 aio_unlink "$filename.pst"; 1373 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1376 aio_rename "$filename~", $filename;
1173 1377
1174 $filename =~ s%/[^/]+$%%; 1378 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1379 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1380 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1381 error "unable to save objects: $filename~: $!\n";
1178 } 1382 }
1179 } else { 1383 } else {
1180 aio_unlink $filename; 1384 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1385 aio_unlink "$filename.pst";
1182 } 1386 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1410 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1411 $av = $st->{objs};
1208 } 1412 }
1209 1413
1210 utf8::decode (my $decname = $filename); 1414 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1415 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1416 $decname, length $data, scalar @{$av || []}
1417 if $VERBOSE_IO;
1213 1418
1214 ($data, $av) 1419 ($data, $av)
1215} 1420}
1216 1421
1217=head2 COMMAND CALLBACKS 1422=head2 COMMAND CALLBACKS
1276} 1481}
1277 1482
1278use File::Glob (); 1483use File::Glob ();
1279 1484
1280cf::player->attach ( 1485cf::player->attach (
1281 on_command => sub { 1486 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1487 my ($pl, $name, $params) = @_;
1283 1488
1284 my $cb = $COMMAND{$name} 1489 my $cb = $COMMAND{$name}
1285 or return; 1490 or return;
1286 1491
1294 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1295 1500
1296 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1297 1502
1298 if (ref $msg) { 1503 if (ref $msg) {
1299 my ($type, $reply, @payload) = 1504 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 1505
1304 my @reply; 1506 my @reply;
1305 1507
1306 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1307 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
1309 1511
1310 $pl->ext_reply ($reply, @reply) 1512 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1513 if $reply;
1312 1514
1313 } else { 1515 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1516 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1517 }
1316 1518
1317 cf::override; 1519 cf::override;
1318 }, 1520 },
1319); 1521);
1320 1522
1321# "readahead" all extensions 1523# "readahead" all extensions
1322sub cache_extensions { 1524sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1525 my $grp = IO::AIO::aio_group;
1324 1526
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1527 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1528 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1529 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1530 }
1329 }; 1531 };
1330 1532
1331 $grp 1533 $grp
1332} 1534}
1333 1535
1334sub load_extensions { 1536sub load_extensions {
1537 info "loading extensions...";
1538
1335 cf::sync_job { 1539 cf::sync_job {
1336 my %todo; 1540 my %todo;
1337 1541
1338 for my $path (<$LIBDIR/*.ext>) { 1542 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1543 next unless -r $path;
1357 1561
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1564
1361 $ext{source} = 1565 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1364 . $source 1568 . $source
1365 . "\n};\n1"; 1569 . "\n};\n1";
1366 1570
1367 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
1368 } 1572 }
1369 1573
1574 my $pass = 0;
1370 my %done; 1575 my %done;
1371 while (%todo) { 1576 while (%todo) {
1372 my $progress; 1577 my $progress;
1373 1578
1579 ++$pass;
1580
1581 ext:
1374 while (my ($k, $v) = each %todo) { 1582 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1583 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1584 next ext
1377 unless exists $done{$_}; 1585 unless exists $done{$_};
1378 } 1586 }
1379 1587
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1588 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1589
1382 unless (eval $v->{source}) { 1590 my $active = eval $v->{source};
1591
1592 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1593 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1594
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1595 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1596 if exists $v->{meta}{mandatory};
1390 1597
1391 warn $msg; 1598 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1599 delete $todo{$k};
1600 } else {
1601 $done{$k} = delete $todo{$k};
1602 push @EXTS, $v->{pkg};
1603 $progress = 1;
1604
1605 info "$v->{base}: extension inactive.\n"
1606 unless $active;
1392 } 1607 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1608 }
1398 1609
1399 skip: 1610 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1611 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1612
1613 while (my ($k, $v) = each %todo) {
1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1615 if exists $v->{meta}{mandatory};
1616 }
1617
1618 last;
1619 }
1402 } 1620 }
1403 }; 1621 };
1404} 1622}
1405 1623
1406############################################################################# 1624#############################################################################
1490 $cf::PLAYER{$login} = $pl 1708 $cf::PLAYER{$login} = $pl
1491 } 1709 }
1492 } 1710 }
1493} 1711}
1494 1712
1713cf::player->attach (
1714 on_load => sub {
1715 my ($pl, $path) = @_;
1716
1717 # restore slots saved in save, below
1718 my $slots = delete $pl->{_slots};
1719
1720 $pl->ob->current_weapon ($slots->[0]);
1721 $pl->combat_ob ($slots->[1]);
1722 $pl->ranged_ob ($slots->[2]);
1723 },
1724);
1725
1495sub save($) { 1726sub save($) {
1496 my ($pl) = @_; 1727 my ($pl) = @_;
1497 1728
1498 return if $pl->{deny_save}; 1729 return if $pl->{deny_save};
1499 1730
1504 1735
1505 aio_mkdir playerdir $pl, 0770; 1736 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1737 $pl->{last_save} = $cf::RUNTIME;
1507 1738
1508 cf::get_slot 0.01; 1739 cf::get_slot 0.01;
1740
1741 # save slots, to be restored later
1742 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1743
1510 $pl->save_pl ($path); 1744 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1745 cf::cede_to_tick;
1512} 1746}
1513 1747
1547 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1548 1782
1549 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1784 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1785
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553 $pl->deactivate; 1787 $pl->deactivate;
1788
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1557 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1558 1794
1559 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1561 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
1615 \@logins 1851 \@logins
1616} 1852}
1617 1853
1618=item $player->maps 1854=item $player->maps
1619 1855
1856=item cf::player::maps $login
1857
1620Returns an arrayref of map paths that are private for this 1858Returns an arrayref of map paths that are private for this
1621player. May block. 1859player. May block.
1622 1860
1623=cut 1861=cut
1624 1862
1686=cut 1924=cut
1687 1925
1688sub find_by_path($) { 1926sub find_by_path($) {
1689 my ($path) = @_; 1927 my ($path) = @_;
1690 1928
1929 $path =~ s/^~[^\/]*//; # skip ~login
1930
1691 my ($match, $specificity); 1931 my ($match, $specificity);
1692 1932
1693 for my $region (list) { 1933 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1934 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1935 ($match, $specificity) = ($region, $region->specificity)
1723sub generate_random_map { 1963sub generate_random_map {
1724 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1725 1965
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1967
1728 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1968 $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} 1969}
1743 1970
1744=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1745 1972
1746Register a handler for the map path matching the given regex at the 1973Register a handler for the map path matching the given regex at the
1751 1978
1752sub register { 1979sub register {
1753 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1981 my $pkg = caller;
1755 1982
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1984
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1986}
1761 1987
1762# also paths starting with '/' 1988# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1989$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1990
1765sub thawer_merge { 1991sub thawer_merge {
1766 my ($self, $merge) = @_; 1992 my ($self, $merge) = @_;
1767 1993
1768 # we have to keep some variables in memory intact 1994 # we have to keep some variables in memory intact
1773} 1999}
1774 2000
1775sub normalise { 2001sub normalise {
1776 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1777 2003
1778 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1779 2005
1780 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1781 2007
1782 # map plan: 2008 # map plan:
1783 # 2009 #
1798 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 2025 $path = "$base/$path";
1800 } 2026 }
1801 2027
1802 for ($path) { 2028 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1806 } 2031 }
1807 2032
1808 $path 2033 $path
1822 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1823 return $self; 2048 return $self;
1824 } 2049 }
1825 } 2050 }
1826 2051
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 2053 ()
1829} 2054}
1830 2055
2056# may re-bless or do other evil things
1831sub init { 2057sub init {
1832 my ($self) = @_; 2058 my ($self) = @_;
1833 2059
1834 $self 2060 $self
1835} 2061}
1900 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1901 2127
1902 1 2128 1
1903} 2129}
1904 2130
2131# used to laod the header of an original map
1905sub load_header_orig { 2132sub load_header_orig {
1906 my ($self) = @_; 2133 my ($self) = @_;
1907 2134
1908 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
1909} 2136}
1910 2137
2138# used to laod the header of an instantiated map
1911sub load_header_temp { 2139sub load_header_temp {
1912 my ($self) = @_; 2140 my ($self) = @_;
1913 2141
1914 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
1915} 2143}
1916 2144
2145# called after loading the header from an instantiated map
1917sub prepare_temp { 2146sub prepare_temp {
1918 my ($self) = @_; 2147 my ($self) = @_;
1919 2148
1920 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
1921 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
1922 # safety 2151 # safety
1923 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
1924 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
1925} 2154}
1926 2155
2156# called after loading the header from an original map
1927sub prepare_orig { 2157sub prepare_orig {
1928 my ($self) = @_; 2158 my ($self) = @_;
1929 2159
1930 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
1931 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
1955 2185
1956sub find; 2186sub find;
1957sub find { 2187sub find {
1958 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
1959 2189
2190 cf::cede_to_tick;
2191
1960 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
1961 2193
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
1964 2196
1965 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
1982 2214
1983 $cf::MAP{$path} = $map 2215 $cf::MAP{$path} = $map
1984 } 2216 }
1985} 2217}
1986 2218
1987sub pre_load { } 2219sub pre_load { }
1988sub post_load { } 2220#sub post_load { } # XS
1989 2221
1990sub load { 2222sub load {
1991 my ($self) = @_; 2223 my ($self) = @_;
1992 2224
1993 local $self->{deny_reset} = 1; # loading can take a long time 2225 local $self->{deny_reset} = 1; # loading can take a long time
1996 2228
1997 { 2229 {
1998 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
1999 2231
2000 return unless $self->valid; 2232 return unless $self->valid;
2001 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2002
2003 $self->in_memory (cf::MAP_LOADING);
2004 2234
2005 $self->alloc; 2235 $self->alloc;
2006 2236
2007 $self->pre_load; 2237 $self->pre_load;
2008 cf::cede_to_tick; 2238 cf::cede_to_tick;
2009 2239
2240 if (exists $self->{load_path}) {
2010 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2011 $f->skip_block; 2242 $f->skip_block;
2012 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2013 or return; 2244 or return;
2014 2245
2015 $self->post_load_original 2246 $self->post_load_original
2016 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2017 2248
2018 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2019 utf8::encode $uniq; 2250 utf8::encode $uniq;
2020 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2021 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2022 $self->clear_unique_items; 2253 $self->clear_unique_items;
2023 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2024 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2025 } 2257 }
2026 } 2258 }
2027 }
2028 2259
2029 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2030 2267
2031 cf::cede_to_tick; 2268 cf::cede_to_tick;
2032 # now do the right thing for maps 2269 # now do the right thing for maps
2033 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2034 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
2038 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2039 $self->decay_objects; 2276 $self->decay_objects;
2040 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2041 $self->update_buttons; 2278 $self->update_buttons;
2042 cf::cede_to_tick; 2279 cf::cede_to_tick;
2043 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2044 } 2281 }
2045 2282
2046 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2047 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2048
2049 $self->in_memory (cf::MAP_ACTIVE);
2050 } 2285 }
2051 2286
2052 $self->post_load; 2287 $self->post_load;
2053}
2054 2288
2289 1
2290}
2291
2292# customize the map for a given player, i.e.
2293# return the _real_ map. used by e.g. per-player
2294# maps to change the path to ~playername/mappath
2055sub customise_for { 2295sub customise_for {
2056 my ($self, $ob) = @_; 2296 my ($self, $ob) = @_;
2057 2297
2058 return find "~" . $ob->name . "/" . $self->{path} 2298 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2299 if $self->per_player;
2062# if $self->per_party; 2302# if $self->per_party;
2063 2303
2064 $self 2304 $self
2065} 2305}
2066 2306
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 { 2307sub find_sync {
2094 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2095 2309
2096 cf::sync_job { find $path, $origin } 2310 # it's a bug to call this from the main context
2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2312 if $Coro::current == $Coro::main;
2313
2314 find $path, $origin
2097} 2315}
2098 2316
2099sub do_load_sync { 2317sub do_load_sync {
2100 my ($map) = @_; 2318 my ($map) = @_;
2101 2319
2320 # it's a bug to call this from the main context
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2104 2323
2105 cf::sync_job { $map->load }; 2324 $map->load;
2106} 2325}
2107 2326
2108our %MAP_PREFETCH; 2327our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2110 2329
2111sub find_async { 2330sub find_async {
2112 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2113 2332
2114 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2115 2334
2116 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2118 } 2337 }
2119 2338
2120 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2121 2340
2122 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
2136 $MAP_PREFETCHER->prio (6); 2355 $MAP_PREFETCHER->prio (6);
2137 2356
2138 () 2357 ()
2139} 2358}
2140 2359
2360# common code, used by both ->save and ->swapout
2141sub save { 2361sub _save {
2142 my ($self) = @_; 2362 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2363
2146 $self->{last_save} = $cf::RUNTIME; 2364 $self->{last_save} = $cf::RUNTIME;
2147 2365
2148 return unless $self->dirty; 2366 return unless $self->dirty;
2149 2367
2169 } else { 2387 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2388 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2389 }
2172} 2390}
2173 2391
2392sub save {
2393 my ($self) = @_;
2394
2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2396
2397 $self->_save;
2398}
2399
2174sub swap_out { 2400sub swap_out {
2175 my ($self) = @_; 2401 my ($self) = @_;
2176 2402
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2404
2405 return if !$self->linkable;
2406 return if $self->{deny_save};
2182 return if $self->players; 2407 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2408
2409 # first deactivate the map and "unlink" it from the core
2410 $self->deactivate;
2411 $_->clear_links_to ($self) for values %cf::MAP;
2412 $self->state (cf::MAP_SWAPPED);
2413
2414 # then atomically save
2415 $self->_save;
2416
2417 # then free the map
2418 $self->clear;
2419}
2420
2421sub reset_at {
2422 my ($self) = @_;
2423
2424 # TODO: safety, remove and allow resettable per-player maps
2184 return if $self->{deny_save}; 2425 return 1e99 if $self->{deny_reset};
2185 2426
2427 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2428 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2429
2430 $time + $to
2431}
2432
2433sub should_reset {
2434 my ($self) = @_;
2435
2436 $self->reset_at <= $cf::RUNTIME
2437}
2438
2439sub reset {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 return if $self->players;
2445
2446 cf::trace "resetting map ", $self->path, "\n";
2447
2186 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2449
2450 # need to save uniques path
2451 unless ($self->{deny_save}) {
2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2453
2454 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2455 if $uniq;
2456 }
2457
2458 delete $cf::MAP{$self->path};
2187 2459
2188 $self->deactivate; 2460 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2461 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2462 $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 2463
2236 $self->unlink_save; 2464 $self->unlink_save;
2237 $self->destroy; 2465 $self->destroy;
2238} 2466}
2239 2467
2247 2475
2248 delete $cf::MAP{$self->path}; 2476 delete $cf::MAP{$self->path};
2249 2477
2250 $self->unlink_save; 2478 $self->unlink_save;
2251 2479
2252 bless $self, "cf::map"; 2480 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2481 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2482 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2483 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2484 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2485
2314 : normalise $_ 2542 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2543 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2544 ]
2317} 2545}
2318 2546
2547=item cf::map::static_maps
2548
2549Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2550file in the shared directory excluding F</styles> and F</editor>). May
2551block.
2552
2553=cut
2554
2555sub static_maps() {
2556 my @dirs = "";
2557 my @maps;
2558
2559 while (@dirs) {
2560 my $dir = shift @dirs;
2561
2562 next if $dir eq "/styles" || $dir eq "/editor";
2563
2564 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2565 or return;
2566
2567 for (@$files) {
2568 s/\.map$// or next;
2569 utf8::decode $_;
2570 push @maps, "$dir/$_";
2571 }
2572
2573 push @dirs, map "$dir/$_", @$dirs;
2574 }
2575
2576 \@maps
2577}
2578
2319=back 2579=back
2320 2580
2321=head3 cf::object 2581=head3 cf::object
2322 2582
2323=cut 2583=cut
2455 2715
2456Freezes the player and moves him/her to a special map (C<{link}>). 2716Freezes the player and moves him/her to a special map (C<{link}>).
2457 2717
2458The player should be reasonably safe there for short amounts of time (e.g. 2718The 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, 2719for 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 2720though, as the player cannot control the character while it is on the link
2461map. 2721map.
2462 2722
2463Will never block. 2723Will never block.
2464 2724
2465=item $player_object->leave_link ($map, $x, $y) 2725=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2746sub cf::object::player::enter_link {
2487 my ($self) = @_; 2747 my ($self) = @_;
2488 2748
2489 $self->deactivate_recursive; 2749 $self->deactivate_recursive;
2490 2750
2751 ++$self->{_link_recursion};
2752
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2753 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2754
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2755 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2756 if $self->map && $self->map->{path} ne "{link}";
2495 2757
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2758 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2759}
2498 2760
2499sub cf::object::player::leave_link { 2761sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2762 my ($self, $map, $x, $y) = @_;
2501 2763
2518 ($x, $y) = (-1, -1) 2780 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2781 unless (defined $x) && (defined $y);
2520 2782
2521 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2524 2786
2525 $map->load; 2787 $map->load;
2526 $map->load_neighbours;
2527 2788
2528 return unless $self->contr->active; 2789 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2790
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2792 if ($self->enter_map ($map, $x, $y)) {
2534} 2793 # entering was successful
2794 delete $self->{_link_recursion};
2795 # only activate afterwards, to support waiting in hooks
2796 $self->activate_recursive;
2797 }
2535 2798
2799}
2800
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2801=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2802
2538Moves the player to the given map-path and coordinates by first freezing 2803Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2804her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2805that 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 2806the new (success) or old (failed) map position. In either case, $done will
2548 2813
2549our $GOTOGEN; 2814our $GOTOGEN;
2550 2815
2551sub cf::object::player::goto { 2816sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2817 my ($self, $path, $x, $y, $check, $done) = @_;
2818
2819 if ($self->{_link_recursion} >= $MAX_LINKS) {
2820 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2821 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2822 ($path, $x, $y) = @$EMERGENCY_POSITION;
2823 }
2553 2824
2554 # do generation counting so two concurrent goto's will be executed in-order 2825 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2826 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2827
2557 $self->enter_link; 2828 $self->enter_link;
2577 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2578 } 2849 }
2579 } 2850 }
2580 2851
2581 my $map = eval { 2852 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2583 2854
2584 if ($map) { 2855 if ($map) {
2585 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2858 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2859 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2860 }
2590 2861
2591 $map 2862 $map
2599 if ($gen == $self->{_goto_generation}) { 2870 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2871 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2872 $self->leave_link ($map, $x, $y);
2602 } 2873 }
2603 2874
2604 $done->() if $done; 2875 $done->($self) if $done;
2605 })->prio (1); 2876 })->prio (1);
2606} 2877}
2607 2878
2608=item $player_object->enter_exit ($exit_object) 2879=item $player_object->enter_exit ($exit_object)
2609 2880
2677 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2678 2949
2679 unless (eval { 2950 unless (eval {
2680 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2681 2952
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; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2691 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2693 2979
2694 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2695 2981
2696 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
2702 $self->message ("Something went wrong deep within the deliantra server. " 2988 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2989 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2990 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2991 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2992
2707 warn "ERROR in enter_exit: $@"; 2993 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2994 $self->leave_link;
2709 } 2995 }
2710 })->prio (1); 2996 })->prio (1);
2711} 2997}
2712 2998
2724sub cf::client::send_drawinfo { 3010sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 3011 my ($self, $text, $flags) = @_;
2726 3012
2727 utf8::encode $text; 3013 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3014 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3015}
3016
3017=item $client->send_big_packet ($pkt)
3018
3019Like C<send_packet>, but tries to compress large packets, and fragments
3020them as required.
3021
3022=cut
3023
3024our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3025
3026sub cf::client::send_big_packet {
3027 my ($self, $pkt) = @_;
3028
3029 # try lzf for large packets
3030 $pkt = "lzf " . Compress::LZF::compress $pkt
3031 if 1024 <= length $pkt and $self->{can_lzf};
3032
3033 # split very large packets
3034 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3035 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3036 $pkt = "frag";
3037 }
3038
3039 $self->send_packet ($pkt);
2729} 3040}
2730 3041
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 3042=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 3043
2733Send a drawinfo or msg packet to the client, formatting the msg for the 3044Send a drawinfo or msg packet to the client, formatting the msg for the
2737 3048
2738=cut 3049=cut
2739 3050
2740# non-persistent channels (usually the info channel) 3051# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 3052our %CHANNEL = (
3053 "c/motd" => {
3054 id => "infobox",
3055 title => "MOTD",
3056 reply => undef,
3057 tooltip => "The message of the day",
3058 },
2742 "c/identify" => { 3059 "c/identify" => {
2743 id => "infobox", 3060 id => "infobox",
2744 title => "Identify", 3061 title => "Identify",
2745 reply => undef, 3062 reply => undef,
2746 tooltip => "Items recently identified", 3063 tooltip => "Items recently identified",
2748 "c/examine" => { 3065 "c/examine" => {
2749 id => "infobox", 3066 id => "infobox",
2750 title => "Examine", 3067 title => "Examine",
2751 reply => undef, 3068 reply => undef,
2752 tooltip => "Signs and other items you examined", 3069 tooltip => "Signs and other items you examined",
3070 },
3071 "c/shopinfo" => {
3072 id => "infobox",
3073 title => "Shop Info",
3074 reply => undef,
3075 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 3076 },
2754 "c/book" => { 3077 "c/book" => {
2755 id => "infobox", 3078 id => "infobox",
2756 title => "Book", 3079 title => "Book",
2757 reply => undef, 3080 reply => undef,
2873 my $pkt = "msg " 3196 my $pkt = "msg "
2874 . $self->{json_coder}->encode ( 3197 . $self->{json_coder}->encode (
2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3198 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2876 ); 3199 );
2877 3200
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); 3201 $self->send_big_packet ($pkt);
2889} 3202}
2890 3203
2891=item $client->ext_msg ($type, @msg) 3204=item $client->ext_msg ($type, @msg)
2892 3205
2893Sends an ext event to the client. 3206Sends an ext event to the client.
2896 3209
2897sub cf::client::ext_msg($$@) { 3210sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3211 my ($self, $type, @msg) = @_;
2899 3212
2900 if ($self->extcmd == 2) { 3213 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3214 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3215 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3216 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3217 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3218 }
2906} 3219}
2907 3220
2908=item $client->ext_reply ($msgid, @msg) 3221=item $client->ext_reply ($msgid, @msg)
2909 3222
2912=cut 3225=cut
2913 3226
2914sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
2916 3229
2917 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $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} 3233}
2925 3234
2926=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2927 3236
2928Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
2983 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
2984 3293
2985 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2986 3295
2987 if (ref $msg) { 3296 if (ref $msg) {
2988 my ($type, $reply, @payload) = 3297 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 3298
2993 my @reply; 3299 my @reply;
2994 3300
2995 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
2996 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
2998 3304
2999 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3306 if $reply;
3001 3307
3002 } else { 3308 } else {
3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3004 } 3310 }
3005 3311
3006 cf::override; 3312 cf::override;
3007 }, 3313 },
3008); 3314);
3028 3334
3029 $coro 3335 $coro
3030} 3336}
3031 3337
3032cf::client->attach ( 3338cf::client->attach (
3033 on_destroy => sub { 3339 on_client_destroy => sub {
3034 my ($ns) = @_; 3340 my ($ns) = @_;
3035 3341
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3343 },
3038); 3344);
3054our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3055 3361
3056$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3057 3363
3058$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3061 sort time 3367 sort time
3062)); 3368));
3063 3369
3064# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3089 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3090 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3091 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3092 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3093) { 3399) {
3094 no strict 'refs';
3095 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3097 for @funs; 3402 for @funs;
3098} 3403}
3099 3404
3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3117 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3118 3423
3119 %vars = (_dummy => 0) unless %vars; 3424 %vars = (_dummy => 0) unless %vars;
3120 3425
3426 my @res;
3121 local $_; 3427 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3428
3124 my $eval = 3429 my $eval =
3125 "do {\n" 3430 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3433 . $code
3129 . "\n}" 3434 . "\n}"
3130 ; 3435 ;
3131 3436
3437 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3441 sub_generation_inc;
3442 } else {
3443 local @cf::_safe_eval_args = values %vars;
3444 @res = wantarray ? eval eval : scalar eval $eval;
3445 }
3135 3446
3136 if ($@) { 3447 if ($@) {
3137 warn "$@"; 3448 warn "$@",
3138 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3140 } 3451 }
3141 3452
3142 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3143} 3454}
3144 3455
3158=cut 3469=cut
3159 3470
3160sub register_script_function { 3471sub register_script_function {
3161 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3162 3473
3163 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3165} 3476}
3166 3477
3167=back 3478=back
3168 3479
3169=cut 3480=cut
3178 # for this (global event?) 3489 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3180 3491
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182 3493
3183 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3184 3495
3185 my $facedata; 3496 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 3497
3191 $facedata->{version} == 2 3498 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3500
3194 # patch in the exptable 3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3504 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3507 };
3199 cf::cede_to_tick; 3508 cf::cede_to_tick;
3200 3509
3201 { 3510 {
3202 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3515
3207 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3211 3521
3212 cf::cede_to_tick; 3522 cf::cede_to_tick;
3213 } 3523 }
3214 3524
3215 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3220 3530
3221 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3224 } else { 3534 } else {
3225 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3226 } 3536 }
3227 3537
3228 cf::cede_to_tick; 3538 cf::cede_to_tick;
3229 } 3539 }
3230 } 3540 }
3239 3549
3240 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3241 } 3551 }
3242 3552
3243 { 3553 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3247 3555
3248 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # 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; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3560
3253 if ($info->{type} & 1) { 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
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}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3268 } else { 3564 } else {
3269 $RESOURCE{$name} = $info; 3565# $RESOURCE{$name} = $info; # unused
3270 } 3566 }
3271 3567
3272 cf::cede_to_tick; 3568 cf::cede_to_tick;
3273 } 3569 }
3274 } 3570 }
3275 3571
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3572 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277 3573
3278 1 3574 1
3279} 3575}
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 3576
3301register_exticmd fx_want => sub { 3577register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_; 3578 my ($ns, $want) = @_;
3303 3579
3304 while (my ($k, $v) = each %$want) { 3580 while (my ($k, $v) = each %$want) {
3343sub reload_treasures { 3619sub reload_treasures {
3344 load_resource_file "$DATADIR/treasures" 3620 load_resource_file "$DATADIR/treasures"
3345 or die "unable to load treasurelists\n"; 3621 or die "unable to load treasurelists\n";
3346} 3622}
3347 3623
3624sub reload_sound {
3625 trace "loading sound config from $DATADIR/sound\n";
3626
3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3628
3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3630 my $sound = $soundconf->{compat}[$_]
3631 or next;
3632
3633 my $face = cf::face::find "sound/$sound->[1]";
3634 cf::sound::set $sound->[0] => $face;
3635 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3636 }
3637
3638 while (my ($k, $v) = each %{$soundconf->{event}}) {
3639 my $face = cf::face::find "sound/$v";
3640 cf::sound::set $k => $face;
3641 }
3642}
3643
3348sub reload_resources { 3644sub reload_resources {
3349 warn "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
3350 3646
3647 reload_exp_table;
3648 reload_materials;
3351 reload_facedata; 3649 reload_facedata;
3650 reload_sound;
3352 reload_archetypes; 3651 reload_archetypes;
3353 reload_regions; 3652 reload_regions;
3354 reload_treasures; 3653 reload_treasures;
3355 3654
3356 warn "finished reloading resource files\n"; 3655 trace "finished reloading resource files\n";
3357} 3656}
3358 3657
3359sub reload_config { 3658sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3659 trace "reloading config file...\n";
3361 or return;
3362 3660
3363 local $/; 3661 my $config = load_file "$CONFDIR/config";
3364 *CFG = YAML::Load <$fh>; 3662 utf8::decode $config;
3663 *CFG = decode_yaml $config;
3365 3664
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3367 3666
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $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}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 3669
3371 if (exists $CFG{mlockall}) { 3670 if (exists $CFG{mlockall}) {
3394 3693
3395 seek $fh, 0, 0; 3694 seek $fh, 0, 0;
3396 print $fh $$; 3695 print $fh $$;
3397} 3696}
3398 3697
3698sub main_loop {
3699 trace "EV::loop starting\n";
3700 if (1) {
3701 EV::loop;
3702 }
3703 trace "EV::loop returned\n";
3704 goto &main_loop unless $REALLY_UNLOOP;
3705}
3706
3399sub main { 3707sub main {
3400 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3401 3709
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411 3714
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 3716
3414 # we must not ever block the main coroutine 3717 # we must not ever block the main coroutine
3415 local $Coro::idle = sub { 3718 local $Coro::idle = sub {
3421 }; 3724 };
3422 3725
3423 evthread_start IO::AIO::poll_fileno; 3726 evthread_start IO::AIO::poll_fileno;
3424 3727
3425 cf::sync_job { 3728 cf::sync_job {
3729 cf::incloader::init ();
3730
3731 cf::init_anim;
3732 cf::init_attackmess;
3733 cf::init_dynamic;
3734
3735 cf::load_settings;
3736
3426 reload_resources; 3737 reload_resources;
3427 reload_config; 3738 reload_config;
3428 db_init; 3739 db_init;
3429 3740
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid; 3741 cf::init_uuid;
3433 cf::init_signals; 3742 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills; 3743 cf::init_skills;
3436 3744
3437 cf::init_beforeplay; 3745 cf::init_beforeplay;
3438 3746
3439 atomic; 3747 atomic;
3441 load_extensions; 3749 load_extensions;
3442 3750
3443 utime time, time, $RUNTIMEFILE; 3751 utime time, time, $RUNTIMEFILE;
3444 3752
3445 # no (long-running) fork's whatsoever before this point(!) 3753 # no (long-running) fork's whatsoever before this point(!)
3754 use POSIX ();
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3755 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447 3756
3448 (pop @POST_INIT)->(0) while @POST_INIT; 3757 cf::_post_init 0;
3449 }; 3758 };
3450 3759
3451 EV::loop; 3760 cf::object::thawer::errors_are_fatal 0;
3761 info "parse errors in files are no longer fatal from this point on.\n";
3762
3763 AE::postpone {
3764 undef &main; # free gobs of memory :)
3765 };
3766
3767 goto &main_loop;
3452} 3768}
3453 3769
3454############################################################################# 3770#############################################################################
3455# initialisation and cleanup 3771# initialisation and cleanup
3456 3772
3457# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
3458BEGIN { 3774BEGIN {
3459 our %SIGWATCHER = (); 3775 our %SIGWATCHER = ();
3460 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
3461 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3462 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
3463 }; 3779 };
3464 } 3780 }
3465} 3781}
3466 3782
3467sub write_runtime_sync { 3783sub write_runtime_sync {
3784 my $t0 = AE::time;
3785
3468 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
3470 3788
3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3790
3473 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
3474 3792
3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3794 or return;
3477 3795
3478 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
3493 or return; 3811 or return;
3494 3812
3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3814 and return;
3497 3815
3498 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3817
3500 1 3818 1
3501} 3819}
3502 3820
3503our $uuid_lock; 3821our $uuid_lock;
3515 or return; 3833 or return;
3516 3834
3517 my $value = uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3518 3836
3519 unless ($value) { 3837 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n"; 3838 info "cowardly refusing to write zero uuid value!\n";
3521 return; 3839 return;
3522 } 3840 }
3523 3841
3524 my $value = uuid_str $value + $uuid_skip; 3842 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0; 3843 $uuid_skip = 0;
3535 or return; 3853 or return;
3536 3854
3537 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3538 and return; 3856 and return;
3539 3857
3540 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3541 3859
3542 1 3860 1
3543 3861
3544} 3862}
3545 3863
3551} 3869}
3552 3870
3553sub emergency_save() { 3871sub emergency_save() {
3554 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3555 3873
3556 warn "emergency_perl_save: enter\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3557 3880
3558 cf::sync_job { 3881 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so 3882 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 3883
3564 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3565 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3566 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3567 warn "emergency_perl_save: begin player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3568 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3569 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3570 $pl->valid or next; 3890 $pl->valid or next;
3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3572 $pl->save; 3892 $pl->save;
3573 } 3893 }
3574 warn "emergency_perl_save: end player save\n"; 3894 info "emergency_perl_save: end player save\n";
3575 3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3576 warn "emergency_perl_save: begin map save\n"; 3898 info "emergency_perl_save: begin map save\n";
3577 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3578 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3579 $map->valid or next; 3901 $map->valid or next;
3580 $map->save; 3902 $map->save;
3581 } 3903 }
3582 warn "emergency_perl_save: end map save\n"; 3904 info "emergency_perl_save: end map save\n";
3583 3905
3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3584 warn "emergency_perl_save: begin database checkpoint\n"; 3908 info "emergency_perl_save: begin database checkpoint\n";
3585 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3586 warn "emergency_perl_save: end database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3587 3911
3588 warn "emergency_perl_save: begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1; 3913 write_uuid_sync 1;
3590 warn "emergency_perl_save: end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3591 }; 3934 };
3592 3935
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"; 3936 info "emergency_perl_save: leave\n";
3599} 3937}
3600 3938
3601sub post_cleanup { 3939sub post_cleanup {
3602 my ($make_core) = @_; 3940 my ($make_core) = @_;
3603 3941
3942 IO::AIO::flush;
3943
3604 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3605 if $make_core; 3945 if $make_core;
3606 3946
3607 my $fh = pidfile; 3947 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$; 3948 unlink $PIDFILE if <$fh> == $$;
3609} 3949}
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3969 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) { 3970 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"}; 3971 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3972# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 } 3973 }
3634 warn "cleared package $pkg\n";#d#
3635} 3974}
3636 3975
3637sub do_reload_perl() { 3976sub do_reload_perl() {
3638 # can/must only be called in main 3977 # can/must only be called in main
3639 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3640 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3641 return; 3980 return;
3642 } 3981 }
3643 3982
3644 return if $RELOAD++; 3983 return if $RELOAD++;
3645 3984
3646 my $t1 = EV::time; 3985 my $t1 = AE::time;
3647 3986
3648 while ($RELOAD) { 3987 while ($RELOAD) {
3649 warn "reloading..."; 3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3650 3990
3651 warn "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3652 3992
3653 cf::sync_job { 3993 cf::sync_job {
3654 cf::write_runtime_sync; # external watchdog should not bark
3655 cf::emergency_save; 3994 #cf::emergency_save;
3656 cf::write_runtime_sync; # external watchdog should not bark
3657 3995
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"; 3996 trace "perl_reload: cancelling all extension coros";
3669 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3670 %EXT_CORO = (); 3998 %EXT_CORO = ();
3671 3999
3672 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3673 %COMMAND = (); 4001 %COMMAND = ();
3674 4002
3675 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3676 %EXTCMD = (); 4004 %EXTCMD = ();
3677 %EXTICMD = (); 4005 %EXTICMD = ();
3678 4006
3679 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3680 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3681 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3682 4010
3683 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3684 eval { 4012 eval {
3685 $cb->($pkg); 4013 $cb->($pkg);
3686 1 4014 1
3687 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
3688 } 4016 }
3689 4017
3690 warn "... clearing $pkg"; 4018 trace "... clearing $pkg";
3691 clear_package $pkg; 4019 clear_package $pkg;
3692 } 4020 }
3693 4021
3694 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697 4025
3698 warn "... unloading $k"; 4026 trace "... unloading $k";
3699 delete $INC{$k}; 4027 delete $INC{$k};
3700 4028
3701 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3703 4031
3706 } 4034 }
3707 4035
3708 clear_package $k; 4036 clear_package $k;
3709 } 4037 }
3710 4038
3711 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3712 clear_package "safe::$_" 4040 clear_package "safe::$_"
3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3714 4042
3715 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3716 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3718 4046
3719 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3720 # and global variables created in xs 4048 # and global variables created in xs
3721 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3722 4050
3723 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3724 4052
3725 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3726 require cf; 4054 require cf;
3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4055 cf::_connect_to_perl_1;
3728 4056
3729 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3730 cf::reload_config; 4058 cf::reload_config;
3731 4059
3732 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3733 cf::load_extensions; 4061 cf::load_extensions;
3734 4062
3735 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3736 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3737 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3738 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3739 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3740 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3741 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3742 } 4070 }
3743 4071
3744 warn "running post_init jobs"; 4072 cf::_post_init 1;
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746 4073
3747 warn "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3748 4075
3749 1 4076 1
3750 } or do { 4077 } or do {
3751 warn $@; 4078 error $@;
3752 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3753 }; 4080 };
3754 4081
3755 warn "reloaded";
3756 --$RELOAD; 4082 --$RELOAD;
3757 } 4083 }
3758 4084
3759 $t1 = EV::time - $t1; 4085 $t1 = AE::time - $t1;
3760 warn "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3761}; 4087};
3762 4088
3763our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3764 4090
3765sub reload_perl() { 4091sub reload_perl() {
3767 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3768 4094
3769 $RELOAD_WATCHER ||= cf::async { 4095 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions; 4096 Coro::AIO::aio_wait cache_extensions;
3771 4097
3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3773 do_reload_perl; 4099 do_reload_perl;
3774 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
3775 }; 4101 };
3776 }; 4102 };
3777} 4103}
3786 reload_perl; 4112 reload_perl;
3787 }; 4113 };
3788 } 4114 }
3789}; 4115};
3790 4116
3791unshift @INC, $LIBDIR; 4117#############################################################################
3792 4118
3793my $bug_warning = 0; 4119my $bug_warning = 0;
3794 4120
3795our @WAIT_FOR_TICK;
3796our @WAIT_FOR_TICK_BEGIN;
3797
3798sub wait_for_tick { 4121sub wait_for_tick() {
3799 return if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3800 4123
3801 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3802 push @WAIT_FOR_TICK, $signal;
3803 $signal->wait;
3804} 4125}
3805 4126
3806sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3807 return if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3808 4129
3809 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3810 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3811 $signal->wait; 4132 $signal->wait;
3812} 4133}
3816 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3817 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3818 return; 4139 return;
3819 } 4140 }
3820 4141
3821 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4143
4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3822 4145
3823 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3825 Coro::async_pool { 4148 Coro::async_pool {
3826 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3827 write_runtime_sync 4150 write_runtime_sync
3828 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3829 }; 4152 };
3830 } 4153 }
3831 4154
3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3833 $sig->send; 4156 $sig->send;
3834 } 4157 }
3835 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3836 $sig->send;
3837 }
3838 4159
3839 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3840 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3841 4162
3842 if (0) { 4163 if (0) {
3843 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
3844 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
3847 } 4168 }
3848 } 4169 }
3849} 4170}
3850 4171
3851{ 4172{
3852 # configure BDB 4173 # configure BDB
3853 4174
3854 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3855 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3856 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
3857 4178
3858 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3859 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3860 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3861 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3896 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3897 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3898 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
3899} 4220}
3900 4221
3901my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3902 4224
3903sub _log_backtrace { 4225sub _log_backtrace {
3904 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3905 4227
3906 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3907 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3908 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3909 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3910 ++$_log_backtrace; 4236 ++$_log_backtrace;
3911 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
3912 async { 4238 async {
3913 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
3914 4240
3934 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
3935 --$_log_backtrace; 4261 --$_log_backtrace;
3936 }; 4262 };
3937 } else { 4263 } else {
3938 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
3939 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3940 } 4266 }
3941} 4267}
3942 4268
3943# load additional modules 4269# load additional modules
3944require "cf/$_.pm" for @EXTRA_MODULES; 4270require "cf/$_.pm" for @EXTRA_MODULES;
4271cf::_connect_to_perl_2;
3945 4272
3946END { cf::emergency_save } 4273END { cf::emergency_save }
3947 4274
39481 42751
3949 4276

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines