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.461 by root, Fri Dec 19 22:47:29 2008 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 2011 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 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; 113our %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 = 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
301=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
302 392
303Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
304 394
305=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312 402
313sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
315 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
316=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
317 438
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
320 441
321The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 443is a reload or not.
323 444
324=cut 445=cut
325 446
326sub post_init(&) { 447sub post_init(&) {
327 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
328} 466}
329 467
330=item cf::lock_wait $string 468=item cf::lock_wait $string
331 469
332Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
371} 509}
372 510
373=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
374 512
375Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 514get spread over time.
377 515
378=cut 516=cut
379 517
380sub periodic($$) { 518sub periodic($$) {
381 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
386} 524}
387 525
388=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
389 527
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
391This call blocks and returns only when you have at least C<$time> seconds 529(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. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
393 535
394The optional C<$name> can be used to identify the job to run. It might be 536The 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. 537used for statistical purposes and should identify the same time-class.
396 538
397Useful for short background jobs. 539Useful for short background jobs.
398 540
399=cut 541=cut
400 542
401our @SLOT_QUEUE; 543our @SLOT_QUEUE;
402our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
403 546
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
407 550
408 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
409 553
410 while () { 554 while () {
411 next_job: 555 next_job:
556
412 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 558
414 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 563 $job->[2]->send;
418 Coro::cede; 564 Coro::cede;
419 goto next_job; 565 goto next_job;
420 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 568 }
422 } 569 }
423 570
424 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
427 $signal->wait;
428 } else { 574 } else {
575 $busy = 0;
429 Coro::schedule; 576 Coro::schedule;
430 } 577 }
431 } 578 }
432}; 579};
433 580
434sub get_slot($;$$) { 581sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
436 583
437 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
438 585
439 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
440 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
441 589
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
470=cut 618=cut
471 619
472sub sync_job(&) { 620sub sync_job(&) {
473 my ($job) = @_; 621 my ($job) = @_;
474 622
475 if ($Coro::current == $Coro::main) { 623 if (in_main) {
476 my $time = EV::time; 624 my $time = AE::time;
477 625
478 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
480 628
481 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
482 630
483 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
484 632
485 my $busy = 1; 633 my $busy = 1;
486 my @res; 634 my @res;
487 635
488 (async { 636 (async {
489 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 638 @res = eval { $job->() };
491 warn $@ if $@; 639 error $@ if $@;
492 undef $busy; 640 undef $busy;
493 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
494 642
495 while ($busy) { 643 while ($busy) {
496 if (Coro::nready) { 644 if (Coro::nready) {
498 } else { 646 } else {
499 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
500 } 648 }
501 } 649 }
502 650
503 my $time = EV::time - $time; 651 my $time = AE::time - $time;
504 652
505 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
506 654
507 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
508 } else { 656 } else {
530 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
531 679
532 $coro 680 $coro
533} 681}
534 682
535=item fork_call { }, $args 683=item fork_call { }, @args
536 684
537Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 688never block itself or use any form of event handling.
541 689
542=cut 690=cut
543 691
692sub post_fork {
693 reset_signals;
694}
695
544sub fork_call(&@) { 696sub fork_call(&@) {
545 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
546 698
547 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
550 702
551 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
552 reset_signals; 704 cf::post_fork;
553 &$cb 705 &$cb
554 }, @args; 706 } @args;
555 707
556 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
557} 720}
558 721
559=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
560 723
561=cut 724=cut
598within each server. 761within each server.
599 762
600=cut 763=cut
601 764
602sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
603 my ($name) = @_; 769 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
605 771
606 eval { 772 eval {
607 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
617} 783}
618 784
619our $DB; 785our $DB;
620 786
621sub db_init { 787sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
624 };
625} 789}
626 790
627sub db_get($$) { 791sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
629 793
630 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
631 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
632 798
633 $! ? () 799 $! ? ()
634 : $data 800 : $data
635 }
636} 801}
637 802
638sub db_put($$$) { 803sub db_put($$$) {
639 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 833
669 my @data; 834 my @data;
670 my $md5; 835 my $md5;
671 836
672 for (0 .. $#$src) { 837 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 839 }
676 840
677 # if processing is expensive, check 841 # if processing is expensive, check
678 # checksum first 842 # checksum first
679 if (1) { 843 if (1) {
696 860
697 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 862 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
700 864
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 866
703 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
706 870
716 880
717=cut 881=cut
718 882
719sub datalog($@) { 883sub datalog($@) {
720 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 886}
723 887
724=back 888=back
725 889
726=cut 890=cut
921 1085
922 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1088
925 } elsif (ref $type) { 1089 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
927 1091
928 } else { 1092 } else {
929 shift @arg; 1093 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
931 } 1095 }
932 } 1096 }
933} 1097}
934 1098
935sub _object_attach { 1099sub _object_attach {
945 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
946 } 1110 }
947 1111
948 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
949 } else { 1113 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1115 }
952 1116
953 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
954} 1118}
955 1119
1014 1178
1015 for (@$callbacks) { 1179 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1017 1181
1018 if ($@) { 1182 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1184 override;
1022 } 1185 }
1023 1186
1024 return 1 if $override; 1187 return 1 if $override;
1025 } 1188 }
1104 for (@$attach) { 1267 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1107 } 1270 }
1108 } else { 1271 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1273 }
1111 } 1274 }
1112} 1275}
1113 1276
1114cf::attachable->attach ( 1277cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1142 1305
1143 sync_job { 1306 sync_job {
1144 if (length $$rdata) { 1307 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1148 1312
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
1153 aio_close $fh; 1320 aio_close $fh;
1154 1321
1155 if (@$objs) { 1322 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
1161 aio_close $fh; 1331 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1333 }
1164 } else { 1334 } else {
1165 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1169 1339
1170 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1342 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1174 } 1344 }
1175 } else { 1345 } else {
1176 aio_unlink $filename; 1346 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1178 } 1348 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1373 $av = $st->{objs};
1204 } 1374 }
1205 1375
1206 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1209 1380
1210 ($data, $av) 1381 ($data, $av)
1211} 1382}
1212 1383
1213=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1272} 1443}
1273 1444
1274use File::Glob (); 1445use File::Glob ();
1275 1446
1276cf::player->attach ( 1447cf::player->attach (
1277 on_command => sub { 1448 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1279 1450
1280 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1281 or return; 1452 or return;
1282 1453
1305 1476
1306 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1478 if $reply;
1308 1479
1309 } else { 1480 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1482 }
1312 1483
1313 cf::override; 1484 cf::override;
1314 }, 1485 },
1315); 1486);
1316 1487
1317# "readahead" all extensions 1488# "readahead" all extensions
1318sub cache_extensions { 1489sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1490 my $grp = IO::AIO::aio_group;
1320 1491
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1493 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1495 }
1325 }; 1496 };
1326 1497
1327 $grp 1498 $grp
1328} 1499}
1329 1500
1330sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1331 cf::sync_job { 1504 cf::sync_job {
1332 my %todo; 1505 my %todo;
1333 1506
1334 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1508 next unless -r $path;
1353 1526
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1529
1357 $ext{source} = 1530 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1360 . $source 1533 . $source
1361 . "\n};\n1"; 1534 . "\n};\n1";
1362 1535
1363 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1364 } 1537 }
1365 1538
1539 my $pass = 0;
1366 my %done; 1540 my %done;
1367 while (%todo) { 1541 while (%todo) {
1368 my $progress; 1542 my $progress;
1369 1543
1544 ++$pass;
1545
1546 ext:
1370 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1549 next ext
1373 unless exists $done{$_}; 1550 unless exists $done{$_};
1374 } 1551 }
1375 1552
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1554
1378 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1559
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1561 if exists $v->{meta}{mandatory};
1386 1562
1387 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1388 } 1572 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1573 }
1394 1574
1395 skip: 1575 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1398 } 1585 }
1399 }; 1586 };
1400} 1587}
1401 1588
1402############################################################################# 1589#############################################################################
1486 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1487 } 1674 }
1488 } 1675 }
1489} 1676}
1490 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1491sub save($) { 1691sub save($) {
1492 my ($pl) = @_; 1692 my ($pl) = @_;
1493 1693
1494 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1495 1695
1500 1700
1501 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1503 1703
1504 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1708
1506 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1710 cf::cede_to_tick;
1508} 1711}
1509 1712
1543 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1544 1747
1545 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1750
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1752 $pl->deactivate;
1753
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1553 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1554 1759
1555 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1611 \@logins 1816 \@logins
1612} 1817}
1613 1818
1614=item $player->maps 1819=item $player->maps
1615 1820
1821=item cf::player::maps $login
1822
1616Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1617player. May block. 1824player. May block.
1618 1825
1619=cut 1826=cut
1620 1827
1682=cut 1889=cut
1683 1890
1684sub find_by_path($) { 1891sub find_by_path($) {
1685 my ($path) = @_; 1892 my ($path) = @_;
1686 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1687 my ($match, $specificity); 1896 my ($match, $specificity);
1688 1897
1689 for my $region (list) { 1898 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1719sub generate_random_map { 1928sub generate_random_map {
1720 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1721 1930
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1932
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1933 $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} 1934}
1739 1935
1740=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1741 1937
1742Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1747 1943
1748sub register { 1944sub register {
1749 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1946 my $pkg = caller;
1751 1947
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1949
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1951}
1757 1952
1758# also paths starting with '/' 1953# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1955
1761sub thawer_merge { 1956sub thawer_merge {
1762 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1763 1958
1764 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1769} 1964}
1770 1965
1771sub normalise { 1966sub normalise {
1772 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1773 1968
1774 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1775 1970
1776 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1777 1972
1778 # map plan: 1973 # map plan:
1779 # 1974 #
1794 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 1990 $path = "$base/$path";
1796 } 1991 }
1797 1992
1798 for ($path) { 1993 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1802 } 1996 }
1803 1997
1804 $path 1998 $path
1818 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1819 return $self; 2013 return $self;
1820 } 2014 }
1821 } 2015 }
1822 2016
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 2018 ()
1825} 2019}
1826 2020
2021# may re-bless or do other evil things
1827sub init { 2022sub init {
1828 my ($self) = @_; 2023 my ($self) = @_;
1829 2024
1830 $self 2025 $self
1831} 2026}
1862 2057
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1865} 2060}
1866 2061
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 2062sub decay_objects {
1877 my ($self) = @_; 2063 my ($self) = @_;
1878 2064
1879 return if $self->{deny_reset}; 2065 return if $self->{deny_reset};
1880 2066
1905 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1906 2092
1907 1 2093 1
1908} 2094}
1909 2095
2096# used to laod the header of an original map
1910sub load_header_orig { 2097sub load_header_orig {
1911 my ($self) = @_; 2098 my ($self) = @_;
1912 2099
1913 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1914} 2101}
1915 2102
2103# used to laod the header of an instantiated map
1916sub load_header_temp { 2104sub load_header_temp {
1917 my ($self) = @_; 2105 my ($self) = @_;
1918 2106
1919 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1920} 2108}
1921 2109
2110# called after loading the header from an instantiated map
1922sub prepare_temp { 2111sub prepare_temp {
1923 my ($self) = @_; 2112 my ($self) = @_;
1924 2113
1925 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1926 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1927 # safety 2116 # safety
1928 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1929 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1930} 2119}
1931 2120
2121# called after loading the header from an original map
1932sub prepare_orig { 2122sub prepare_orig {
1933 my ($self) = @_; 2123 my ($self) = @_;
1934 2124
1935 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1936 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1960 2150
1961sub find; 2151sub find;
1962sub find { 2152sub find {
1963 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1964 2154
2155 cf::cede_to_tick;
2156
1965 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1966 2158
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1968 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1969 2161
1970 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1987 2179
1988 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1989 } 2181 }
1990} 2182}
1991 2183
1992sub pre_load { } 2184sub pre_load { }
1993sub post_load { } 2185#sub post_load { } # XS
1994 2186
1995sub load { 2187sub load {
1996 my ($self) = @_; 2188 my ($self) = @_;
1997 2189
1998 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2001 2193
2002 { 2194 {
2003 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2004 2196
2005 return unless $self->valid; 2197 return unless $self->valid;
2006 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2007
2008 $self->in_memory (cf::MAP_LOADING);
2009 2199
2010 $self->alloc; 2200 $self->alloc;
2011 2201
2012 $self->pre_load; 2202 $self->pre_load;
2013 cf::cede_to_tick; 2203 cf::cede_to_tick;
2014 2204
2205 if (exists $self->{load_path}) {
2015 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2016 $f->skip_block; 2207 $f->skip_block;
2017 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2018 or return; 2209 or return;
2019 2210
2020 $self->post_load_original 2211 $self->post_load_original
2021 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2022 2213
2023 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2024 utf8::encode $uniq; 2215 utf8::encode $uniq;
2025 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2026 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2027 $self->clear_unique_items; 2218 $self->clear_unique_items;
2028 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2029 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2030 } 2222 }
2031 } 2223 }
2032 }
2033 2224
2034 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2035 2232
2036 cf::cede_to_tick; 2233 cf::cede_to_tick;
2037 # now do the right thing for maps 2234 # now do the right thing for maps
2038 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2039 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2043 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2241 $self->decay_objects;
2045 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2046 $self->update_buttons; 2243 $self->update_buttons;
2047 cf::cede_to_tick; 2244 cf::cede_to_tick;
2048 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
2049 cf::cede_to_tick;
2050 $self->activate;
2051 } 2246 }
2052 2247
2053 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2055
2056 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2250 }
2058 2251
2059 $self->post_load; 2252 $self->post_load;
2060}
2061 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2062sub customise_for { 2260sub customise_for {
2063 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2064 2262
2065 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2264 if $self->per_player;
2082 or next; 2280 or next;
2083 $neigh = find $neigh, $map 2281 $neigh = find $neigh, $map
2084 or next; 2282 or next;
2085 $neigh->load; 2283 $neigh->load;
2086 2284
2285 # now find the diagonal neighbours
2087 push @neigh, 2286 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2287 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2288 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2289 }
2091 2290
2098} 2297}
2099 2298
2100sub find_sync { 2299sub find_sync {
2101 my ($path, $origin) = @_; 2300 my ($path, $origin) = @_;
2102 2301
2103 cf::sync_job { find $path, $origin } 2302 # it's a bug to call this from the main context
2303 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2304 if $Coro::current == $Coro::main;
2305
2306 find $path, $origin
2104} 2307}
2105 2308
2106sub do_load_sync { 2309sub do_load_sync {
2107 my ($map) = @_; 2310 my ($map) = @_;
2108 2311
2312 # it's a bug to call this from the main context
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2313 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2314 if $Coro::current == $Coro::main;
2111 2315
2112 cf::sync_job { $map->load }; 2316 $map->load;
2113} 2317}
2114 2318
2115our %MAP_PREFETCH; 2319our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2320our $MAP_PREFETCHER = undef;
2117 2321
2118sub find_async { 2322sub find_async {
2119 my ($path, $origin, $load) = @_; 2323 my ($path, $origin, $load) = @_;
2120 2324
2121 $path = normalise $path, $origin && $origin->{path}; 2325 $path = normalise $path, $origin;
2122 2326
2123 if (my $map = $cf::MAP{$path}) { 2327 if (my $map = $cf::MAP{$path}) {
2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2328 return $map if !$load || $map->linkable;
2125 } 2329 }
2126 2330
2127 $MAP_PREFETCH{$path} |= $load; 2331 $MAP_PREFETCH{$path} |= $load;
2128 2332
2129 $MAP_PREFETCHER ||= cf::async { 2333 $MAP_PREFETCHER ||= cf::async {
2143 $MAP_PREFETCHER->prio (6); 2347 $MAP_PREFETCHER->prio (6);
2144 2348
2145 () 2349 ()
2146} 2350}
2147 2351
2352# common code, used by both ->save and ->swapout
2148sub save { 2353sub _save {
2149 my ($self) = @_; 2354 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2355
2153 $self->{last_save} = $cf::RUNTIME; 2356 $self->{last_save} = $cf::RUNTIME;
2154 2357
2155 return unless $self->dirty; 2358 return unless $self->dirty;
2156 2359
2176 } else { 2379 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2381 }
2179} 2382}
2180 2383
2384sub save {
2385 my ($self) = @_;
2386
2387 my $lock = cf::lock_acquire "map_data:$self->{path}";
2388
2389 $self->_save;
2390}
2391
2181sub swap_out { 2392sub swap_out {
2182 my ($self) = @_; 2393 my ($self) = @_;
2183 2394
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2396
2397 return if !$self->linkable;
2398 return if $self->{deny_save};
2189 return if $self->players; 2399 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2400
2401 # first deactivate the map and "unlink" it from the core
2402 $self->deactivate;
2403 $_->clear_links_to ($self) for values %cf::MAP;
2404 $self->state (cf::MAP_SWAPPED);
2405
2406 # then atomically save
2407 $self->_save;
2408
2409 # then free the map
2410 $self->clear;
2411}
2412
2413sub reset_at {
2414 my ($self) = @_;
2415
2416 # TODO: safety, remove and allow resettable per-player maps
2191 return if $self->{deny_save}; 2417 return 1e99 if $self->{deny_reset};
2192 2418
2419 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2420 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2421
2422 $time + $to
2423}
2424
2425sub should_reset {
2426 my ($self) = @_;
2427
2428 $self->reset_at <= $cf::RUNTIME
2429}
2430
2431sub reset {
2432 my ($self) = @_;
2433
2434 my $lock = cf::lock_acquire "map_data:$self->{path}";
2435
2436 return if $self->players;
2437
2438 cf::trace "resetting map ", $self->path, "\n";
2439
2193 $self->in_memory (cf::MAP_SWAPPED); 2440 $self->state (cf::MAP_SWAPPED);
2441
2442 # need to save uniques path
2443 unless ($self->{deny_save}) {
2444 my $uniq = $self->uniq_path; utf8::encode $uniq;
2445
2446 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2447 if $uniq;
2448 }
2449
2450 delete $cf::MAP{$self->path};
2194 2451
2195 $self->deactivate; 2452 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2453 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2454 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2455
2243 $self->unlink_save; 2456 $self->unlink_save;
2244 $self->destroy; 2457 $self->destroy;
2245} 2458}
2246 2459
2254 2467
2255 delete $cf::MAP{$self->path}; 2468 delete $cf::MAP{$self->path};
2256 2469
2257 $self->unlink_save; 2470 $self->unlink_save;
2258 2471
2259 bless $self, "cf::map"; 2472 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2473 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2474 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2475 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2476 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2477
2321 : normalise $_ 2534 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2535 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2536 ]
2324} 2537}
2325 2538
2539=item cf::map::static_maps
2540
2541Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2542file in the shared directory excluding F</styles> and F</editor>). May
2543block.
2544
2545=cut
2546
2547sub static_maps() {
2548 my @dirs = "";
2549 my @maps;
2550
2551 while (@dirs) {
2552 my $dir = shift @dirs;
2553
2554 next if $dir eq "/styles" || $dir eq "/editor";
2555
2556 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2557 or return;
2558
2559 for (@$files) {
2560 s/\.map$// or next;
2561 utf8::decode $_;
2562 push @maps, "$dir/$_";
2563 }
2564
2565 push @dirs, map "$dir/$_", @$dirs;
2566 }
2567
2568 \@maps
2569}
2570
2326=back 2571=back
2327 2572
2328=head3 cf::object 2573=head3 cf::object
2329 2574
2330=cut 2575=cut
2395 2640
2396our $SAY_CHANNEL = { 2641our $SAY_CHANNEL = {
2397 id => "say", 2642 id => "say",
2398 title => "Map", 2643 title => "Map",
2399 reply => "say ", 2644 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2645 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2646};
2402 2647
2403our $CHAT_CHANNEL = { 2648our $CHAT_CHANNEL = {
2404 id => "chat", 2649 id => "chat",
2405 title => "Chat", 2650 title => "Chat",
2462 2707
2463Freezes the player and moves him/her to a special map (C<{link}>). 2708Freezes the player and moves him/her to a special map (C<{link}>).
2464 2709
2465The player should be reasonably safe there for short amounts of time (e.g. 2710The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2711for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2712though, as the player cannot control the character while it is on the link
2468map. 2713map.
2469 2714
2470Will never block. 2715Will never block.
2471 2716
2472=item $player_object->leave_link ($map, $x, $y) 2717=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2738sub cf::object::player::enter_link {
2494 my ($self) = @_; 2739 my ($self) = @_;
2495 2740
2496 $self->deactivate_recursive; 2741 $self->deactivate_recursive;
2497 2742
2743 ++$self->{_link_recursion};
2744
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2745 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2746
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2747 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2748 if $self->map && $self->map->{path} ne "{link}";
2502 2749
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2750 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2751}
2505 2752
2506sub cf::object::player::leave_link { 2753sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2754 my ($self, $map, $x, $y) = @_;
2508 2755
2525 ($x, $y) = (-1, -1) 2772 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2773 unless (defined $x) && (defined $y);
2527 2774
2528 # use -1 or undef as default coordinates, not 0, 0 2775 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2776 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2777 if $x <= 0 && $y <= 0;
2531 2778
2532 $map->load; 2779 $map->load;
2533 $map->load_neighbours; 2780 $map->load_neighbours;
2534 2781
2535 return unless $self->contr->active; 2782 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2783
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2784 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2785 if ($self->enter_map ($map, $x, $y)) {
2541} 2786 # entering was successful
2787 delete $self->{_link_recursion};
2788 # only activate afterwards, to support waiting in hooks
2789 $self->activate_recursive;
2790 }
2542 2791
2792}
2793
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2794=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2544 2795
2545Moves the player to the given map-path and coordinates by first freezing 2796Moves the player to the given map-path and coordinates by first freezing
2546her, loading and preparing them map, calling the provided $check callback 2797her, loading and preparing them map, calling the provided $check callback
2547that has to return the map if sucecssful, and then unfreezes the player on 2798that has to return the map if sucecssful, and then unfreezes the player on
2548the new (success) or old (failed) map position. In either case, $done will 2799the new (success) or old (failed) map position. In either case, $done will
2555 2806
2556our $GOTOGEN; 2807our $GOTOGEN;
2557 2808
2558sub cf::object::player::goto { 2809sub cf::object::player::goto {
2559 my ($self, $path, $x, $y, $check, $done) = @_; 2810 my ($self, $path, $x, $y, $check, $done) = @_;
2811
2812 if ($self->{_link_recursion} >= $MAX_LINKS) {
2813 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2814 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2815 ($path, $x, $y) = @$EMERGENCY_POSITION;
2816 }
2560 2817
2561 # do generation counting so two concurrent goto's will be executed in-order 2818 # do generation counting so two concurrent goto's will be executed in-order
2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2819 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2563 2820
2564 $self->enter_link; 2821 $self->enter_link;
2584 ($path, $x, $y) = (undef, undef, undef); 2841 ($path, $x, $y) = (undef, undef, undef);
2585 } 2842 }
2586 } 2843 }
2587 2844
2588 my $map = eval { 2845 my $map = eval {
2589 my $map = defined $path ? cf::map::find $path : undef; 2846 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2590 2847
2591 if ($map) { 2848 if ($map) {
2592 $map = $map->customise_for ($self); 2849 $map = $map->customise_for ($self);
2593 $map = $check->($map) if $check && $map; 2850 $map = $check->($map, $x, $y, $self) if $check && $map;
2594 } else { 2851 } else {
2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2852 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2596 } 2853 }
2597 2854
2598 $map 2855 $map
2606 if ($gen == $self->{_goto_generation}) { 2863 if ($gen == $self->{_goto_generation}) {
2607 delete $self->{_goto_generation}; 2864 delete $self->{_goto_generation};
2608 $self->leave_link ($map, $x, $y); 2865 $self->leave_link ($map, $x, $y);
2609 } 2866 }
2610 2867
2611 $done->() if $done; 2868 $done->($self) if $done;
2612 })->prio (1); 2869 })->prio (1);
2613} 2870}
2614 2871
2615=item $player_object->enter_exit ($exit_object) 2872=item $player_object->enter_exit ($exit_object)
2616 2873
2684 $Coro::current->{desc} = "enter_exit"; 2941 $Coro::current->{desc} = "enter_exit";
2685 2942
2686 unless (eval { 2943 unless (eval {
2687 $self->deactivate_recursive; # just to be sure 2944 $self->deactivate_recursive; # just to be sure
2688 2945
2689 # random map handling
2690 {
2691 my $guard = cf::lock_acquire "exit_prepare:$exit";
2692
2693 prepare_random_map $exit
2694 if $exit->slaying eq "/!";
2695 }
2696
2697 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2946 my $map = cf::map::normalise $exit->slaying, $exit->map;
2698 my $x = $exit->stats->hp; 2947 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp; 2948 my $y = $exit->stats->sp;
2949
2950 # special map handling
2951 my $slaying = $exit->slaying;
2952
2953 # special map handling
2954 if ($slaying eq "/!") {
2955 my $guard = cf::lock_acquire "exit_prepare:$exit";
2956
2957 prepare_random_map $exit
2958 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2959
2960 $map = $exit->slaying;
2961
2962 } elsif ($slaying eq '!up') {
2963 $map = $exit->map->tile_path (cf::TILE_UP);
2964 $x = $exit->x;
2965 $y = $exit->y;
2966
2967 } elsif ($slaying eq '!down') {
2968 $map = $exit->map->tile_path (cf::TILE_DOWN);
2969 $x = $exit->x;
2970 $y = $exit->y;
2971 }
2700 2972
2701 $self->goto ($map, $x, $y); 2973 $self->goto ($map, $x, $y);
2702 2974
2703 # if exit is damned, update players death & WoR home-position 2975 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y) 2976 $self->contr->savebed ($map, $x, $y)
2709 $self->message ("Something went wrong deep within the deliantra server. " 2981 $self->message ("Something went wrong deep within the deliantra server. "
2710 . "I'll try to bring you back to the map you were before. " 2982 . "I'll try to bring you back to the map you were before. "
2711 . "Please report this to the dungeon master!", 2983 . "Please report this to the dungeon master!",
2712 cf::NDI_UNIQUE | cf::NDI_RED); 2984 cf::NDI_UNIQUE | cf::NDI_RED);
2713 2985
2714 warn "ERROR in enter_exit: $@"; 2986 error "ERROR in enter_exit: $@";
2715 $self->leave_link; 2987 $self->leave_link;
2716 } 2988 }
2717 })->prio (1); 2989 })->prio (1);
2718} 2990}
2719 2991
2731sub cf::client::send_drawinfo { 3003sub cf::client::send_drawinfo {
2732 my ($self, $text, $flags) = @_; 3004 my ($self, $text, $flags) = @_;
2733 3005
2734 utf8::encode $text; 3006 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3007 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3008}
3009
3010=item $client->send_big_packet ($pkt)
3011
3012Like C<send_packet>, but tries to compress large packets, and fragments
3013them as required.
3014
3015=cut
3016
3017our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3018
3019sub cf::client::send_big_packet {
3020 my ($self, $pkt) = @_;
3021
3022 # try lzf for large packets
3023 $pkt = "lzf " . Compress::LZF::compress $pkt
3024 if 1024 <= length $pkt and $self->{can_lzf};
3025
3026 # split very large packets
3027 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3028 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3029 $pkt = "frag";
3030 }
3031
3032 $self->send_packet ($pkt);
2736} 3033}
2737 3034
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 3035=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 3036
2740Send a drawinfo or msg packet to the client, formatting the msg for the 3037Send a drawinfo or msg packet to the client, formatting the msg for the
2744 3041
2745=cut 3042=cut
2746 3043
2747# non-persistent channels (usually the info channel) 3044# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 3045our %CHANNEL = (
3046 "c/motd" => {
3047 id => "infobox",
3048 title => "MOTD",
3049 reply => undef,
3050 tooltip => "The message of the day",
3051 },
2749 "c/identify" => { 3052 "c/identify" => {
2750 id => "infobox", 3053 id => "infobox",
2751 title => "Identify", 3054 title => "Identify",
2752 reply => undef, 3055 reply => undef,
2753 tooltip => "Items recently identified", 3056 tooltip => "Items recently identified",
2755 "c/examine" => { 3058 "c/examine" => {
2756 id => "infobox", 3059 id => "infobox",
2757 title => "Examine", 3060 title => "Examine",
2758 reply => undef, 3061 reply => undef,
2759 tooltip => "Signs and other items you examined", 3062 tooltip => "Signs and other items you examined",
3063 },
3064 "c/shopinfo" => {
3065 id => "infobox",
3066 title => "Shop Info",
3067 reply => undef,
3068 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 3069 },
2761 "c/book" => { 3070 "c/book" => {
2762 id => "infobox", 3071 id => "infobox",
2763 title => "Book", 3072 title => "Book",
2764 reply => undef, 3073 reply => undef,
2780 id => "infobox", 3089 id => "infobox",
2781 title => "Body Parts", 3090 title => "Body Parts",
2782 reply => undef, 3091 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 3092 tooltip => "Shows which body parts you posess and are available",
2784 }, 3093 },
3094 "c/statistics" => {
3095 id => "infobox",
3096 title => "Statistics",
3097 reply => undef,
3098 tooltip => "Shows your primary statistics",
3099 },
2785 "c/skills" => { 3100 "c/skills" => {
2786 id => "infobox", 3101 id => "infobox",
2787 title => "Skills", 3102 title => "Skills",
2788 reply => undef, 3103 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 3104 tooltip => "Shows your experience per skill and item power",
3105 },
3106 "c/shopitems" => {
3107 id => "infobox",
3108 title => "Shop Items",
3109 reply => undef,
3110 tooltip => "Shows the items currently for sale in this shop",
3111 },
3112 "c/resistances" => {
3113 id => "infobox",
3114 title => "Resistances",
3115 reply => undef,
3116 tooltip => "Shows your resistances",
3117 },
3118 "c/pets" => {
3119 id => "infobox",
3120 title => "Pets",
3121 reply => undef,
3122 tooltip => "Shows information abotu your pets/a specific pet",
3123 },
3124 "c/perceiveself" => {
3125 id => "infobox",
3126 title => "Perceive Self",
3127 reply => undef,
3128 tooltip => "You gained detailed knowledge about yourself",
2790 }, 3129 },
2791 "c/uptime" => { 3130 "c/uptime" => {
2792 id => "infobox", 3131 id => "infobox",
2793 title => "Uptime", 3132 title => "Uptime",
2794 reply => undef, 3133 reply => undef,
2804 id => "party", 3143 id => "party",
2805 title => "Party", 3144 title => "Party",
2806 reply => "gsay ", 3145 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 3146 tooltip => "Messages and chat related to your party",
2808 }, 3147 },
3148 "c/death" => {
3149 id => "death",
3150 title => "Death",
3151 reply => undef,
3152 tooltip => "Reason for and more info about your most recent death",
3153 },
3154 "c/say" => $SAY_CHANNEL,
3155 "c/chat" => $CHAT_CHANNEL,
2809); 3156);
2810 3157
2811sub cf::client::send_msg { 3158sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3159 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3160
2818 3165
2819 # check predefined channels, for the benefit of C 3166 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3167 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3168 $channel = $CHANNEL{$channel};
2822 3169
2823 $self->ext_msg (channel_info => $channel) 3170 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3171 $channel = $channel->{id};
2827 3172
2828 } elsif (ref $channel) { 3173 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3174 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3175 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3176 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3177 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3178 }
2835 3179
2836 $channel = $channel->{id}; 3180 $channel = $channel->{id};
2837 } 3181 }
2838 3182
2839 return unless @extra || length $msg; 3183 return unless @extra || length $msg;
2840 3184
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3185 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3186 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3187 if $color & cf::NDI_DEF;
2845 3188
2846 my $pkt = "msg " 3189 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3190 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3191 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3192 );
2850 3193
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 3194 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 3195}
2888 3196
2889=item $client->ext_msg ($type, @msg) 3197=item $client->ext_msg ($type, @msg)
2890 3198
2891Sends an ext event to the client. 3199Sends an ext event to the client.
2894 3202
2895sub cf::client::ext_msg($$@) { 3203sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3204 my ($self, $type, @msg) = @_;
2897 3205
2898 if ($self->extcmd == 2) { 3206 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3207 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove 3208 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type"; 3209 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3211 }
2904} 3212}
2905 3213
2906=item $client->ext_reply ($msgid, @msg) 3214=item $client->ext_reply ($msgid, @msg)
2907 3215
2911 3219
2912sub cf::client::ext_reply($$@) { 3220sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_; 3221 my ($self, $id, @msg) = @_;
2914 3222
2915 if ($self->extcmd == 2) { 3223 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3224 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) { 3225 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove 3226 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id; 3227 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 } 3229 }
2922} 3230}
2923 3231
2924=item $success = $client->query ($flags, "text", \&cb) 3232=item $success = $client->query ($flags, "text", \&cb)
2925 3233
2996 3304
2997 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
2998 if $reply; 3306 if $reply;
2999 3307
3000 } else { 3308 } else {
3001 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";
3002 } 3310 }
3003 3311
3004 cf::override; 3312 cf::override;
3005 }, 3313 },
3006); 3314);
3026 3334
3027 $coro 3335 $coro
3028} 3336}
3029 3337
3030cf::client->attach ( 3338cf::client->attach (
3031 on_destroy => sub { 3339 on_client_destroy => sub {
3032 my ($ns) = @_; 3340 my ($ns) = @_;
3033 3341
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3343 },
3036); 3344);
3052our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3053 3361
3054$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3055 3363
3056$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3059 sort time 3367 sort time
3060)); 3368));
3061 3369
3062# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3066The following functions and methods are available within a safe environment: 3374The following functions and methods are available within a safe environment:
3067 3375
3068 cf::object 3376 cf::object
3069 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
3070 insert remove name archname title slaying race decrease split 3378 insert remove name archname title slaying race decrease split
3379 value
3071 3380
3072 cf::object::player 3381 cf::object::player
3073 player 3382 player
3074 3383
3075 cf::player 3384 cf::player
3081=cut 3390=cut
3082 3391
3083for ( 3392for (
3084 ["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
3085 insert remove inv nrof name archname title slaying race 3394 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3397 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3090) { 3399) {
3091 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3094 for @funs; 3402 for @funs;
3095} 3403}
3096 3404
3111 3419
3112 my $qcode = $code; 3420 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3115 3423
3424 %vars = (_dummy => 0) unless %vars;
3425
3426 my @res;
3116 local $_; 3427 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3428
3119 my $eval = 3429 my $eval =
3120 "do {\n" 3430 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3433 . $code
3124 . "\n}" 3434 . "\n}"
3125 ; 3435 ;
3126 3436
3437 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 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 }
3130 3446
3131 if ($@) { 3447 if ($@) {
3132 warn "$@"; 3448 warn "$@",
3133 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3135 } 3451 }
3136 3452
3137 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3138} 3454}
3139 3455
3153=cut 3469=cut
3154 3470
3155sub register_script_function { 3471sub register_script_function {
3156 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3157 3473
3158 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3160} 3476}
3161 3477
3162=back 3478=back
3163 3479
3164=cut 3480=cut
3173 # for this (global event?) 3489 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3175 3491
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177 3493
3178 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3179 3495
3180 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3181 0 < aio_load $path, $facedata
3182 or die "$path: $!";
3183
3184 $facedata = Coro::Storable::thaw $facedata;
3185 3497
3186 $facedata->{version} == 2 3498 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3188 3500
3189 # 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]);
3190 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC, 3504 type => FT_RSRC,
3192 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),
3193 }; 3507 };
3194 cf::cede_to_tick; 3508 cf::cede_to_tick;
3195 3509
3196 { 3510 {
3197 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3199 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3515
3202 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3205 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} ;
3206 3521
3207 cf::cede_to_tick; 3522 cf::cede_to_tick;
3208 } 3523 }
3209 3524
3210 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3215 3530
3216 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3219 } else { 3534 } else {
3220 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3221 } 3536 }
3222 3537
3223 cf::cede_to_tick; 3538 cf::cede_to_tick;
3224 } 3539 }
3225 } 3540 }
3234 3549
3235 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3236 } 3551 }
3237 3552
3238 { 3553 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3242 3555
3243 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3557 if (defined $info->{type}) {
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3558 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3559
3248 if ($info->{type} & 1) { 3560 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type}; 3561 cf::face::set_type $idx, $info->{type};
3263 } else { 3562 } else {
3264 $RESOURCE{$name} = $info; 3563 $RESOURCE{$name} = $info; # unused
3265 } 3564 }
3266 3565
3267 cf::cede_to_tick; 3566 cf::cede_to_tick;
3268 } 3567 }
3269 } 3568 }
3270 3569
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3570 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272 3571
3273 1 3572 1
3274} 3573}
3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3295 3574
3296register_exticmd fx_want => sub { 3575register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_; 3576 my ($ns, $want) = @_;
3298 3577
3299 while (my ($k, $v) = each %$want) { 3578 while (my ($k, $v) = each %$want) {
3338sub reload_treasures { 3617sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3618 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3619 or die "unable to load treasurelists\n";
3341} 3620}
3342 3621
3622sub reload_sound {
3623 trace "loading sound config from $DATADIR/sound\n";
3624
3625 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3626
3627 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3628 my $sound = $soundconf->{compat}[$_]
3629 or next;
3630
3631 my $face = cf::face::find "sound/$sound->[1]";
3632 cf::sound::set $sound->[0] => $face;
3633 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3634 }
3635
3636 while (my ($k, $v) = each %{$soundconf->{event}}) {
3637 my $face = cf::face::find "sound/$v";
3638 cf::sound::set $k => $face;
3639 }
3640}
3641
3343sub reload_resources { 3642sub reload_resources {
3344 warn "reloading resource files...\n"; 3643 trace "reloading resource files...\n";
3345 3644
3645 reload_exp_table;
3646 reload_materials;
3346 reload_facedata; 3647 reload_facedata;
3648 reload_sound;
3347 reload_archetypes; 3649 reload_archetypes;
3348 reload_regions; 3650 reload_regions;
3349 reload_treasures; 3651 reload_treasures;
3350 3652
3351 warn "finished reloading resource files\n"; 3653 trace "finished reloading resource files\n";
3352} 3654}
3353 3655
3354sub reload_config { 3656sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3657 trace "reloading config file...\n";
3356 or return;
3357 3658
3358 local $/; 3659 my $config = load_file "$CONFDIR/config";
3359 *CFG = YAML::Load <$fh>; 3660 utf8::decode $config;
3661 *CFG = decode_yaml $config;
3360 3662
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3663 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3664
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3665 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3666 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3667
3366 if (exists $CFG{mlockall}) { 3668 if (exists $CFG{mlockall}) {
3389 3691
3390 seek $fh, 0, 0; 3692 seek $fh, 0, 0;
3391 print $fh $$; 3693 print $fh $$;
3392} 3694}
3393 3695
3696sub main_loop {
3697 trace "EV::loop starting\n";
3698 if (1) {
3699 EV::loop;
3700 }
3701 trace "EV::loop returned\n";
3702 goto &main_loop unless $REALLY_UNLOOP;
3703}
3704
3394sub main { 3705sub main {
3395 cf::init_globals; # initialise logging 3706 cf::init_globals; # initialise logging
3396 3707
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3708 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3709 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3710 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3711 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 3712
3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3713 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3408 3714
3409 # we must not ever block the main coroutine 3715 # we must not ever block the main coroutine
3410 local $Coro::idle = sub { 3716 local $Coro::idle = sub {
3416 }; 3722 };
3417 3723
3418 evthread_start IO::AIO::poll_fileno; 3724 evthread_start IO::AIO::poll_fileno;
3419 3725
3420 cf::sync_job { 3726 cf::sync_job {
3727 cf::incloader::init ();
3728
3729 cf::init_anim;
3730 cf::init_attackmess;
3731 cf::init_dynamic;
3732
3733 cf::load_settings;
3734
3421 reload_resources; 3735 reload_resources;
3422 reload_config; 3736 reload_config;
3423 db_init; 3737 db_init;
3424 3738
3425 cf::load_settings;
3426 cf::load_materials;
3427 cf::init_uuid; 3739 cf::init_uuid;
3428 cf::init_signals; 3740 cf::init_signals;
3429 cf::init_commands;
3430 cf::init_skills; 3741 cf::init_skills;
3431 3742
3432 cf::init_beforeplay; 3743 cf::init_beforeplay;
3433 3744
3434 atomic; 3745 atomic;
3436 load_extensions; 3747 load_extensions;
3437 3748
3438 utime time, time, $RUNTIMEFILE; 3749 utime time, time, $RUNTIMEFILE;
3439 3750
3440 # no (long-running) fork's whatsoever before this point(!) 3751 # no (long-running) fork's whatsoever before this point(!)
3752 use POSIX ();
3441 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3753 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3442 3754
3443 (pop @POST_INIT)->(0) while @POST_INIT; 3755 cf::_post_init 0;
3444 }; 3756 };
3445 3757
3446 EV::loop; 3758 cf::object::thawer::errors_are_fatal 0;
3759 info "parse errors in files are no longer fatal from this point on.\n";
3760
3761 my $free_main; $free_main = EV::idle sub {
3762 undef $free_main;
3763 undef &main; # free gobs of memory :)
3764 };
3765
3766 goto &main_loop;
3447} 3767}
3448 3768
3449############################################################################# 3769#############################################################################
3450# initialisation and cleanup 3770# initialisation and cleanup
3451 3771
3452# install some emergency cleanup handlers 3772# install some emergency cleanup handlers
3453BEGIN { 3773BEGIN {
3454 our %SIGWATCHER = (); 3774 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3775 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3776 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3777 cf::cleanup "SIG$signal";
3458 }; 3778 };
3459 } 3779 }
3460} 3780}
3461 3781
3462sub write_runtime_sync { 3782sub write_runtime_sync {
3783 my $t0 = AE::time;
3784
3463 # first touch the runtime file to show we are still running: 3785 # first touch the runtime file to show we are still running:
3464 # the fsync below can take a very very long time. 3786 # the fsync below can take a very very long time.
3465 3787
3466 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3788 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3467 3789
3468 my $guard = cf::lock_acquire "write_runtime"; 3790 my $guard = cf::lock_acquire "write_runtime";
3469 3791
3470 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3792 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3471 or return; 3793 or return;
3472 3794
3473 my $value = $cf::RUNTIME + 90 + 10; 3795 my $value = $cf::RUNTIME + 90 + 10;
3474 # 10 is the runtime save interval, for a monotonic clock 3796 # 10 is the runtime save interval, for a monotonic clock
3475 # 60 allows for the watchdog to kill the server. 3797 # 60 allows for the watchdog to kill the server.
3488 or return; 3810 or return;
3489 3811
3490 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3812 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3491 and return; 3813 and return;
3492 3814
3493 warn "runtime file written.\n"; 3815 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3494 3816
3495 1 3817 1
3496} 3818}
3497 3819
3498our $uuid_lock; 3820our $uuid_lock;
3510 or return; 3832 or return;
3511 3833
3512 my $value = uuid_seq uuid_cur; 3834 my $value = uuid_seq uuid_cur;
3513 3835
3514 unless ($value) { 3836 unless ($value) {
3515 warn "cowardly refusing to write zero uuid value!\n"; 3837 info "cowardly refusing to write zero uuid value!\n";
3516 return; 3838 return;
3517 } 3839 }
3518 3840
3519 my $value = uuid_str $value + $uuid_skip; 3841 my $value = uuid_str $value + $uuid_skip;
3520 $uuid_skip = 0; 3842 $uuid_skip = 0;
3530 or return; 3852 or return;
3531 3853
3532 aio_rename "$uuid~", $uuid 3854 aio_rename "$uuid~", $uuid
3533 and return; 3855 and return;
3534 3856
3535 warn "uuid file written ($value).\n"; 3857 trace "uuid file written ($value).\n";
3536 3858
3537 1 3859 1
3538 3860
3539} 3861}
3540 3862
3546} 3868}
3547 3869
3548sub emergency_save() { 3870sub emergency_save() {
3549 my $freeze_guard = cf::freeze_mainloop; 3871 my $freeze_guard = cf::freeze_mainloop;
3550 3872
3551 warn "emergency_perl_save: enter\n"; 3873 info "emergency_perl_save: enter\n";
3874
3875 # this is a trade-off: we want to be very quick here, so
3876 # save all maps without fsync, and later call a global sync
3877 # (which in turn might be very very slow)
3878 local $USE_FSYNC = 0;
3552 3879
3553 cf::sync_job { 3880 cf::sync_job {
3554 # this is a trade-off: we want to be very quick here, so 3881 cf::write_runtime_sync; # external watchdog should not bark
3555 # save all maps without fsync, and later call a global sync
3556 # (which in turn might be very very slow)
3557 local $USE_FSYNC = 0;
3558 3882
3559 # use a peculiar iteration method to avoid tripping on perl 3883 # use a peculiar iteration method to avoid tripping on perl
3560 # refcount bugs in for. also avoids problems with players 3884 # refcount bugs in for. also avoids problems with players
3561 # and maps saved/destroyed asynchronously. 3885 # and maps saved/destroyed asynchronously.
3562 warn "emergency_perl_save: begin player save\n"; 3886 info "emergency_perl_save: begin player save\n";
3563 for my $login (keys %cf::PLAYER) { 3887 for my $login (keys %cf::PLAYER) {
3564 my $pl = $cf::PLAYER{$login} or next; 3888 my $pl = $cf::PLAYER{$login} or next;
3565 $pl->valid or next; 3889 $pl->valid or next;
3566 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3890 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3567 $pl->save; 3891 $pl->save;
3568 } 3892 }
3569 warn "emergency_perl_save: end player save\n"; 3893 info "emergency_perl_save: end player save\n";
3570 3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3896
3571 warn "emergency_perl_save: begin map save\n"; 3897 info "emergency_perl_save: begin map save\n";
3572 for my $path (keys %cf::MAP) { 3898 for my $path (keys %cf::MAP) {
3573 my $map = $cf::MAP{$path} or next; 3899 my $map = $cf::MAP{$path} or next;
3574 $map->valid or next; 3900 $map->valid or next;
3575 $map->save; 3901 $map->save;
3576 } 3902 }
3577 warn "emergency_perl_save: end map save\n"; 3903 info "emergency_perl_save: end map save\n";
3578 3904
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3579 warn "emergency_perl_save: begin database checkpoint\n"; 3907 info "emergency_perl_save: begin database checkpoint\n";
3580 BDB::db_env_txn_checkpoint $DB_ENV; 3908 BDB::db_env_txn_checkpoint $DB_ENV;
3581 warn "emergency_perl_save: end database checkpoint\n"; 3909 info "emergency_perl_save: end database checkpoint\n";
3582 3910
3583 warn "emergency_perl_save: begin write uuid\n"; 3911 info "emergency_perl_save: begin write uuid\n";
3584 write_uuid_sync 1; 3912 write_uuid_sync 1;
3585 warn "emergency_perl_save: end write uuid\n"; 3913 info "emergency_perl_save: end write uuid\n";
3914
3915 cf::write_runtime_sync; # external watchdog should not bark
3916
3917 trace "emergency_perl_save: syncing database to disk";
3918 BDB::db_env_txn_checkpoint $DB_ENV;
3919
3920 info "emergency_perl_save: starting sync\n";
3921 IO::AIO::aio_sync sub {
3922 info "emergency_perl_save: finished sync\n";
3923 };
3924
3925 cf::write_runtime_sync; # external watchdog should not bark
3926
3927 trace "emergency_perl_save: flushing outstanding aio requests";
3928 while (IO::AIO::nreqs || BDB::nreqs) {
3929 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3930 }
3931
3932 cf::write_runtime_sync; # external watchdog should not bark
3586 }; 3933 };
3587 3934
3588 warn "emergency_perl_save: starting sync()\n";
3589 IO::AIO::aio_sync sub {
3590 warn "emergency_perl_save: finished sync()\n";
3591 };
3592
3593 warn "emergency_perl_save: leave\n"; 3935 info "emergency_perl_save: leave\n";
3594} 3936}
3595 3937
3596sub post_cleanup { 3938sub post_cleanup {
3597 my ($make_core) = @_; 3939 my ($make_core) = @_;
3598 3940
3941 IO::AIO::flush;
3942
3599 warn Carp::longmess "post_cleanup backtrace" 3943 error Carp::longmess "post_cleanup backtrace"
3600 if $make_core; 3944 if $make_core;
3601 3945
3602 my $fh = pidfile; 3946 my $fh = pidfile;
3603 unlink $PIDFILE if <$fh> == $$; 3947 unlink $PIDFILE if <$fh> == $$;
3604} 3948}
3624 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3968 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3625 for my $name (keys %$leaf_symtab) { 3969 for my $name (keys %$leaf_symtab) {
3626 _gv_clear *{"$pkg$name"}; 3970 _gv_clear *{"$pkg$name"};
3627# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3971# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3628 } 3972 }
3629 warn "cleared package $pkg\n";#d#
3630} 3973}
3631 3974
3632sub do_reload_perl() { 3975sub do_reload_perl() {
3633 # can/must only be called in main 3976 # can/must only be called in main
3634 if ($Coro::current != $Coro::main) { 3977 unless (in_main) {
3635 warn "can only reload from main coroutine"; 3978 error "can only reload from main coroutine";
3636 return; 3979 return;
3637 } 3980 }
3638 3981
3639 return if $RELOAD++; 3982 return if $RELOAD++;
3640 3983
3641 my $t1 = EV::time; 3984 my $t1 = AE::time;
3642 3985
3643 while ($RELOAD) { 3986 while ($RELOAD) {
3644 warn "reloading..."; 3987 cf::get_slot 0.1, -1, "reload_perl";
3988 info "perl_reload: reloading...";
3645 3989
3646 warn "entering sync_job"; 3990 trace "perl_reload: entering sync_job";
3647 3991
3648 cf::sync_job { 3992 cf::sync_job {
3649 cf::write_runtime_sync; # external watchdog should not bark
3650 cf::emergency_save; 3993 #cf::emergency_save;
3651 cf::write_runtime_sync; # external watchdog should not bark
3652 3994
3653 warn "syncing database to disk";
3654 BDB::db_env_txn_checkpoint $DB_ENV;
3655
3656 # if anything goes wrong in here, we should simply crash as we already saved
3657
3658 warn "flushing outstanding aio requests";
3659 while (IO::AIO::nreqs || BDB::nreqs) {
3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3661 }
3662
3663 warn "cancelling all extension coros"; 3995 trace "perl_reload: cancelling all extension coros";
3664 $_->cancel for values %EXT_CORO; 3996 $_->cancel for values %EXT_CORO;
3665 %EXT_CORO = (); 3997 %EXT_CORO = ();
3666 3998
3667 warn "removing commands"; 3999 trace "perl_reload: removing commands";
3668 %COMMAND = (); 4000 %COMMAND = ();
3669 4001
3670 warn "removing ext/exti commands"; 4002 trace "perl_reload: removing ext/exti commands";
3671 %EXTCMD = (); 4003 %EXTCMD = ();
3672 %EXTICMD = (); 4004 %EXTICMD = ();
3673 4005
3674 warn "unloading/nuking all extensions"; 4006 trace "perl_reload: unloading/nuking all extensions";
3675 for my $pkg (@EXTS) { 4007 for my $pkg (@EXTS) {
3676 warn "... unloading $pkg"; 4008 trace "... unloading $pkg";
3677 4009
3678 if (my $cb = $pkg->can ("unload")) { 4010 if (my $cb = $pkg->can ("unload")) {
3679 eval { 4011 eval {
3680 $cb->($pkg); 4012 $cb->($pkg);
3681 1 4013 1
3682 } or warn "$pkg unloaded, but with errors: $@"; 4014 } or error "$pkg unloaded, but with errors: $@";
3683 } 4015 }
3684 4016
3685 warn "... clearing $pkg"; 4017 trace "... clearing $pkg";
3686 clear_package $pkg; 4018 clear_package $pkg;
3687 } 4019 }
3688 4020
3689 warn "unloading all perl modules loaded from $LIBDIR"; 4021 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) { 4022 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4023 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692 4024
3693 warn "... unloading $k"; 4025 trace "... unloading $k";
3694 delete $INC{$k}; 4026 delete $INC{$k};
3695 4027
3696 $k =~ s/\.pm$//; 4028 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g; 4029 $k =~ s/\//::/g;
3698 4030
3701 } 4033 }
3702 4034
3703 clear_package $k; 4035 clear_package $k;
3704 } 4036 }
3705 4037
3706 warn "getting rid of safe::, as good as possible"; 4038 trace "perl_reload: getting rid of safe::, as good as possible";
3707 clear_package "safe::$_" 4039 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4040 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 4041
3710 warn "unloading cf.pm \"a bit\""; 4042 trace "perl_reload: unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 4043 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 4044 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 4045
3714 # don't, removes xs symbols, too, 4046 # don't, removes xs symbols, too,
3715 # and global variables created in xs 4047 # and global variables created in xs
3716 #clear_package __PACKAGE__; 4048 #clear_package __PACKAGE__;
3717 4049
3718 warn "unload completed, starting to reload now"; 4050 info "perl_reload: unload completed, starting to reload now";
3719 4051
3720 warn "reloading cf.pm"; 4052 trace "perl_reload: reloading cf.pm";
3721 require cf; 4053 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4054 cf::_connect_to_perl_1;
3723 4055
3724 warn "loading config and database again"; 4056 trace "perl_reload: loading config and database again";
3725 cf::reload_config; 4057 cf::reload_config;
3726 4058
3727 warn "loading extensions"; 4059 trace "perl_reload: loading extensions";
3728 cf::load_extensions; 4060 cf::load_extensions;
3729 4061
3730 if ($REATTACH_ON_RELOAD) { 4062 if ($REATTACH_ON_RELOAD) {
3731 warn "reattaching attachments to objects/players"; 4063 trace "perl_reload: reattaching attachments to objects/players";
3732 _global_reattach; # objects, sockets 4064 _global_reattach; # objects, sockets
3733 warn "reattaching attachments to maps"; 4065 trace "perl_reload: reattaching attachments to maps";
3734 reattach $_ for values %MAP; 4066 reattach $_ for values %MAP;
3735 warn "reattaching attachments to players"; 4067 trace "perl_reload: reattaching attachments to players";
3736 reattach $_ for values %PLAYER; 4068 reattach $_ for values %PLAYER;
3737 } 4069 }
3738 4070
3739 warn "running post_init jobs"; 4071 cf::_post_init 1;
3740 (pop @POST_INIT)->(1) while @POST_INIT;
3741 4072
3742 warn "leaving sync_job"; 4073 trace "perl_reload: leaving sync_job";
3743 4074
3744 1 4075 1
3745 } or do { 4076 } or do {
3746 warn $@; 4077 error $@;
3747 cf::cleanup "error while reloading, exiting."; 4078 cf::cleanup "perl_reload: error, exiting.";
3748 }; 4079 };
3749 4080
3750 warn "reloaded";
3751 --$RELOAD; 4081 --$RELOAD;
3752 } 4082 }
3753 4083
3754 $t1 = EV::time - $t1; 4084 $t1 = AE::time - $t1;
3755 warn "reload completed in ${t1}s\n"; 4085 info "perl_reload: completed in ${t1}s\n";
3756}; 4086};
3757 4087
3758our $RELOAD_WATCHER; # used only during reload 4088our $RELOAD_WATCHER; # used only during reload
3759 4089
3760sub reload_perl() { 4090sub reload_perl() {
3762 # coro crashes during coro_state_free->destroy here. 4092 # coro crashes during coro_state_free->destroy here.
3763 4093
3764 $RELOAD_WATCHER ||= cf::async { 4094 $RELOAD_WATCHER ||= cf::async {
3765 Coro::AIO::aio_wait cache_extensions; 4095 Coro::AIO::aio_wait cache_extensions;
3766 4096
3767 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4097 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3768 do_reload_perl; 4098 do_reload_perl;
3769 undef $RELOAD_WATCHER; 4099 undef $RELOAD_WATCHER;
3770 }; 4100 };
3771 }; 4101 };
3772} 4102}
3781 reload_perl; 4111 reload_perl;
3782 }; 4112 };
3783 } 4113 }
3784}; 4114};
3785 4115
3786unshift @INC, $LIBDIR; 4116#############################################################################
3787 4117
3788my $bug_warning = 0; 4118my $bug_warning = 0;
3789 4119
3790our @WAIT_FOR_TICK;
3791our @WAIT_FOR_TICK_BEGIN;
3792
3793sub wait_for_tick { 4120sub wait_for_tick() {
3794 return if tick_inhibit || $Coro::current == $Coro::main; 4121 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3795 4122
3796 my $signal = new Coro::Signal; 4123 $WAIT_FOR_TICK->wait;
3797 push @WAIT_FOR_TICK, $signal;
3798 $signal->wait;
3799} 4124}
3800 4125
3801sub wait_for_tick_begin { 4126sub wait_for_tick_begin() {
3802 return if tick_inhibit || $Coro::current == $Coro::main; 4127 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3803 4128
3804 my $signal = new Coro::Signal; 4129 my $signal = new Coro::Signal;
3805 push @WAIT_FOR_TICK_BEGIN, $signal; 4130 push @WAIT_FOR_TICK_BEGIN, $signal;
3806 $signal->wait; 4131 $signal->wait;
3807} 4132}
3811 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4136 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3812 unless ++$bug_warning > 10; 4137 unless ++$bug_warning > 10;
3813 return; 4138 return;
3814 } 4139 }
3815 4140
3816 cf::server_tick; # one server iteration 4141 cf::one_tick; # one server iteration
4142
4143 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3817 4144
3818 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4145 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3819 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4146 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3820 Coro::async_pool { 4147 Coro::async_pool {
3821 $Coro::current->{desc} = "runtime saver"; 4148 $Coro::current->{desc} = "runtime saver";
3822 write_runtime_sync 4149 write_runtime_sync
3823 or warn "ERROR: unable to write runtime file: $!"; 4150 or error "ERROR: unable to write runtime file: $!";
3824 }; 4151 };
3825 } 4152 }
3826 4153
3827 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4154 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3828 $sig->send; 4155 $sig->send;
3829 } 4156 }
3830 while (my $sig = shift @WAIT_FOR_TICK) { 4157 $WAIT_FOR_TICK->broadcast;
3831 $sig->send;
3832 }
3833 4158
3834 $LOAD = ($NOW - $TICK_START) / $TICK; 4159 $LOAD = ($NOW - $TICK_START) / $TICK;
3835 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3836 4161
3837 if (0) { 4162 if (0) {
3838 if ($NEXT_TICK) { 4163 if ($NEXT_TICK) {
3839 my $jitter = $TICK_START - $NEXT_TICK; 4164 my $jitter = $TICK_START - $NEXT_TICK;
3840 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4165 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3841 warn "jitter $JITTER\n";#d# 4166 debug "jitter $JITTER\n";#d#
3842 } 4167 }
3843 } 4168 }
3844} 4169}
3845 4170
3846{ 4171{
3847 # configure BDB 4172 # configure BDB
3848 4173
3849 BDB::min_parallel 8; 4174 BDB::min_parallel 16;
3850 BDB::max_poll_reqs $TICK * 0.1; 4175 BDB::max_poll_reqs $TICK * 0.1;
3851 $AnyEvent::BDB::WATCHER->priority (1); 4176 $AnyEvent::BDB::WATCHER->priority (1);
3852 4177
3853 unless ($DB_ENV) { 4178 unless ($DB_ENV) {
3854 $DB_ENV = BDB::db_env_create; 4179 $DB_ENV = BDB::db_env_create;
3891 IO::AIO::min_parallel 8; 4216 IO::AIO::min_parallel 8;
3892 IO::AIO::max_poll_time $TICK * 0.1; 4217 IO::AIO::max_poll_time $TICK * 0.1;
3893 undef $AnyEvent::AIO::WATCHER; 4218 undef $AnyEvent::AIO::WATCHER;
3894} 4219}
3895 4220
3896my $_log_backtrace; 4221our $_log_backtrace;
4222our $_log_backtrace_last;
3897 4223
3898sub _log_backtrace { 4224sub _log_backtrace {
3899 my ($msg, @addr) = @_; 4225 my ($msg, @addr) = @_;
3900 4226
3901 $msg =~ s/\n//; 4227 $msg =~ s/\n$//;
3902 4228
4229 if ($_log_backtrace_last eq $msg) {
4230 LOG llevInfo, "[ABT] $msg\n";
4231 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3903 # limit the # of concurrent backtraces 4232 # limit the # of concurrent backtraces
3904 if ($_log_backtrace < 2) { 4233 } elsif ($_log_backtrace < 2) {
4234 $_log_backtrace_last = $msg;
3905 ++$_log_backtrace; 4235 ++$_log_backtrace;
3906 my $perl_bt = Carp::longmess $msg; 4236 my $perl_bt = Carp::longmess $msg;
3907 async { 4237 async {
3908 $Coro::current->{desc} = "abt $msg"; 4238 $Coro::current->{desc} = "abt $msg";
3909 4239
3929 LOG llevInfo, "[ABT] $_\n" for @bt; 4259 LOG llevInfo, "[ABT] $_\n" for @bt;
3930 --$_log_backtrace; 4260 --$_log_backtrace;
3931 }; 4261 };
3932 } else { 4262 } else {
3933 LOG llevInfo, "[ABT] $msg\n"; 4263 LOG llevInfo, "[ABT] $msg\n";
3934 LOG llevInfo, "[ABT] [suppressed]\n"; 4264 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3935 } 4265 }
3936} 4266}
3937 4267
3938# load additional modules 4268# load additional modules
3939use cf::pod; 4269require "cf/$_.pm" for @EXTRA_MODULES;
4270cf::_connect_to_perl_2;
3940 4271
3941END { cf::emergency_save } 4272END { cf::emergency_save }
3942 4273
39431 42741
3944 4275

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines