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.460 by root, Mon Dec 15 17:04:53 2008 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 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
1290 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1291 1462
1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1293 1464
1294 if (ref $msg) { 1465 if (ref $msg) {
1295 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299 1467
1300 my @reply; 1468 my @reply;
1301 1469
1302 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1303 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1305 1473
1306 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1475 if $reply;
1308 1476
1309 } else { 1477 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1479 }
1312 1480
1313 cf::override; 1481 cf::override;
1314 }, 1482 },
1315); 1483);
1316 1484
1317# "readahead" all extensions 1485# "readahead" all extensions
1318sub cache_extensions { 1486sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1487 my $grp = IO::AIO::aio_group;
1320 1488
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1490 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1492 }
1325 }; 1493 };
1326 1494
1327 $grp 1495 $grp
1328} 1496}
1329 1497
1330sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1331 cf::sync_job { 1501 cf::sync_job {
1332 my %todo; 1502 my %todo;
1333 1503
1334 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1505 next unless -r $path;
1353 1523
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1526
1357 $ext{source} = 1527 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1360 . $source 1530 . $source
1361 . "\n};\n1"; 1531 . "\n};\n1";
1362 1532
1363 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1364 } 1534 }
1365 1535
1536 my $pass = 0;
1366 my %done; 1537 my %done;
1367 while (%todo) { 1538 while (%todo) {
1368 my $progress; 1539 my $progress;
1369 1540
1541 ++$pass;
1542
1543 ext:
1370 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1546 next ext
1373 unless exists $done{$_}; 1547 unless exists $done{$_};
1374 } 1548 }
1375 1549
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1551
1378 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1556
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1558 if exists $v->{meta}{mandatory};
1386 1559
1387 warn $msg; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1561 delete $todo{$k};
1562 } else {
1563 $done{$k} = delete $todo{$k};
1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1388 } 1569 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1570 }
1394 1571
1395 skip: 1572 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1398 } 1582 }
1399 }; 1583 };
1400} 1584}
1401 1585
1402############################################################################# 1586#############################################################################
1486 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1487 } 1671 }
1488 } 1672 }
1489} 1673}
1490 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1491sub save($) { 1688sub save($) {
1492 my ($pl) = @_; 1689 my ($pl) = @_;
1493 1690
1494 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1495 1692
1500 1697
1501 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1503 1700
1504 cf::get_slot 0.01; 1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1705
1506 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1707 cf::cede_to_tick;
1508} 1708}
1509 1709
1543 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1544 1744
1545 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1747
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1749 $pl->deactivate;
1750
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1553 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1554 1756
1555 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1611 \@logins 1813 \@logins
1612} 1814}
1613 1815
1614=item $player->maps 1816=item $player->maps
1615 1817
1818=item cf::player::maps $login
1819
1616Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1617player. May block. 1821player. May block.
1618 1822
1619=cut 1823=cut
1620 1824
1682=cut 1886=cut
1683 1887
1684sub find_by_path($) { 1888sub find_by_path($) {
1685 my ($path) = @_; 1889 my ($path) = @_;
1686 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1687 my ($match, $specificity); 1893 my ($match, $specificity);
1688 1894
1689 for my $region (list) { 1895 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1719sub generate_random_map { 1925sub generate_random_map {
1720 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1721 1927
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1929
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1930 $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} 1931}
1739 1932
1740=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1741 1934
1742Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1747 1940
1748sub register { 1941sub register {
1749 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1943 my $pkg = caller;
1751 1944
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1946
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1948}
1757 1949
1758# also paths starting with '/' 1950# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1952
1761sub thawer_merge { 1953sub thawer_merge {
1762 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1763 1955
1764 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1769} 1961}
1770 1962
1771sub normalise { 1963sub normalise {
1772 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1773 1965
1774 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1775 1967
1776 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1777 1969
1778 # map plan: 1970 # map plan:
1779 # 1971 #
1794 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 1987 $path = "$base/$path";
1796 } 1988 }
1797 1989
1798 for ($path) { 1990 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1802 } 1993 }
1803 1994
1804 $path 1995 $path
1818 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1819 return $self; 2010 return $self;
1820 } 2011 }
1821 } 2012 }
1822 2013
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 2015 ()
1825} 2016}
1826 2017
2018# may re-bless or do other evil things
1827sub init { 2019sub init {
1828 my ($self) = @_; 2020 my ($self) = @_;
1829 2021
1830 $self 2022 $self
1831} 2023}
1862 2054
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1865} 2057}
1866 2058
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 { 2059sub decay_objects {
1877 my ($self) = @_; 2060 my ($self) = @_;
1878 2061
1879 return if $self->{deny_reset}; 2062 return if $self->{deny_reset};
1880 2063
1905 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1906 2089
1907 1 2090 1
1908} 2091}
1909 2092
2093# used to laod the header of an original map
1910sub load_header_orig { 2094sub load_header_orig {
1911 my ($self) = @_; 2095 my ($self) = @_;
1912 2096
1913 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1914} 2098}
1915 2099
2100# used to laod the header of an instantiated map
1916sub load_header_temp { 2101sub load_header_temp {
1917 my ($self) = @_; 2102 my ($self) = @_;
1918 2103
1919 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1920} 2105}
1921 2106
2107# called after loading the header from an instantiated map
1922sub prepare_temp { 2108sub prepare_temp {
1923 my ($self) = @_; 2109 my ($self) = @_;
1924 2110
1925 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1926 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1927 # safety 2113 # safety
1928 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1929 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1930} 2116}
1931 2117
2118# called after loading the header from an original map
1932sub prepare_orig { 2119sub prepare_orig {
1933 my ($self) = @_; 2120 my ($self) = @_;
1934 2121
1935 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1936 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1960 2147
1961sub find; 2148sub find;
1962sub find { 2149sub find {
1963 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1964 2151
2152 cf::cede_to_tick;
2153
1965 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1966 2155
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1968 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1969 2158
1970 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1987 2176
1988 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1989 } 2178 }
1990} 2179}
1991 2180
1992sub pre_load { } 2181sub pre_load { }
1993sub post_load { } 2182#sub post_load { } # XS
1994 2183
1995sub load { 2184sub load {
1996 my ($self) = @_; 2185 my ($self) = @_;
1997 2186
1998 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2001 2190
2002 { 2191 {
2003 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2004 2193
2005 return unless $self->valid; 2194 return unless $self->valid;
2006 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2007
2008 $self->in_memory (cf::MAP_LOADING);
2009 2196
2010 $self->alloc; 2197 $self->alloc;
2011 2198
2012 $self->pre_load; 2199 $self->pre_load;
2013 cf::cede_to_tick; 2200 cf::cede_to_tick;
2014 2201
2202 if (exists $self->{load_path}) {
2015 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2016 $f->skip_block; 2204 $f->skip_block;
2017 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2018 or return; 2206 or return;
2019 2207
2020 $self->post_load_original 2208 $self->post_load_original
2021 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2022 2210
2023 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2024 utf8::encode $uniq; 2212 utf8::encode $uniq;
2025 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2026 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2027 $self->clear_unique_items; 2215 $self->clear_unique_items;
2028 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2029 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2030 } 2219 }
2031 } 2220 }
2032 }
2033 2221
2034 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2035 2229
2036 cf::cede_to_tick; 2230 cf::cede_to_tick;
2037 # now do the right thing for maps 2231 # now do the right thing for maps
2038 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2039 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2043 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2238 $self->decay_objects;
2045 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2046 $self->update_buttons; 2240 $self->update_buttons;
2047 cf::cede_to_tick; 2241 cf::cede_to_tick;
2048 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
2049 cf::cede_to_tick;
2050 $self->activate;
2051 } 2243 }
2052 2244
2053 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2055
2056 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2247 }
2058 2248
2059 $self->post_load; 2249 $self->post_load;
2060}
2061 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2062sub customise_for { 2257sub customise_for {
2063 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2064 2259
2065 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2261 if $self->per_player;
2069# if $self->per_party; 2264# if $self->per_party;
2070 2265
2071 $self 2266 $self
2072} 2267}
2073 2268
2074# find and load all maps in the 3x3 area around a map
2075sub load_neighbours {
2076 my ($map) = @_;
2077
2078 my @neigh; # diagonal neighbours
2079
2080 for (0 .. 3) {
2081 my $neigh = $map->tile_path ($_)
2082 or next;
2083 $neigh = find $neigh, $map
2084 or next;
2085 $neigh->load;
2086
2087 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 }
2091
2092 for (grep defined $_->[0], @neigh) {
2093 my ($path, $origin) = @$_;
2094 my $neigh = find $path, $origin
2095 or next;
2096 $neigh->load;
2097 }
2098}
2099
2100sub find_sync { 2269sub find_sync {
2101 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2102 2271
2103 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2104} 2277}
2105 2278
2106sub do_load_sync { 2279sub do_load_sync {
2107 my ($map) = @_; 2280 my ($map) = @_;
2108 2281
2282 # it's a bug to call this from the main context
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2111 2285
2112 cf::sync_job { $map->load }; 2286 $map->load;
2113} 2287}
2114 2288
2115our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2117 2291
2118sub find_async { 2292sub find_async {
2119 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2120 2294
2121 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2122 2296
2123 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2125 } 2299 }
2126 2300
2127 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2128 2302
2129 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2143 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2144 2318
2145 () 2319 ()
2146} 2320}
2147 2321
2322# common code, used by both ->save and ->swapout
2148sub save { 2323sub _save {
2149 my ($self) = @_; 2324 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2325
2153 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2154 2327
2155 return unless $self->dirty; 2328 return unless $self->dirty;
2156 2329
2176 } else { 2349 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2351 }
2179} 2352}
2180 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2181sub swap_out { 2362sub swap_out {
2182 my ($self) = @_; 2363 my ($self) = @_;
2183 2364
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2189 return if $self->players; 2369 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2191 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2192 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2193 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2194 2421
2195 $self->deactivate; 2422 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2424 $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 2425
2243 $self->unlink_save; 2426 $self->unlink_save;
2244 $self->destroy; 2427 $self->destroy;
2245} 2428}
2246 2429
2254 2437
2255 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2256 2439
2257 $self->unlink_save; 2440 $self->unlink_save;
2258 2441
2259 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2447
2321 : normalise $_ 2504 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2506 ]
2324} 2507}
2325 2508
2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2540
2326=back 2541=back
2327 2542
2328=head3 cf::object 2543=head3 cf::object
2329 2544
2330=cut 2545=cut
2395 2610
2396our $SAY_CHANNEL = { 2611our $SAY_CHANNEL = {
2397 id => "say", 2612 id => "say",
2398 title => "Map", 2613 title => "Map",
2399 reply => "say ", 2614 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2615 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2616};
2402 2617
2403our $CHAT_CHANNEL = { 2618our $CHAT_CHANNEL = {
2404 id => "chat", 2619 id => "chat",
2405 title => "Chat", 2620 title => "Chat",
2462 2677
2463Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2464 2679
2465The player should be reasonably safe there for short amounts of time (e.g. 2680The 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, 2681for 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 2682though, as the player cannot control the character while it is on the link
2468map. 2683map.
2469 2684
2470Will never block. 2685Will never block.
2471 2686
2472=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2494 my ($self) = @_; 2709 my ($self) = @_;
2495 2710
2496 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2497 2712
2713 ++$self->{_link_recursion};
2714
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2716
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2502 2719
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2721}
2505 2722
2506sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2508 2725
2525 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2527 2744
2528 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2531 2748
2532 $map->load; 2749 $map->load;
2533 $map->load_neighbours;
2534 2750
2535 return unless $self->contr->active; 2751 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2752
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2541} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2542 2760
2761}
2762
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2544 2764
2545Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2546her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2547that has to return the map if sucecssful, and then unfreezes the player on 2767that 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 2768the new (success) or old (failed) map position. In either case, $done will
2555 2775
2556our $GOTOGEN; 2776our $GOTOGEN;
2557 2777
2558sub cf::object::player::goto { 2778sub cf::object::player::goto {
2559 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2560 2786
2561 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2563 2789
2564 $self->enter_link; 2790 $self->enter_link;
2584 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2585 } 2811 }
2586 } 2812 }
2587 2813
2588 my $map = eval { 2814 my $map = eval {
2589 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2590 2816
2591 if ($map) { 2817 if ($map) {
2592 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2593 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2594 } else { 2820 } else {
2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2596 } 2822 }
2597 2823
2598 $map 2824 $map
2606 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2607 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2608 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2609 } 2835 }
2610 2836
2611 $done->() if $done; 2837 $done->($self) if $done;
2612 })->prio (1); 2838 })->prio (1);
2613} 2839}
2614 2840
2615=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2616 2842
2684 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2685 2911
2686 unless (eval { 2912 unless (eval {
2687 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2688 2914
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; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2698 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2700 2941
2701 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2702 2943
2703 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2709 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2710 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2711 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2712 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2713 2954
2714 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2715 $self->leave_link; 2956 $self->leave_link;
2716 } 2957 }
2717 })->prio (1); 2958 })->prio (1);
2718} 2959}
2719 2960
2731sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2732 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2733 2974
2734 utf8::encode $text; 2975 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2736} 3002}
2737 3003
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 3005
2740Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2744 3010
2745=cut 3011=cut
2746 3012
2747# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2749 "c/identify" => { 3021 "c/identify" => {
2750 id => "infobox", 3022 id => "infobox",
2751 title => "Identify", 3023 title => "Identify",
2752 reply => undef, 3024 reply => undef,
2753 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2755 "c/examine" => { 3027 "c/examine" => {
2756 id => "infobox", 3028 id => "infobox",
2757 title => "Examine", 3029 title => "Examine",
2758 reply => undef, 3030 reply => undef,
2759 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 3038 },
2761 "c/book" => { 3039 "c/book" => {
2762 id => "infobox", 3040 id => "infobox",
2763 title => "Book", 3041 title => "Book",
2764 reply => undef, 3042 reply => undef,
2780 id => "infobox", 3058 id => "infobox",
2781 title => "Body Parts", 3059 title => "Body Parts",
2782 reply => undef, 3060 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 3061 tooltip => "Shows which body parts you posess and are available",
2784 }, 3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
2785 "c/skills" => { 3069 "c/skills" => {
2786 id => "infobox", 3070 id => "infobox",
2787 title => "Skills", 3071 title => "Skills",
2788 reply => undef, 3072 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 3073 tooltip => "Shows your experience per skill and item power",
3074 },
3075 "c/shopitems" => {
3076 id => "infobox",
3077 title => "Shop Items",
3078 reply => undef,
3079 tooltip => "Shows the items currently for sale in this shop",
3080 },
3081 "c/resistances" => {
3082 id => "infobox",
3083 title => "Resistances",
3084 reply => undef,
3085 tooltip => "Shows your resistances",
3086 },
3087 "c/pets" => {
3088 id => "infobox",
3089 title => "Pets",
3090 reply => undef,
3091 tooltip => "Shows information abotu your pets/a specific pet",
3092 },
3093 "c/perceiveself" => {
3094 id => "infobox",
3095 title => "Perceive Self",
3096 reply => undef,
3097 tooltip => "You gained detailed knowledge about yourself",
2790 }, 3098 },
2791 "c/uptime" => { 3099 "c/uptime" => {
2792 id => "infobox", 3100 id => "infobox",
2793 title => "Uptime", 3101 title => "Uptime",
2794 reply => undef, 3102 reply => undef,
2804 id => "party", 3112 id => "party",
2805 title => "Party", 3113 title => "Party",
2806 reply => "gsay ", 3114 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 3115 tooltip => "Messages and chat related to your party",
2808 }, 3116 },
3117 "c/death" => {
3118 id => "death",
3119 title => "Death",
3120 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death",
3122 },
3123 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL,
2809); 3125);
2810 3126
2811sub cf::client::send_msg { 3127sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3129
2818 3134
2819 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3136 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3137 $channel = $CHANNEL{$channel};
2822 3138
2823 $self->ext_msg (channel_info => $channel) 3139 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3140 $channel = $channel->{id};
2827 3141
2828 } elsif (ref $channel) { 3142 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3147 }
2835 3148
2836 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2837 } 3150 }
2838 3151
2839 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2840 3153
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3154 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2845 3157
2846 my $pkt = "msg " 3158 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3161 );
2850 3162
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); 3163 $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} 3164}
2888 3165
2889=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2890 3167
2891Sends an ext event to the client. 3168Sends an ext event to the client.
2894 3171
2895sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2897 3174
2898 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3180 }
2904} 3181}
2905 3182
2906=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2907 3184
2910=cut 3187=cut
2911 3188
2912sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2914 3191
2915 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 }
2922} 3195}
2923 3196
2924=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2925 3198
2926Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2981 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2982 3255
2983 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2984 3257
2985 if (ref $msg) { 3258 if (ref $msg) {
2986 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2987 "ARRAY" eq ref $msg
2988 ? @$msg
2989 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2990 3260
2991 my @reply; 3261 my @reply;
2992 3262
2993 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2994 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2996 3266
2997 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2998 if $reply; 3268 if $reply;
2999 3269
3000 } else { 3270 } else {
3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3002 } 3272 }
3003 3273
3004 cf::override; 3274 cf::override;
3005 }, 3275 },
3006); 3276);
3026 3296
3027 $coro 3297 $coro
3028} 3298}
3029 3299
3030cf::client->attach ( 3300cf::client->attach (
3031 on_destroy => sub { 3301 on_client_destroy => sub {
3032 my ($ns) = @_; 3302 my ($ns) = @_;
3033 3303
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3305 },
3036); 3306);
3052our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3053 3323
3054$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3055 3325
3056$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3059 sort time 3329 sort time
3060)); 3330));
3061 3331
3062# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3066The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
3067 3337
3068 cf::object 3338 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3339 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3340 insert remove name archname title slaying race decrease split
3341 value
3071 3342
3072 cf::object::player 3343 cf::object::player
3073 player 3344 player
3074 3345
3075 cf::player 3346 cf::player
3081=cut 3352=cut
3082 3353
3083for ( 3354for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3355 ["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 3356 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3090) { 3361) {
3091 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3094 for @funs; 3364 for @funs;
3095} 3365}
3096 3366
3111 3381
3112 my $qcode = $code; 3382 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3115 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
3116 local $_; 3389 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3390
3119 my $eval = 3391 my $eval =
3120 "do {\n" 3392 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3395 . $code
3124 . "\n}" 3396 . "\n}"
3125 ; 3397 ;
3126 3398
3399 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
3130 3408
3131 if ($@) { 3409 if ($@) {
3132 warn "$@"; 3410 warn "$@",
3133 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3135 } 3413 }
3136 3414
3137 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3138} 3416}
3139 3417
3153=cut 3431=cut
3154 3432
3155sub register_script_function { 3433sub register_script_function {
3156 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3157 3435
3158 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3160} 3438}
3161 3439
3162=back 3440=back
3163 3441
3164=cut 3442=cut
3173 # for this (global event?) 3451 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3175 3453
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177 3455
3178 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3179 3457
3180 my $facedata; 3458 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 3459
3186 $facedata->{version} == 2 3460 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3188 3462
3189 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3190 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC, 3466 type => FT_RSRC,
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3193 }; 3469 };
3194 cf::cede_to_tick; 3470 cf::cede_to_tick;
3195 3471
3196 { 3472 {
3197 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3199 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3477
3202 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3206 3483
3207 cf::cede_to_tick; 3484 cf::cede_to_tick;
3208 } 3485 }
3209 3486
3210 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3215 3492
3216 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3219 } else { 3496 } else {
3220 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3221 } 3498 }
3222 3499
3223 cf::cede_to_tick; 3500 cf::cede_to_tick;
3224 } 3501 }
3225 } 3502 }
3234 3511
3235 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3236 } 3513 }
3237 3514
3238 { 3515 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3242 3517
3243 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3519 if (defined $info->{type}) {
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3521
3248 if ($info->{type} & 1) { 3522 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}; 3523 cf::face::set_type $idx, $info->{type};
3263 } else { 3524 } else {
3264 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3265 } 3526 }
3266 3527
3267 cf::cede_to_tick; 3528 cf::cede_to_tick;
3268 } 3529 }
3269 } 3530 }
3270 3531
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272 3533
3273 1 3534 1
3274} 3535}
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 3536
3296register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3298 3539
3299 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
3338sub reload_treasures { 3579sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3341} 3582}
3342 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3343sub reload_resources { 3604sub reload_resources {
3344 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3345 3606
3607 reload_exp_table;
3608 reload_materials;
3346 reload_facedata; 3609 reload_facedata;
3610 reload_sound;
3347 reload_archetypes; 3611 reload_archetypes;
3348 reload_regions; 3612 reload_regions;
3349 reload_treasures; 3613 reload_treasures;
3350 3614
3351 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3352} 3616}
3353 3617
3354sub reload_config { 3618sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3619 trace "reloading config file...\n";
3356 or return;
3357 3620
3358 local $/; 3621 my $config = load_file "$CONFDIR/config";
3359 *CFG = YAML::Load <$fh>; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3360 3624
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3626
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $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}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3629
3366 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
3389 3653
3390 seek $fh, 0, 0; 3654 seek $fh, 0, 0;
3391 print $fh $$; 3655 print $fh $$;
3392} 3656}
3393 3657
3658sub main_loop {
3659 trace "EV::loop starting\n";
3660 if (1) {
3661 EV::loop;
3662 }
3663 trace "EV::loop returned\n";
3664 goto &main_loop unless $REALLY_UNLOOP;
3665}
3666
3394sub main { 3667sub main {
3395 cf::init_globals; # initialise logging 3668 cf::init_globals; # initialise logging
3396 3669
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3671 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3673 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 cf::init_block;
3407 3674
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3676
3410 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
3417 }; 3684 };
3418 3685
3419 evthread_start IO::AIO::poll_fileno; 3686 evthread_start IO::AIO::poll_fileno;
3420 3687
3421 cf::sync_job { 3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3695 cf::load_settings;
3696
3422 reload_resources; 3697 reload_resources;
3423 reload_config; 3698 reload_config;
3424 db_init; 3699 db_init;
3425 3700
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid; 3701 cf::init_uuid;
3429 cf::init_signals; 3702 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills; 3703 cf::init_skills;
3432 3704
3433 cf::init_beforeplay; 3705 cf::init_beforeplay;
3434 3706
3435 atomic; 3707 atomic;
3437 load_extensions; 3709 load_extensions;
3438 3710
3439 utime time, time, $RUNTIMEFILE; 3711 utime time, time, $RUNTIMEFILE;
3440 3712
3441 # no (long-running) fork's whatsoever before this point(!) 3713 # no (long-running) fork's whatsoever before this point(!)
3714 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3716
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3717 cf::_post_init 0;
3445 }; 3718 };
3446 3719
3447 EV::loop; 3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3727 goto &main_loop;
3448} 3728}
3449 3729
3450############################################################################# 3730#############################################################################
3451# initialisation and cleanup 3731# initialisation and cleanup
3452 3732
3453# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3454BEGIN { 3734BEGIN {
3455 our %SIGWATCHER = (); 3735 our %SIGWATCHER = ();
3456 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3457 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3458 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3459 }; 3739 };
3460 } 3740 }
3461} 3741}
3462 3742
3463sub write_runtime_sync { 3743sub write_runtime_sync {
3744 my $t0 = AE::time;
3745
3464 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3466 3748
3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3750
3469 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
3470 3752
3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 3754 or return;
3473 3755
3474 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
3489 or return; 3771 or return;
3490 3772
3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3774 and return;
3493 3775
3494 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495 3777
3496 1 3778 1
3497} 3779}
3498 3780
3499our $uuid_lock; 3781our $uuid_lock;
3511 or return; 3793 or return;
3512 3794
3513 my $value = uuid_seq uuid_cur; 3795 my $value = uuid_seq uuid_cur;
3514 3796
3515 unless ($value) { 3797 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n"; 3798 info "cowardly refusing to write zero uuid value!\n";
3517 return; 3799 return;
3518 } 3800 }
3519 3801
3520 my $value = uuid_str $value + $uuid_skip; 3802 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3803 $uuid_skip = 0;
3531 or return; 3813 or return;
3532 3814
3533 aio_rename "$uuid~", $uuid 3815 aio_rename "$uuid~", $uuid
3534 and return; 3816 and return;
3535 3817
3536 warn "uuid file written ($value).\n"; 3818 trace "uuid file written ($value).\n";
3537 3819
3538 1 3820 1
3539 3821
3540} 3822}
3541 3823
3547} 3829}
3548 3830
3549sub emergency_save() { 3831sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3551 3833
3552 warn "emergency_perl_save: enter\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3553 3840
3554 cf::sync_job { 3841 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so 3842 cf::write_runtime_sync; # external watchdog should not bark
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559 3843
3560 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3561 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3562 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3563 warn "emergency_perl_save: begin player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3564 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3565 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3566 $pl->valid or next; 3850 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3568 $pl->save; 3852 $pl->save;
3569 } 3853 }
3570 warn "emergency_perl_save: end player save\n"; 3854 info "emergency_perl_save: end player save\n";
3571 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3572 warn "emergency_perl_save: begin map save\n"; 3858 info "emergency_perl_save: begin map save\n";
3573 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3574 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3575 $map->valid or next; 3861 $map->valid or next;
3576 $map->save; 3862 $map->save;
3577 } 3863 }
3578 warn "emergency_perl_save: end map save\n"; 3864 info "emergency_perl_save: end map save\n";
3579 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3580 warn "emergency_perl_save: begin database checkpoint\n"; 3868 info "emergency_perl_save: begin database checkpoint\n";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3582 warn "emergency_perl_save: end database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3583 3871
3584 warn "emergency_perl_save: begin write uuid\n"; 3872 info "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1; 3873 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n"; 3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3587 }; 3894 };
3588 3895
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3594 warn "emergency_perl_save: leave\n"; 3896 info "emergency_perl_save: leave\n";
3595} 3897}
3596 3898
3597sub post_cleanup { 3899sub post_cleanup {
3598 my ($make_core) = @_; 3900 my ($make_core) = @_;
3599 3901
3902 IO::AIO::flush;
3903
3600 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3601 if $make_core; 3905 if $make_core;
3602 3906
3603 my $fh = pidfile; 3907 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$; 3908 unlink $PIDFILE if <$fh> == $$;
3605} 3909}
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) { 3930 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"}; 3931 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 } 3933 }
3630 warn "cleared package $pkg\n";#d#
3631} 3934}
3632 3935
3633sub do_reload_perl() { 3936sub do_reload_perl() {
3634 # can/must only be called in main 3937 # can/must only be called in main
3635 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3636 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3637 return; 3940 return;
3638 } 3941 }
3639 3942
3640 return if $RELOAD++; 3943 return if $RELOAD++;
3641 3944
3642 my $t1 = EV::time; 3945 my $t1 = AE::time;
3643 3946
3644 while ($RELOAD) { 3947 while ($RELOAD) {
3645 warn "reloading..."; 3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3646 3950
3647 warn "entering sync_job"; 3951 trace "perl_reload: entering sync_job";
3648 3952
3649 cf::sync_job { 3953 cf::sync_job {
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 cf::emergency_save; 3954 #cf::emergency_save;
3652 cf::write_runtime_sync; # external watchdog should not bark
3653 3955
3654 warn "syncing database to disk";
3655 BDB::db_env_txn_checkpoint $DB_ENV;
3656
3657 # if anything goes wrong in here, we should simply crash as we already saved
3658
3659 warn "flushing outstanding aio requests";
3660 while (IO::AIO::nreqs || BDB::nreqs) {
3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3662 }
3663
3664 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3665 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3666 %EXT_CORO = (); 3958 %EXT_CORO = ();
3667 3959
3668 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3669 %COMMAND = (); 3961 %COMMAND = ();
3670 3962
3671 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3672 %EXTCMD = (); 3964 %EXTCMD = ();
3673 %EXTICMD = (); 3965 %EXTICMD = ();
3674 3966
3675 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3676 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3677 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3678 3970
3679 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3680 eval { 3972 eval {
3681 $cb->($pkg); 3973 $cb->($pkg);
3682 1 3974 1
3683 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3684 } 3976 }
3685 3977
3686 warn "... clearing $pkg"; 3978 trace "... clearing $pkg";
3687 clear_package $pkg; 3979 clear_package $pkg;
3688 } 3980 }
3689 3981
3690 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693 3985
3694 warn "... unloading $k"; 3986 trace "... unloading $k";
3695 delete $INC{$k}; 3987 delete $INC{$k};
3696 3988
3697 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3699 3991
3702 } 3994 }
3703 3995
3704 clear_package $k; 3996 clear_package $k;
3705 } 3997 }
3706 3998
3707 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3708 clear_package "safe::$_" 4000 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 4002
3711 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 4006
3715 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3716 # and global variables created in xs 4008 # and global variables created in xs
3717 #clear_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3718 4010
3719 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3720 4012
3721 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3722 require cf; 4014 require cf;
3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3724 4016
3725 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3726 cf::reload_config; 4018 cf::reload_config;
3727 4019
3728 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3729 cf::load_extensions; 4021 cf::load_extensions;
3730 4022
3731 if ($REATTACH_ON_RELOAD) { 4023 if ($REATTACH_ON_RELOAD) {
3732 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3733 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3734 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3735 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3736 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3737 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
3738 } 4030 }
3739 4031
3740 warn "running post_init jobs"; 4032 cf::_post_init 1;
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742 4033
3743 warn "leaving sync_job"; 4034 trace "perl_reload: leaving sync_job";
3744 4035
3745 1 4036 1
3746 } or do { 4037 } or do {
3747 warn $@; 4038 error $@;
3748 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3749 }; 4040 };
3750 4041
3751 warn "reloaded";
3752 --$RELOAD; 4042 --$RELOAD;
3753 } 4043 }
3754 4044
3755 $t1 = EV::time - $t1; 4045 $t1 = AE::time - $t1;
3756 warn "reload completed in ${t1}s\n"; 4046 info "perl_reload: completed in ${t1}s\n";
3757}; 4047};
3758 4048
3759our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3760 4050
3761sub reload_perl() { 4051sub reload_perl() {
3763 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3764 4054
3765 $RELOAD_WATCHER ||= cf::async { 4055 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions; 4056 Coro::AIO::aio_wait cache_extensions;
3767 4057
3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3769 do_reload_perl; 4059 do_reload_perl;
3770 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
3771 }; 4061 };
3772 }; 4062 };
3773} 4063}
3782 reload_perl; 4072 reload_perl;
3783 }; 4073 };
3784 } 4074 }
3785}; 4075};
3786 4076
3787unshift @INC, $LIBDIR; 4077#############################################################################
3788 4078
3789my $bug_warning = 0; 4079my $bug_warning = 0;
3790 4080
3791our @WAIT_FOR_TICK;
3792our @WAIT_FOR_TICK_BEGIN;
3793
3794sub wait_for_tick { 4081sub wait_for_tick() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3796 4083
3797 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3798 push @WAIT_FOR_TICK, $signal;
3799 $signal->wait;
3800} 4085}
3801 4086
3802sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3803 return if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3804 4089
3805 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3806 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3807 $signal->wait; 4092 $signal->wait;
3808} 4093}
3812 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3813 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3814 return; 4099 return;
3815 } 4100 }
3816 4101
3817 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3818 4105
3819 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3821 Coro::async_pool { 4108 Coro::async_pool {
3822 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3823 write_runtime_sync 4110 write_runtime_sync
3824 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3825 }; 4112 };
3826 } 4113 }
3827 4114
3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3829 $sig->send; 4116 $sig->send;
3830 } 4117 }
3831 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3832 $sig->send;
3833 }
3834 4119
3835 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3836 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3837 4122
3838 if (0) { 4123 if (0) {
3839 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3840 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3843 } 4128 }
3844 } 4129 }
3845} 4130}
3846 4131
3847{ 4132{
3848 # configure BDB 4133 # configure BDB
3849 4134
3850 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3851 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3852 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3853 4138
3854 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3855 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3856 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3857 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3892 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3893 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3894 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3895} 4180}
3896 4181
3897my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3898 4184
3899sub _log_backtrace { 4185sub _log_backtrace {
3900 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3901 4187
3902 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3903 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3904 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3905 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3906 ++$_log_backtrace; 4196 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
3908 async { 4198 async {
3909 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3910 4200
3930 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3931 --$_log_backtrace; 4221 --$_log_backtrace;
3932 }; 4222 };
3933 } else { 4223 } else {
3934 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3936 } 4226 }
3937} 4227}
3938 4228
3939# load additional modules 4229# load additional modules
3940use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3941 4232
3942END { cf::emergency_save } 4233END { cf::emergency_save }
3943 4234
39441 42351
3945 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines