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.464 by root, Thu Jan 1 18:35: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 "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 off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
111 125
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
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
117our %CFG; 133our %CFG;
118 134
119our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
121our $NOW; 138our $NOW;
122 139
123our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
124our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
125our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
132our $JITTER; # average jitter 149our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
134 151
135our @POST_INIT; 152our @POST_INIT;
136 153
137our $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;
138 159
139binmode STDOUT; 160binmode STDOUT;
140binmode STDERR; 161binmode STDERR;
141 162
142# read virtual server time, if available 163# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 165 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
147} 168}
148 169
170eval "sub TICK() { $TICK } 1" or die;
171
149mkdir $_ 172mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 174
152our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
153 176
154sub cf::map::normalise; 177sub cf::map::normalise;
155 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
156############################################################################# 183#############################################################################
157 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
158=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
159 197
160=over 4 198=over 4
161 199
162=item $cf::UPTIME 200=item $cf::UPTIME
163 201
164The 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.
165 218
166=item $cf::RUNTIME 219=item $cf::RUNTIME
167 220
168The 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
169every server tick. 222every server tick.
175Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
176directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
177unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
178database environment. 231database environment.
179 232
180=item $cf::NOW
181
182The time of the last (current) server tick.
183
184=item $cf::TICK
185
186The interval between server ticks, in seconds.
187
188=item $cf::LOADAVG 233=item $cf::LOADAVG
189 234
190The 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
191(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
192objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
201from wherever your confdir points to. 246from wherever your confdir points to.
202 247
203=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
204 249
205These 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
206returns 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
207per 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.
208 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
209=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
210 272
211This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
212C<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
213that call. 275that call.
214 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
215=back 283=back
216 284
217=cut 285=cut
218 286
219BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
220 *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 {
221 my $msg = join "", @_; 294 my $msg = join "", @_;
222 295
223 $msg .= "\n" 296 $msg .= "\n"
224 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
225 298
226 $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;
227 300
228 LOG llevError, $msg; 301 LOG llevWarn, $msg;
229 }; 302};
230}
231 303
232$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
234 306
235 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 311 return;#d#
238 }#d# 312 }#d#
239 313
240 # kill coroutine otherwise 314 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 315 Coro::terminate
243}; 316};
244
245$SIG{__DIE__} = sub { }; #d#?
246 317
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 335)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 337}
267 338
268$EV::DIED = sub { 339$EV::DIED = sub {
269 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
270}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
271 347
272############################################################################# 348#############################################################################
273 349
274=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
275 351
296 $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;
297 $d 373 $d
298 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
299} 375}
300 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
301=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
302 430
303Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
304 432
305=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
311our $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
312 440
313sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
315 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
316=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
317 476
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 478but I<before> the server starts ticking again.
320 479
321The cdoeblock will have a single boolean argument to indicate whether this 480The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 481is a reload or not.
323 482
324=cut 483=cut
325 484
326sub post_init(&) { 485sub post_init(&) {
327 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 }
328} 504}
329 505
330=item cf::lock_wait $string 506=item cf::lock_wait $string
331 507
332Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
371} 547}
372 548
373=item cf::periodic $interval, $cb 549=item cf::periodic $interval, $cb
374 550
375Like 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
376get spread over timer. 552get spread over time.
377 553
378=cut 554=cut
379 555
380sub periodic($$) { 556sub periodic($$) {
381 my ($interval, $cb) = @_; 557 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
386} 562}
387 563
388=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
389 565
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
391This 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
392of 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.
393 573
394The 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
395used for statistical purposes and should identify the same time-class. 575used for statistical purposes and should identify the same time-class.
396 576
397Useful for short background jobs. 577Useful for short background jobs.
398 578
399=cut 579=cut
400 580
401our @SLOT_QUEUE; 581our @SLOT_QUEUE;
402our $SLOT_QUEUE; 582our $SLOT_QUEUE;
583our $SLOT_DECAY = 0.9;
403 584
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 585$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 586$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 587 $Coro::current->desc ("timeslot manager");
407 588
408 my $signal = new Coro::Signal; 589 my $signal = new Coro::Signal;
590 my $busy;
409 591
410 while () { 592 while () {
411 next_job: 593 next_job:
594
412 my $avail = cf::till_tick; 595 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 596
414 for (0 .. $#SLOT_QUEUE) { 597 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 598 if ($SLOT_QUEUE[$_][0] <= $avail) {
599 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 600 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 601 $job->[2]->send;
418 Coro::cede; 602 Coro::cede;
419 goto next_job; 603 goto next_job;
420 } 604 } else {
605 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 606 }
422 } 607 }
423 608
424 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
427 $signal->wait;
428 } else { 612 } else {
613 $busy = 0;
429 Coro::schedule; 614 Coro::schedule;
430 } 615 }
431 } 616 }
432}; 617};
433 618
434sub get_slot($;$$) { 619sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 620 return if tick_inhibit || $Coro::current == $Coro::main;
436 621
437 my ($time, $pri, $name) = @_; 622 my ($time, $pri, $name) = @_;
438 623
439 $time = $TICK * .6 if $time > $TICK * .6; 624 $time = clamp $time, 0.01, $TICK * .6;
625
440 my $sig = new Coro::Signal; 626 my $sig = new Coro::Signal;
441 627
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 628 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 629 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 630 $SLOT_QUEUE->ready;
470=cut 656=cut
471 657
472sub sync_job(&) { 658sub sync_job(&) {
473 my ($job) = @_; 659 my ($job) = @_;
474 660
475 if ($Coro::current == $Coro::main) { 661 if (in_main) {
476 my $time = EV::time; 662 my $time = AE::time;
477 663
478 # this is the main coro, too bad, we have to block 664 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 665 # till the operation succeeds, freezing the server :/
480 666
481 LOG llevError, Carp::longmess "sync job";#d# 667 #LOG llevError, Carp::longmess "sync job";#d#
482 668
483 my $freeze_guard = freeze_mainloop; 669 my $freeze_guard = freeze_mainloop;
484 670
485 my $busy = 1; 671 my $busy = 1;
486 my @res; 672 my @res;
487 673
488 (async { 674 (async {
489 $Coro::current->desc ("sync job coro"); 675 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 676 @res = eval { $job->() };
491 warn $@ if $@; 677 error $@ if $@;
492 undef $busy; 678 undef $busy;
493 })->prio (Coro::PRIO_MAX); 679 })->prio (Coro::PRIO_MAX);
494 680
495 while ($busy) { 681 while ($busy) {
496 if (Coro::nready) { 682 if (Coro::nready) {
498 } else { 684 } else {
499 EV::loop EV::LOOP_ONESHOT; 685 EV::loop EV::LOOP_ONESHOT;
500 } 686 }
501 } 687 }
502 688
503 my $time = EV::time - $time; 689 my $time = AE::time - $time;
504 690
505 $TICK_START += $time; # do not account sync jobs to server load 691 $TICK_START += $time; # do not account sync jobs to server load
506 692
507 wantarray ? @res : $res[0] 693 wantarray ? @res : $res[0]
508 } else { 694 } else {
530 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
531 717
532 $coro 718 $coro
533} 719}
534 720
535=item fork_call { }, $args 721=item fork_call { }, @args
536 722
537Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 726never block itself or use any form of event handling.
541 727
542=cut 728=cut
543 729
730sub post_fork {
731 reset_signals;
732}
733
544sub fork_call(&@) { 734sub fork_call(&@) {
545 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
546 736
547 # 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,
548 # otherwise perl prematurely frees the stuff :/ 738 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
550 740
551 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
552 reset_signals; 742 cf::post_fork;
553 &$cb 743 &$cb
554 }, @args; 744 } @args;
555 745
556 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 )
557} 758}
558 759
559=item $coin = coin_from_name $name 760=item $coin = coin_from_name $name
560 761
561=cut 762=cut
598within each server. 799within each server.
599 800
600=cut 801=cut
601 802
602sub db_table($) { 803sub db_table($) {
804 cf::error "db_get called from main context"
805 if $Coro::current == $Coro::main;
806
603 my ($name) = @_; 807 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 808 my $db = BDB::db_create $DB_ENV;
605 809
606 eval { 810 eval {
607 $db->set_flags (BDB::CHKSUM); 811 $db->set_flags (BDB::CHKSUM);
617} 821}
618 822
619our $DB; 823our $DB;
620 824
621sub db_init { 825sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 826 $DB ||= db_table "db";
624 };
625} 827}
626 828
627sub db_get($$) { 829sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 830 my $key = "$_[0]/$_[1]";
629 831
630 cf::sync_job { 832 cf::error "db_get called from main context"
833 if $Coro::current == $Coro::main;
834
631 BDB::db_get $DB, undef, $key, my $data; 835 BDB::db_get $DB, undef, $key, my $data;
632 836
633 $! ? () 837 $! ? ()
634 : $data 838 : $data
635 }
636} 839}
637 840
638sub db_put($$$) { 841sub db_put($$$) {
639 BDB::dbreq_pri 4; 842 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 843 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 871
669 my @data; 872 my @data;
670 my $md5; 873 my $md5;
671 874
672 for (0 .. $#$src) { 875 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 877 }
676 878
677 # if processing is expensive, check 879 # if processing is expensive, check
678 # checksum first 880 # checksum first
679 if (1) { 881 if (1) {
696 898
697 my $t1 = Time::HiRes::time; 899 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 900 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 901 my $t2 = Time::HiRes::time;
700 902
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 903 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 904
703 db_put cache => "$id/data", $data; 905 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 906 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 907 db_put cache => "$id/meta", $meta;
706 908
716 918
717=cut 919=cut
718 920
719sub datalog($@) { 921sub datalog($@) {
720 my ($type, %kv) = @_; 922 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 923 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 924}
723 925
724=back 926=back
725 927
726=cut 928=cut
921 1123
922 } elsif (exists $cb_id{$type}) { 1124 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1125 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1126
925 } elsif (ref $type) { 1127 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1128 error "attaching objects not supported, ignoring.\n";
927 1129
928 } else { 1130 } else {
929 shift @arg; 1131 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1132 error "attach argument '$type' not supported, ignoring.\n";
931 } 1133 }
932 } 1134 }
933} 1135}
934 1136
935sub _object_attach { 1137sub _object_attach {
945 _attach $registry, $klass, @attach; 1147 _attach $registry, $klass, @attach;
946 } 1148 }
947 1149
948 $obj->{$name} = \%arg; 1150 $obj->{$name} = \%arg;
949 } else { 1151 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1152 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1153 }
952 1154
953 $obj->{_attachment}{$name} = undef; 1155 $obj->{_attachment}{$name} = undef;
954} 1156}
955 1157
1014 1216
1015 for (@$callbacks) { 1217 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1218 eval { &{$_->[1]} };
1017 1219
1018 if ($@) { 1220 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1221 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1222 override;
1022 } 1223 }
1023 1224
1024 return 1 if $override; 1225 return 1 if $override;
1025 } 1226 }
1104 for (@$attach) { 1305 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1306 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1307 _attach $registry, $klass, @attach;
1107 } 1308 }
1108 } else { 1309 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1310 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1311 }
1111 } 1312 }
1112} 1313}
1113 1314
1114cf::attachable->attach ( 1315cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1342 my ($filename, $rdata, $objs) = @_;
1142 1343
1143 sync_job { 1344 sync_job {
1144 if (length $$rdata) { 1345 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1346 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1347 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1348 $decname, length $$rdata, scalar @$objs
1349 if $VERBOSE_IO;
1148 1350
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1351 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1352 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1353 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1358 aio_close $fh;
1154 1359
1155 if (@$objs) { 1360 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1362 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1363 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1364 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1369 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1370 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1371 }
1164 } else { 1372 } else {
1165 aio_unlink "$filename.pst"; 1373 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1376 aio_rename "$filename~", $filename;
1169 1377
1170 $filename =~ s%/[^/]+$%%; 1378 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1379 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1380 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1381 error "unable to save objects: $filename~: $!\n";
1174 } 1382 }
1175 } else { 1383 } else {
1176 aio_unlink $filename; 1384 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1385 aio_unlink "$filename.pst";
1178 } 1386 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1410 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1411 $av = $st->{objs};
1204 } 1412 }
1205 1413
1206 utf8::decode (my $decname = $filename); 1414 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1415 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1416 $decname, length $data, scalar @{$av || []}
1417 if $VERBOSE_IO;
1209 1418
1210 ($data, $av) 1419 ($data, $av)
1211} 1420}
1212 1421
1213=head2 COMMAND CALLBACKS 1422=head2 COMMAND CALLBACKS
1272} 1481}
1273 1482
1274use File::Glob (); 1483use File::Glob ();
1275 1484
1276cf::player->attach ( 1485cf::player->attach (
1277 on_command => sub { 1486 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1487 my ($pl, $name, $params) = @_;
1279 1488
1280 my $cb = $COMMAND{$name} 1489 my $cb = $COMMAND{$name}
1281 or return; 1490 or return;
1282 1491
1290 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1291 1500
1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1293 1502
1294 if (ref $msg) { 1503 if (ref $msg) {
1295 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299 1505
1300 my @reply; 1506 my @reply;
1301 1507
1302 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1303 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
1305 1511
1306 $pl->ext_reply ($reply, @reply) 1512 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1513 if $reply;
1308 1514
1309 } else { 1515 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1516 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1517 }
1312 1518
1313 cf::override; 1519 cf::override;
1314 }, 1520 },
1315); 1521);
1316 1522
1317# "readahead" all extensions 1523# "readahead" all extensions
1318sub cache_extensions { 1524sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1525 my $grp = IO::AIO::aio_group;
1320 1526
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1527 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1528 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1529 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1530 }
1325 }; 1531 };
1326 1532
1327 $grp 1533 $grp
1328} 1534}
1329 1535
1330sub load_extensions { 1536sub load_extensions {
1537 info "loading extensions...";
1538
1331 cf::sync_job { 1539 cf::sync_job {
1332 my %todo; 1540 my %todo;
1333 1541
1334 for my $path (<$LIBDIR/*.ext>) { 1542 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1543 next unless -r $path;
1353 1561
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1564
1357 $ext{source} = 1565 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1360 . $source 1568 . $source
1361 . "\n};\n1"; 1569 . "\n};\n1";
1362 1570
1363 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
1364 } 1572 }
1365 1573
1574 my $pass = 0;
1366 my %done; 1575 my %done;
1367 while (%todo) { 1576 while (%todo) {
1368 my $progress; 1577 my $progress;
1369 1578
1579 ++$pass;
1580
1581 ext:
1370 while (my ($k, $v) = each %todo) { 1582 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1583 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1584 next ext
1373 unless exists $done{$_}; 1585 unless exists $done{$_};
1374 } 1586 }
1375 1587
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1588 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1589
1378 unless (eval $v->{source}) { 1590 my $active = eval $v->{source};
1591
1592 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1593 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1594
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1595 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1596 if exists $v->{meta}{mandatory};
1386 1597
1387 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;
1388 } 1607 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1608 }
1394 1609
1395 skip: 1610 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1611 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 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 }
1398 } 1620 }
1399 }; 1621 };
1400} 1622}
1401 1623
1402############################################################################# 1624#############################################################################
1486 $cf::PLAYER{$login} = $pl 1708 $cf::PLAYER{$login} = $pl
1487 } 1709 }
1488 } 1710 }
1489} 1711}
1490 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
1491sub save($) { 1726sub save($) {
1492 my ($pl) = @_; 1727 my ($pl) = @_;
1493 1728
1494 return if $pl->{deny_save}; 1729 return if $pl->{deny_save};
1495 1730
1500 1735
1501 aio_mkdir playerdir $pl, 0770; 1736 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1737 $pl->{last_save} = $cf::RUNTIME;
1503 1738
1504 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];
1505 1743
1506 $pl->save_pl ($path); 1744 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1745 cf::cede_to_tick;
1508} 1746}
1509 1747
1543 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1544 1782
1545 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1546 $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
1547 1785
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1787 $pl->deactivate;
1788
1550 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;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1553 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1554 1794
1555 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
1611 \@logins 1851 \@logins
1612} 1852}
1613 1853
1614=item $player->maps 1854=item $player->maps
1615 1855
1856=item cf::player::maps $login
1857
1616Returns an arrayref of map paths that are private for this 1858Returns an arrayref of map paths that are private for this
1617player. May block. 1859player. May block.
1618 1860
1619=cut 1861=cut
1620 1862
1682=cut 1924=cut
1683 1925
1684sub find_by_path($) { 1926sub find_by_path($) {
1685 my ($path) = @_; 1927 my ($path) = @_;
1686 1928
1929 $path =~ s/^~[^\/]*//; # skip ~login
1930
1687 my ($match, $specificity); 1931 my ($match, $specificity);
1688 1932
1689 for my $region (list) { 1933 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1934 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1935 ($match, $specificity) = ($region, $region->specificity)
1719sub generate_random_map { 1963sub generate_random_map {
1720 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1721 1965
1722 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
1723 1967
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1968 $self->_create_random_map ($rmp);
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1733 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1734 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1735 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1736 (cf::region::find $rmp->{region}), $rmp->{custom}
1737 )
1738} 1969}
1739 1970
1740=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1741 1972
1742Register 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
1747 1978
1748sub register { 1979sub register {
1749 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1981 my $pkg = caller;
1751 1982
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1984
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1986}
1757 1987
1758# also paths starting with '/' 1988# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1989$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1990
1761sub thawer_merge { 1991sub thawer_merge {
1762 my ($self, $merge) = @_; 1992 my ($self, $merge) = @_;
1763 1993
1764 # we have to keep some variables in memory intact 1994 # we have to keep some variables in memory intact
1769} 1999}
1770 2000
1771sub normalise { 2001sub normalise {
1772 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1773 2003
1774 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1775 2005
1776 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1777 2007
1778 # map plan: 2008 # map plan:
1779 # 2009 #
1794 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 2025 $path = "$base/$path";
1796 } 2026 }
1797 2027
1798 for ($path) { 2028 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1802 } 2031 }
1803 2032
1804 $path 2033 $path
1818 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1819 return $self; 2048 return $self;
1820 } 2049 }
1821 } 2050 }
1822 2051
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 2053 ()
1825} 2054}
1826 2055
2056# may re-bless or do other evil things
1827sub init { 2057sub init {
1828 my ($self) = @_; 2058 my ($self) = @_;
1829 2059
1830 $self 2060 $self
1831} 2061}
1896 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1897 2127
1898 1 2128 1
1899} 2129}
1900 2130
2131# used to laod the header of an original map
1901sub load_header_orig { 2132sub load_header_orig {
1902 my ($self) = @_; 2133 my ($self) = @_;
1903 2134
1904 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
1905} 2136}
1906 2137
2138# used to laod the header of an instantiated map
1907sub load_header_temp { 2139sub load_header_temp {
1908 my ($self) = @_; 2140 my ($self) = @_;
1909 2141
1910 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
1911} 2143}
1912 2144
2145# called after loading the header from an instantiated map
1913sub prepare_temp { 2146sub prepare_temp {
1914 my ($self) = @_; 2147 my ($self) = @_;
1915 2148
1916 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
1917 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
1918 # safety 2151 # safety
1919 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
1920 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
1921} 2154}
1922 2155
2156# called after loading the header from an original map
1923sub prepare_orig { 2157sub prepare_orig {
1924 my ($self) = @_; 2158 my ($self) = @_;
1925 2159
1926 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
1927 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
1951 2185
1952sub find; 2186sub find;
1953sub find { 2187sub find {
1954 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
1955 2189
2190 cf::cede_to_tick;
2191
1956 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
1957 2193
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2196
1961 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
1978 2214
1979 $cf::MAP{$path} = $map 2215 $cf::MAP{$path} = $map
1980 } 2216 }
1981} 2217}
1982 2218
1983sub pre_load { } 2219sub pre_load { }
1984sub post_load { } 2220#sub post_load { } # XS
1985 2221
1986sub load { 2222sub load {
1987 my ($self) = @_; 2223 my ($self) = @_;
1988 2224
1989 local $self->{deny_reset} = 1; # loading can take a long time 2225 local $self->{deny_reset} = 1; # loading can take a long time
1992 2228
1993 { 2229 {
1994 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
1995 2231
1996 return unless $self->valid; 2232 return unless $self->valid;
1997 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
1998
1999 $self->in_memory (cf::MAP_LOADING);
2000 2234
2001 $self->alloc; 2235 $self->alloc;
2002 2236
2003 $self->pre_load; 2237 $self->pre_load;
2004 cf::cede_to_tick; 2238 cf::cede_to_tick;
2005 2239
2240 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2242 $f->skip_block;
2008 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2009 or return; 2244 or return;
2010 2245
2011 $self->post_load_original 2246 $self->post_load_original
2012 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2013 2248
2014 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2250 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2253 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2021 } 2257 }
2022 } 2258 }
2023 }
2024 2259
2025 $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);
2026 2267
2027 cf::cede_to_tick; 2268 cf::cede_to_tick;
2028 # now do the right thing for maps 2269 # now do the right thing for maps
2029 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
2034 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2276 $self->decay_objects;
2036 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2037 $self->update_buttons; 2278 $self->update_buttons;
2038 cf::cede_to_tick; 2279 cf::cede_to_tick;
2039 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2040 } 2281 }
2041 2282
2042 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2044
2045 $self->in_memory (cf::MAP_ACTIVE);
2046 } 2285 }
2047 2286
2048 $self->post_load; 2287 $self->post_load;
2049}
2050 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
2051sub customise_for { 2295sub customise_for {
2052 my ($self, $ob) = @_; 2296 my ($self, $ob) = @_;
2053 2297
2054 return find "~" . $ob->name . "/" . $self->{path} 2298 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2299 if $self->per_player;
2058# if $self->per_party; 2302# if $self->per_party;
2059 2303
2060 $self 2304 $self
2061} 2305}
2062 2306
2063# find and load all maps in the 3x3 area around a map
2064sub load_neighbours {
2065 my ($map) = @_;
2066
2067 my @neigh; # diagonal neighbours
2068
2069 for (0 .. 3) {
2070 my $neigh = $map->tile_path ($_)
2071 or next;
2072 $neigh = find $neigh, $map
2073 or next;
2074 $neigh->load;
2075
2076 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 }
2080
2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
2083 my $neigh = find $path, $origin
2084 or next;
2085 $neigh->load;
2086 }
2087}
2088
2089sub find_sync { 2307sub find_sync {
2090 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2091 2309
2092 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
2093} 2315}
2094 2316
2095sub do_load_sync { 2317sub do_load_sync {
2096 my ($map) = @_; 2318 my ($map) = @_;
2097 2319
2320 # it's a bug to call this from the main context
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2100 2323
2101 cf::sync_job { $map->load }; 2324 $map->load;
2102} 2325}
2103 2326
2104our %MAP_PREFETCH; 2327our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2106 2329
2107sub find_async { 2330sub find_async {
2108 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2109 2332
2110 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2111 2334
2112 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2114 } 2337 }
2115 2338
2116 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2117 2340
2118 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
2132 $MAP_PREFETCHER->prio (6); 2355 $MAP_PREFETCHER->prio (6);
2133 2356
2134 () 2357 ()
2135} 2358}
2136 2359
2360# common code, used by both ->save and ->swapout
2137sub save { 2361sub _save {
2138 my ($self) = @_; 2362 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2363
2142 $self->{last_save} = $cf::RUNTIME; 2364 $self->{last_save} = $cf::RUNTIME;
2143 2365
2144 return unless $self->dirty; 2366 return unless $self->dirty;
2145 2367
2165 } else { 2387 } else {
2166 $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);
2167 } 2389 }
2168} 2390}
2169 2391
2392sub save {
2393 my ($self) = @_;
2394
2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2396
2397 $self->_save;
2398}
2399
2170sub swap_out { 2400sub swap_out {
2171 my ($self) = @_; 2401 my ($self) = @_;
2172 2402
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2404
2405 return if !$self->linkable;
2406 return if $self->{deny_save};
2178 return if $self->players; 2407 return if $self->players;
2179 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
2180 return if $self->{deny_save}; 2425 return 1e99 if $self->{deny_reset};
2181 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
2182 $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};
2183 2459
2184 $self->deactivate; 2460 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2461 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2462 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2463
2232 $self->unlink_save; 2464 $self->unlink_save;
2233 $self->destroy; 2465 $self->destroy;
2234} 2466}
2235 2467
2243 2475
2244 delete $cf::MAP{$self->path}; 2476 delete $cf::MAP{$self->path};
2245 2477
2246 $self->unlink_save; 2478 $self->unlink_save;
2247 2479
2248 bless $self, "cf::map"; 2480 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2481 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2482 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2483 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2484 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2485
2310 : normalise $_ 2542 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2543 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2544 ]
2313} 2545}
2314 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
2315=back 2579=back
2316 2580
2317=head3 cf::object 2581=head3 cf::object
2318 2582
2319=cut 2583=cut
2384 2648
2385our $SAY_CHANNEL = { 2649our $SAY_CHANNEL = {
2386 id => "say", 2650 id => "say",
2387 title => "Map", 2651 title => "Map",
2388 reply => "say ", 2652 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2653 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2654};
2391 2655
2392our $CHAT_CHANNEL = { 2656our $CHAT_CHANNEL = {
2393 id => "chat", 2657 id => "chat",
2394 title => "Chat", 2658 title => "Chat",
2451 2715
2452Freezes 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}>).
2453 2717
2454The 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.
2455for 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,
2456though, 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
2457map. 2721map.
2458 2722
2459Will never block. 2723Will never block.
2460 2724
2461=item $player_object->leave_link ($map, $x, $y) 2725=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2746sub cf::object::player::enter_link {
2483 my ($self) = @_; 2747 my ($self) = @_;
2484 2748
2485 $self->deactivate_recursive; 2749 $self->deactivate_recursive;
2486 2750
2751 ++$self->{_link_recursion};
2752
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2753 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2754
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2755 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2756 if $self->map && $self->map->{path} ne "{link}";
2491 2757
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2758 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2759}
2494 2760
2495sub cf::object::player::leave_link { 2761sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2762 my ($self, $map, $x, $y) = @_;
2497 2763
2514 ($x, $y) = (-1, -1) 2780 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2781 unless (defined $x) && (defined $y);
2516 2782
2517 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2520 2786
2521 $map->load; 2787 $map->load;
2522 $map->load_neighbours;
2523 2788
2524 return unless $self->contr->active; 2789 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2790
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2792 if ($self->enter_map ($map, $x, $y)) {
2530} 2793 # entering was successful
2794 delete $self->{_link_recursion};
2795 # only activate afterwards, to support waiting in hooks
2796 $self->activate_recursive;
2797 }
2531 2798
2799}
2800
2532=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)]])
2533 2802
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2804her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2544 2813
2545our $GOTOGEN; 2814our $GOTOGEN;
2546 2815
2547sub cf::object::player::goto { 2816sub cf::object::player::goto {
2548 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 }
2549 2824
2550 # 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
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2826 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2827
2553 $self->enter_link; 2828 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2574 } 2849 }
2575 } 2850 }
2576 2851
2577 my $map = eval { 2852 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2854
2580 if ($map) { 2855 if ($map) {
2581 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2858 } else {
2584 $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);
2585 } 2860 }
2586 2861
2587 $map 2862 $map
2595 if ($gen == $self->{_goto_generation}) { 2870 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2871 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2872 $self->leave_link ($map, $x, $y);
2598 } 2873 }
2599 2874
2600 $done->() if $done; 2875 $done->($self) if $done;
2601 })->prio (1); 2876 })->prio (1);
2602} 2877}
2603 2878
2604=item $player_object->enter_exit ($exit_object) 2879=item $player_object->enter_exit ($exit_object)
2605 2880
2673 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2674 2949
2675 unless (eval { 2950 unless (eval {
2676 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2677 2952
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2687 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2688 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 }
2689 2979
2690 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2691 2981
2692 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
2698 $self->message ("Something went wrong deep within the deliantra server. " 2988 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "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. "
2700 . "Please report this to the dungeon master!", 2990 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2991 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2992
2703 warn "ERROR in enter_exit: $@"; 2993 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2994 $self->leave_link;
2705 } 2995 }
2706 })->prio (1); 2996 })->prio (1);
2707} 2997}
2708 2998
2720sub cf::client::send_drawinfo { 3010sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 3011 my ($self, $text, $flags) = @_;
2722 3012
2723 utf8::encode $text; 3013 utf8::encode $text;
2724 $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);
2725} 3040}
2726 3041
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 3042=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 3043
2729Send 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
2733 3048
2734=cut 3049=cut
2735 3050
2736# non-persistent channels (usually the info channel) 3051# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 3052our %CHANNEL = (
3053 "c/motd" => {
3054 id => "infobox",
3055 title => "MOTD",
3056 reply => undef,
3057 tooltip => "The message of the day",
3058 },
2738 "c/identify" => { 3059 "c/identify" => {
2739 id => "infobox", 3060 id => "infobox",
2740 title => "Identify", 3061 title => "Identify",
2741 reply => undef, 3062 reply => undef,
2742 tooltip => "Items recently identified", 3063 tooltip => "Items recently identified",
2744 "c/examine" => { 3065 "c/examine" => {
2745 id => "infobox", 3066 id => "infobox",
2746 title => "Examine", 3067 title => "Examine",
2747 reply => undef, 3068 reply => undef,
2748 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",
2749 }, 3076 },
2750 "c/book" => { 3077 "c/book" => {
2751 id => "infobox", 3078 id => "infobox",
2752 title => "Book", 3079 title => "Book",
2753 reply => undef, 3080 reply => undef,
2769 id => "infobox", 3096 id => "infobox",
2770 title => "Body Parts", 3097 title => "Body Parts",
2771 reply => undef, 3098 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 3099 tooltip => "Shows which body parts you posess and are available",
2773 }, 3100 },
3101 "c/statistics" => {
3102 id => "infobox",
3103 title => "Statistics",
3104 reply => undef,
3105 tooltip => "Shows your primary statistics",
3106 },
2774 "c/skills" => { 3107 "c/skills" => {
2775 id => "infobox", 3108 id => "infobox",
2776 title => "Skills", 3109 title => "Skills",
2777 reply => undef, 3110 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 3111 tooltip => "Shows your experience per skill and item power",
3112 },
3113 "c/shopitems" => {
3114 id => "infobox",
3115 title => "Shop Items",
3116 reply => undef,
3117 tooltip => "Shows the items currently for sale in this shop",
3118 },
3119 "c/resistances" => {
3120 id => "infobox",
3121 title => "Resistances",
3122 reply => undef,
3123 tooltip => "Shows your resistances",
3124 },
3125 "c/pets" => {
3126 id => "infobox",
3127 title => "Pets",
3128 reply => undef,
3129 tooltip => "Shows information abotu your pets/a specific pet",
3130 },
3131 "c/perceiveself" => {
3132 id => "infobox",
3133 title => "Perceive Self",
3134 reply => undef,
3135 tooltip => "You gained detailed knowledge about yourself",
2779 }, 3136 },
2780 "c/uptime" => { 3137 "c/uptime" => {
2781 id => "infobox", 3138 id => "infobox",
2782 title => "Uptime", 3139 title => "Uptime",
2783 reply => undef, 3140 reply => undef,
2839 my $pkt = "msg " 3196 my $pkt = "msg "
2840 . $self->{json_coder}->encode ( 3197 . $self->{json_coder}->encode (
2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3198 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2842 ); 3199 );
2843 3200
2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2847
2848 # split very large packets
2849 if (8192 < length $pkt and $self->{can_lzf}) {
2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2851 $pkt = "frag";
2852 }
2853
2854 $self->send_packet ($pkt); 3201 $self->send_big_packet ($pkt);
2855} 3202}
2856 3203
2857=item $client->ext_msg ($type, @msg) 3204=item $client->ext_msg ($type, @msg)
2858 3205
2859Sends an ext event to the client. 3206Sends an ext event to the client.
2862 3209
2863sub cf::client::ext_msg($$@) { 3210sub cf::client::ext_msg($$@) {
2864 my ($self, $type, @msg) = @_; 3211 my ($self, $type, @msg) = @_;
2865 3212
2866 if ($self->extcmd == 2) { 3213 if ($self->extcmd == 2) {
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3214 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2868 } elsif ($self->extcmd == 1) { # TODO: remove 3215 } elsif ($self->extcmd == 1) { # TODO: remove
2869 push @msg, msgtype => "event_$type"; 3216 push @msg, msgtype => "event_$type";
2870 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3217 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2871 } 3218 }
2872} 3219}
2873 3220
2874=item $client->ext_reply ($msgid, @msg) 3221=item $client->ext_reply ($msgid, @msg)
2875 3222
2878=cut 3225=cut
2879 3226
2880sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
2881 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
2882 3229
2883 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
2884 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2885 } elsif ($self->extcmd == 1) {
2886 #TODO: version 1, remove
2887 unshift @msg, msgtype => "reply", msgid => $id;
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 }
2890} 3233}
2891 3234
2892=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2893 3236
2894Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
2949 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
2950 3293
2951 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2952 3295
2953 if (ref $msg) { 3296 if (ref $msg) {
2954 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2955 "ARRAY" eq ref $msg
2956 ? @$msg
2957 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2958 3298
2959 my @reply; 3299 my @reply;
2960 3300
2961 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
2962 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
2964 3304
2965 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
2966 if $reply; 3306 if $reply;
2967 3307
2968 } else { 3308 } else {
2969 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";
2970 } 3310 }
2971 3311
2972 cf::override; 3312 cf::override;
2973 }, 3313 },
2974); 3314);
2994 3334
2995 $coro 3335 $coro
2996} 3336}
2997 3337
2998cf::client->attach ( 3338cf::client->attach (
2999 on_destroy => sub { 3339 on_client_destroy => sub {
3000 my ($ns) = @_; 3340 my ($ns) = @_;
3001 3341
3002 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3003 }, 3343 },
3004); 3344);
3020our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3021 3361
3022$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3023 3363
3024$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3025 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3026 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3027 sort time 3367 sort time
3028)); 3368));
3029 3369
3030# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3034The following functions and methods are available within a safe environment: 3374The following functions and methods are available within a safe environment:
3035 3375
3036 cf::object 3376 cf::object
3037 contr pay_amount pay_player map x y force_find force_add destroy 3377 contr pay_amount pay_player map x y force_find force_add destroy
3038 insert remove name archname title slaying race decrease split 3378 insert remove name archname title slaying race decrease split
3379 value
3039 3380
3040 cf::object::player 3381 cf::object::player
3041 player 3382 player
3042 3383
3043 cf::player 3384 cf::player
3049=cut 3390=cut
3050 3391
3051for ( 3392for (
3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3393 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3053 insert remove inv nrof name archname title slaying race 3394 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3055 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3056 ["cf::player" => qw(peaceful)], 3397 ["cf::player" => qw(peaceful send_msg)],
3057 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3058) { 3399) {
3059 no strict 'refs';
3060 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3061 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3062 for @funs; 3402 for @funs;
3063} 3403}
3064 3404
3079 3419
3080 my $qcode = $code; 3420 my $qcode = $code;
3081 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3082 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3083 3423
3424 %vars = (_dummy => 0) unless %vars;
3425
3426 my @res;
3084 local $_; 3427 local $_;
3085 local @safe::cf::_safe_eval_args = values %vars;
3086 3428
3087 my $eval = 3429 my $eval =
3088 "do {\n" 3430 "do {\n"
3089 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3090 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3091 . $code 3433 . $code
3092 . "\n}" 3434 . "\n}"
3093 ; 3435 ;
3094 3436
3437 if ($CFG{safe_eval}) {
3095 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3096 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3097 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 }
3098 3446
3099 if ($@) { 3447 if ($@) {
3100 warn "$@"; 3448 warn "$@",
3101 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3102 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3103 } 3451 }
3104 3452
3105 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3106} 3454}
3107 3455
3121=cut 3469=cut
3122 3470
3123sub register_script_function { 3471sub register_script_function {
3124 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3125 3473
3126 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3127 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3128} 3476}
3129 3477
3130=back 3478=back
3131 3479
3132=cut 3480=cut
3141 # for this (global event?) 3489 # for this (global event?)
3142 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3143 3491
3144 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3145 3493
3146 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3147 3495
3148 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3149 0 < aio_load $path, $facedata
3150 or die "$path: $!";
3151
3152 $facedata = Coro::Storable::thaw $facedata;
3153 3497
3154 $facedata->{version} == 2 3498 $facedata->{version} == 2
3155 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3156 3500
3157 # 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]);
3158 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3159 type => FT_RSRC, 3504 type => FT_RSRC,
3160 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),
3161 }; 3507 };
3162 cf::cede_to_tick; 3508 cf::cede_to_tick;
3163 3509
3164 { 3510 {
3165 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3167 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3168 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3169 3515
3170 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3171 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3172 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3173 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} ;
3174 3521
3175 cf::cede_to_tick; 3522 cf::cede_to_tick;
3176 } 3523 }
3177 3524
3178 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3183 3530
3184 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3185 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3186 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3187 } else { 3534 } else {
3188 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3189 } 3536 }
3190 3537
3191 cf::cede_to_tick; 3538 cf::cede_to_tick;
3192 } 3539 }
3193 } 3540 }
3202 3549
3203 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3204 } 3551 }
3205 3552
3206 { 3553 {
3207 # TODO: for gcfclient pleasure, we should give resources
3208 # that gcfclient doesn't grok a >10000 face index.
3209 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3210 3555
3211 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3212 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
3213 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3214 my $data;
3215 3560
3216 if ($info->{type} & 1) { 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3217 # prepend meta info
3218
3219 my $meta = $enc->encode ({
3220 name => $name,
3221 %{ $info->{meta} || {} },
3222 });
3223
3224 $data = pack "(w/a*)*", $meta, $info->{data};
3225 } else {
3226 $data = $info->{data};
3227 }
3228
3229 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3230 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
3231 } else { 3564 } else {
3232 $RESOURCE{$name} = $info; 3565# $RESOURCE{$name} = $info; # unused
3233 } 3566 }
3234 3567
3235 cf::cede_to_tick; 3568 cf::cede_to_tick;
3236 } 3569 }
3237 } 3570 }
3238 3571
3239 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3572 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3240 3573
3241 1 3574 1
3242} 3575}
3243
3244cf::global->attach (on_resource_update => sub {
3245 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3246 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3247
3248 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3249 my $sound = $soundconf->{compat}[$_]
3250 or next;
3251
3252 my $face = cf::face::find "sound/$sound->[1]";
3253 cf::sound::set $sound->[0] => $face;
3254 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3255 }
3256
3257 while (my ($k, $v) = each %{$soundconf->{event}}) {
3258 my $face = cf::face::find "sound/$v";
3259 cf::sound::set $k => $face;
3260 }
3261 }
3262});
3263 3576
3264register_exticmd fx_want => sub { 3577register_exticmd fx_want => sub {
3265 my ($ns, $want) = @_; 3578 my ($ns, $want) = @_;
3266 3579
3267 while (my ($k, $v) = each %$want) { 3580 while (my ($k, $v) = each %$want) {
3306sub reload_treasures { 3619sub reload_treasures {
3307 load_resource_file "$DATADIR/treasures" 3620 load_resource_file "$DATADIR/treasures"
3308 or die "unable to load treasurelists\n"; 3621 or die "unable to load treasurelists\n";
3309} 3622}
3310 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
3311sub reload_resources { 3644sub reload_resources {
3312 warn "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
3313 3646
3647 reload_exp_table;
3648 reload_materials;
3314 reload_facedata; 3649 reload_facedata;
3650 reload_sound;
3315 reload_archetypes; 3651 reload_archetypes;
3316 reload_regions; 3652 reload_regions;
3317 reload_treasures; 3653 reload_treasures;
3318 3654
3319 warn "finished reloading resource files\n"; 3655 trace "finished reloading resource files\n";
3320} 3656}
3321 3657
3322sub reload_config { 3658sub reload_config {
3323 open my $fh, "<:utf8", "$CONFDIR/config" 3659 trace "reloading config file...\n";
3324 or return;
3325 3660
3326 local $/; 3661 my $config = load_file "$CONFDIR/config";
3327 *CFG = YAML::Load <$fh>; 3662 utf8::decode $config;
3663 *CFG = decode_yaml $config;
3328 3664
3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3330 3666
3331 $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};
3332 $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};
3333 3669
3334 if (exists $CFG{mlockall}) { 3670 if (exists $CFG{mlockall}) {
3357 3693
3358 seek $fh, 0, 0; 3694 seek $fh, 0, 0;
3359 print $fh $$; 3695 print $fh $$;
3360} 3696}
3361 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
3362sub main { 3707sub main {
3363 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3364 3709
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 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.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374 3714
3375 $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
3376 3716
3377 # we must not ever block the main coroutine 3717 # we must not ever block the main coroutine
3378 local $Coro::idle = sub { 3718 local $Coro::idle = sub {
3384 }; 3724 };
3385 3725
3386 evthread_start IO::AIO::poll_fileno; 3726 evthread_start IO::AIO::poll_fileno;
3387 3727
3388 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
3389 reload_resources; 3737 reload_resources;
3390 reload_config; 3738 reload_config;
3391 db_init; 3739 db_init;
3392 3740
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid; 3741 cf::init_uuid;
3396 cf::init_signals; 3742 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills; 3743 cf::init_skills;
3399 3744
3400 cf::init_beforeplay; 3745 cf::init_beforeplay;
3401 3746
3402 atomic; 3747 atomic;
3404 load_extensions; 3749 load_extensions;
3405 3750
3406 utime time, time, $RUNTIMEFILE; 3751 utime time, time, $RUNTIMEFILE;
3407 3752
3408 # no (long-running) fork's whatsoever before this point(!) 3753 # no (long-running) fork's whatsoever before this point(!)
3754 use POSIX ();
3409 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};
3410 3756
3411 (pop @POST_INIT)->(0) while @POST_INIT; 3757 cf::_post_init 0;
3412 }; 3758 };
3413 3759
3414 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;
3415} 3768}
3416 3769
3417############################################################################# 3770#############################################################################
3418# initialisation and cleanup 3771# initialisation and cleanup
3419 3772
3420# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
3421BEGIN { 3774BEGIN {
3422 our %SIGWATCHER = (); 3775 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
3426 }; 3779 };
3427 } 3780 }
3428} 3781}
3429 3782
3430sub write_runtime_sync { 3783sub write_runtime_sync {
3784 my $t0 = AE::time;
3785
3431 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
3432 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
3433 3788
3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3435 3790
3436 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
3437 3792
3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3439 or return; 3794 or return;
3440 3795
3441 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
3442 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
3443 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
3456 or return; 3811 or return;
3457 3812
3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3459 and return; 3814 and return;
3460 3815
3461 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3462 3817
3463 1 3818 1
3464} 3819}
3465 3820
3466our $uuid_lock; 3821our $uuid_lock;
3478 or return; 3833 or return;
3479 3834
3480 my $value = uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3481 3836
3482 unless ($value) { 3837 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n"; 3838 info "cowardly refusing to write zero uuid value!\n";
3484 return; 3839 return;
3485 } 3840 }
3486 3841
3487 my $value = uuid_str $value + $uuid_skip; 3842 my $value = uuid_str $value + $uuid_skip;
3488 $uuid_skip = 0; 3843 $uuid_skip = 0;
3498 or return; 3853 or return;
3499 3854
3500 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3501 and return; 3856 and return;
3502 3857
3503 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3504 3859
3505 1 3860 1
3506 3861
3507} 3862}
3508 3863
3514} 3869}
3515 3870
3516sub emergency_save() { 3871sub emergency_save() {
3517 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3518 3873
3519 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;
3520 3880
3521 cf::sync_job { 3881 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so 3882 cf::write_runtime_sync; # external watchdog should not bark
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526 3883
3527 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3530 warn "emergency_perl_save: begin player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3890 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3892 $pl->save;
3536 } 3893 }
3537 warn "emergency_perl_save: end player save\n"; 3894 info "emergency_perl_save: end player save\n";
3538 3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3539 warn "emergency_perl_save: begin map save\n"; 3898 info "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3901 $map->valid or next;
3543 $map->save; 3902 $map->save;
3544 } 3903 }
3545 warn "emergency_perl_save: end map save\n"; 3904 info "emergency_perl_save: end map save\n";
3546 3905
3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3547 warn "emergency_perl_save: begin database checkpoint\n"; 3908 info "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "emergency_perl_save: end database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3550 3911
3551 warn "emergency_perl_save: begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3913 write_uuid_sync 1;
3553 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
3554 }; 3934 };
3555 3935
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
3561 warn "emergency_perl_save: leave\n"; 3936 info "emergency_perl_save: leave\n";
3562} 3937}
3563 3938
3564sub post_cleanup { 3939sub post_cleanup {
3565 my ($make_core) = @_; 3940 my ($make_core) = @_;
3566 3941
3942 IO::AIO::flush;
3943
3567 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3568 if $make_core; 3945 if $make_core;
3569 3946
3570 my $fh = pidfile; 3947 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$; 3948 unlink $PIDFILE if <$fh> == $$;
3572} 3949}
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3969 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) { 3970 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"}; 3971 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3972# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 } 3973 }
3597 warn "cleared package $pkg\n";#d#
3598} 3974}
3599 3975
3600sub do_reload_perl() { 3976sub do_reload_perl() {
3601 # can/must only be called in main 3977 # can/must only be called in main
3602 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3603 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3604 return; 3980 return;
3605 } 3981 }
3606 3982
3607 return if $RELOAD++; 3983 return if $RELOAD++;
3608 3984
3609 my $t1 = EV::time; 3985 my $t1 = AE::time;
3610 3986
3611 while ($RELOAD) { 3987 while ($RELOAD) {
3612 warn "reloading..."; 3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3613 3990
3614 warn "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3615 3992
3616 cf::sync_job { 3993 cf::sync_job {
3617 cf::write_runtime_sync; # external watchdog should not bark
3618 cf::emergency_save; 3994 #cf::emergency_save;
3619 cf::write_runtime_sync; # external watchdog should not bark
3620 3995
3621 warn "syncing database to disk";
3622 BDB::db_env_txn_checkpoint $DB_ENV;
3623
3624 # if anything goes wrong in here, we should simply crash as we already saved
3625
3626 warn "flushing outstanding aio requests";
3627 while (IO::AIO::nreqs || BDB::nreqs) {
3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3629 }
3630
3631 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3632 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3633 %EXT_CORO = (); 3998 %EXT_CORO = ();
3634 3999
3635 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3636 %COMMAND = (); 4001 %COMMAND = ();
3637 4002
3638 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3639 %EXTCMD = (); 4004 %EXTCMD = ();
3640 %EXTICMD = (); 4005 %EXTICMD = ();
3641 4006
3642 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3643 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3644 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3645 4010
3646 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3647 eval { 4012 eval {
3648 $cb->($pkg); 4013 $cb->($pkg);
3649 1 4014 1
3650 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
3651 } 4016 }
3652 4017
3653 warn "... clearing $pkg"; 4018 trace "... clearing $pkg";
3654 clear_package $pkg; 4019 clear_package $pkg;
3655 } 4020 }
3656 4021
3657 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660 4025
3661 warn "... unloading $k"; 4026 trace "... unloading $k";
3662 delete $INC{$k}; 4027 delete $INC{$k};
3663 4028
3664 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3666 4031
3669 } 4034 }
3670 4035
3671 clear_package $k; 4036 clear_package $k;
3672 } 4037 }
3673 4038
3674 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3675 clear_package "safe::$_" 4040 clear_package "safe::$_"
3676 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);
3677 4042
3678 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3679 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3680 delete $INC{"cf/pod.pm"}; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3681 4046
3682 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3683 # and global variables created in xs 4048 # and global variables created in xs
3684 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3685 4050
3686 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3687 4052
3688 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3689 require cf; 4054 require cf;
3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4055 cf::_connect_to_perl_1;
3691 4056
3692 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3693 cf::reload_config; 4058 cf::reload_config;
3694 4059
3695 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3696 cf::load_extensions; 4061 cf::load_extensions;
3697 4062
3698 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3699 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3700 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3701 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3702 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3703 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3704 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3705 } 4070 }
3706 4071
3707 warn "running post_init jobs"; 4072 cf::_post_init 1;
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709 4073
3710 warn "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3711 4075
3712 1 4076 1
3713 } or do { 4077 } or do {
3714 warn $@; 4078 error $@;
3715 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3716 }; 4080 };
3717 4081
3718 warn "reloaded";
3719 --$RELOAD; 4082 --$RELOAD;
3720 } 4083 }
3721 4084
3722 $t1 = EV::time - $t1; 4085 $t1 = AE::time - $t1;
3723 warn "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3724}; 4087};
3725 4088
3726our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3727 4090
3728sub reload_perl() { 4091sub reload_perl() {
3730 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3731 4094
3732 $RELOAD_WATCHER ||= cf::async { 4095 $RELOAD_WATCHER ||= cf::async {
3733 Coro::AIO::aio_wait cache_extensions; 4096 Coro::AIO::aio_wait cache_extensions;
3734 4097
3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3736 do_reload_perl; 4099 do_reload_perl;
3737 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
3738 }; 4101 };
3739 }; 4102 };
3740} 4103}
3749 reload_perl; 4112 reload_perl;
3750 }; 4113 };
3751 } 4114 }
3752}; 4115};
3753 4116
3754unshift @INC, $LIBDIR; 4117#############################################################################
3755 4118
3756my $bug_warning = 0; 4119my $bug_warning = 0;
3757 4120
3758our @WAIT_FOR_TICK;
3759our @WAIT_FOR_TICK_BEGIN;
3760
3761sub wait_for_tick { 4121sub wait_for_tick() {
3762 return if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3763 4123
3764 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3765 push @WAIT_FOR_TICK, $signal;
3766 $signal->wait;
3767} 4125}
3768 4126
3769sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3770 return if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3771 4129
3772 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3773 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3774 $signal->wait; 4132 $signal->wait;
3775} 4133}
3779 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"
3780 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3781 return; 4139 return;
3782 } 4140 }
3783 4141
3784 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#
3785 4145
3786 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3787 $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.;
3788 Coro::async_pool { 4148 Coro::async_pool {
3789 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3790 write_runtime_sync 4150 write_runtime_sync
3791 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3792 }; 4152 };
3793 } 4153 }
3794 4154
3795 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3796 $sig->send; 4156 $sig->send;
3797 } 4157 }
3798 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3799 $sig->send;
3800 }
3801 4159
3802 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3803 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3804 4162
3805 if (0) { 4163 if (0) {
3806 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
3807 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
3808 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3809 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
3810 } 4168 }
3811 } 4169 }
3812} 4170}
3813 4171
3814{ 4172{
3815 # configure BDB 4173 # configure BDB
3816 4174
3817 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3818 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3819 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
3820 4178
3821 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3822 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3823 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3824 $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;
3859 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3860 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3861 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
3862} 4220}
3863 4221
3864my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3865 4224
3866sub _log_backtrace { 4225sub _log_backtrace {
3867 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3868 4227
3869 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3870 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3871 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3872 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3873 ++$_log_backtrace; 4236 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
3875 async { 4238 async {
3876 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
3877 4240
3897 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
3898 --$_log_backtrace; 4261 --$_log_backtrace;
3899 }; 4262 };
3900 } else { 4263 } else {
3901 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
3902 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3903 } 4266 }
3904} 4267}
3905 4268
3906# load additional modules 4269# load additional modules
3907use cf::pod; 4270require "cf/$_.pm" for @EXTRA_MODULES;
4271cf::_connect_to_perl_2;
3908 4272
3909END { cf::emergency_save } 4273END { cf::emergency_save }
3910 4274
39111 42751
3912 4276

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines