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.463 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %RESOURCE; 113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
111 125
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
117our %CFG; 133our %CFG;
118 134
119our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
121our $NOW; 138our $NOW;
122 139
123our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
124our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
125our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
132our $JITTER; # average jitter 149our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
134 151
135our @POST_INIT; 152our @POST_INIT;
136 153
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
138 159
139binmode STDOUT; 160binmode STDOUT;
140binmode STDERR; 161binmode STDERR;
141 162
142# read virtual server time, if available 163# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 165 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
147} 168}
148 169
170eval "sub TICK() { $TICK } 1" or die;
171
149mkdir $_ 172mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 174
152our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
153 176
154sub cf::map::normalise; 177sub cf::map::normalise;
155 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
156############################################################################# 183#############################################################################
157 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
158=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
159 197
160=over 4 198=over 4
161 199
162=item $cf::UPTIME 200=item $cf::UPTIME
163 201
164The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
165 218
166=item $cf::RUNTIME 219=item $cf::RUNTIME
167 220
168The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
169every server tick. 222every server tick.
175Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
176directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
177unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
178database environment. 231database environment.
179 232
180=item $cf::NOW
181
182The time of the last (current) server tick.
183
184=item $cf::TICK
185
186The interval between server ticks, in seconds.
187
188=item $cf::LOADAVG 233=item $cf::LOADAVG
189 234
190The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
191(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
192objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
201from wherever your confdir points to. 246from wherever your confdir points to.
202 247
203=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
204 249
205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
206returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
209=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
210 272
211This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 275that call.
214 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
215=back 283=back
216 284
217=cut 285=cut
218 286
219BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
220 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
221 my $msg = join "", @_; 294 my $msg = join "", @_;
222 295
223 $msg .= "\n" 296 $msg .= "\n"
224 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
225 298
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 300
228 LOG llevError, $msg; 301 LOG llevWarn, $msg;
229 }; 302};
230}
231 303
232$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
234 306
235 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 311 return;#d#
238 }#d# 312 }#d#
239 313
240 # kill coroutine otherwise 314 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 315 Coro::terminate
243}; 316};
244
245$SIG{__DIE__} = sub { }; #d#?
246 317
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 335)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 337}
267 338
268$EV::DIED = sub { 339$EV::DIED = sub {
269 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
270}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
271 347
272############################################################################# 348#############################################################################
273 349
274=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
275 351
296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
297 $d 373 $d
298 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
299} 375}
300 376
377=item $scalar = 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}
1896 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1897 2089
1898 1 2090 1
1899} 2091}
1900 2092
2093# used to laod the header of an original map
1901sub load_header_orig { 2094sub load_header_orig {
1902 my ($self) = @_; 2095 my ($self) = @_;
1903 2096
1904 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1905} 2098}
1906 2099
2100# used to laod the header of an instantiated map
1907sub load_header_temp { 2101sub load_header_temp {
1908 my ($self) = @_; 2102 my ($self) = @_;
1909 2103
1910 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1911} 2105}
1912 2106
2107# called after loading the header from an instantiated map
1913sub prepare_temp { 2108sub prepare_temp {
1914 my ($self) = @_; 2109 my ($self) = @_;
1915 2110
1916 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1917 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1918 # safety 2113 # safety
1919 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1920 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1921} 2116}
1922 2117
2118# called after loading the header from an original map
1923sub prepare_orig { 2119sub prepare_orig {
1924 my ($self) = @_; 2120 my ($self) = @_;
1925 2121
1926 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1927 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1951 2147
1952sub find; 2148sub find;
1953sub find { 2149sub find {
1954 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1955 2151
2152 cf::cede_to_tick;
2153
1956 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1957 2155
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2158
1961 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1978 2176
1979 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1980 } 2178 }
1981} 2179}
1982 2180
1983sub pre_load { } 2181sub pre_load { }
1984sub post_load { } 2182#sub post_load { } # XS
1985 2183
1986sub load { 2184sub load {
1987 my ($self) = @_; 2185 my ($self) = @_;
1988 2186
1989 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1992 2190
1993 { 2191 {
1994 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1995 2193
1996 return unless $self->valid; 2194 return unless $self->valid;
1997 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
1998
1999 $self->in_memory (cf::MAP_LOADING);
2000 2196
2001 $self->alloc; 2197 $self->alloc;
2002 2198
2003 $self->pre_load; 2199 $self->pre_load;
2004 cf::cede_to_tick; 2200 cf::cede_to_tick;
2005 2201
2202 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2204 $f->skip_block;
2008 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2009 or return; 2206 or return;
2010 2207
2011 $self->post_load_original 2208 $self->post_load_original
2012 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2013 2210
2014 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2212 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2215 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2021 } 2219 }
2022 } 2220 }
2023 }
2024 2221
2025 $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);
2026 2229
2027 cf::cede_to_tick; 2230 cf::cede_to_tick;
2028 # now do the right thing for maps 2231 # now do the right thing for maps
2029 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2034 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2238 $self->decay_objects;
2036 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2037 $self->update_buttons; 2240 $self->update_buttons;
2038 cf::cede_to_tick; 2241 cf::cede_to_tick;
2039 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2040 } 2243 }
2041 2244
2042 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2044
2045 $self->in_memory (cf::MAP_ACTIVE);
2046 } 2247 }
2047 2248
2048 $self->post_load; 2249 $self->post_load;
2049}
2050 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
2051sub customise_for { 2257sub customise_for {
2052 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2053 2259
2054 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2261 if $self->per_player;
2058# if $self->per_party; 2264# if $self->per_party;
2059 2265
2060 $self 2266 $self
2061} 2267}
2062 2268
2063# find and load all maps in the 3x3 area around a map
2064sub load_neighbours {
2065 my ($map) = @_;
2066
2067 my @neigh; # diagonal neighbours
2068
2069 for (0 .. 3) {
2070 my $neigh = $map->tile_path ($_)
2071 or next;
2072 $neigh = find $neigh, $map
2073 or next;
2074 $neigh->load;
2075
2076 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 }
2080
2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
2083 my $neigh = find $path, $origin
2084 or next;
2085 $neigh->load;
2086 }
2087}
2088
2089sub find_sync { 2269sub find_sync {
2090 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2091 2271
2092 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
2093} 2277}
2094 2278
2095sub do_load_sync { 2279sub do_load_sync {
2096 my ($map) = @_; 2280 my ($map) = @_;
2097 2281
2282 # it's a bug to call this from the main context
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2100 2285
2101 cf::sync_job { $map->load }; 2286 $map->load;
2102} 2287}
2103 2288
2104our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2106 2291
2107sub find_async { 2292sub find_async {
2108 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2109 2294
2110 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2111 2296
2112 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2114 } 2299 }
2115 2300
2116 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2117 2302
2118 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2132 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2133 2318
2134 () 2319 ()
2135} 2320}
2136 2321
2322# common code, used by both ->save and ->swapout
2137sub save { 2323sub _save {
2138 my ($self) = @_; 2324 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2325
2142 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2143 2327
2144 return unless $self->dirty; 2328 return unless $self->dirty;
2145 2329
2165 } else { 2349 } else {
2166 $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);
2167 } 2351 }
2168} 2352}
2169 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2170sub swap_out { 2362sub swap_out {
2171 my ($self) = @_; 2363 my ($self) = @_;
2172 2364
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2178 return if $self->players; 2369 return if $self->players;
2179 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
2180 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2181 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
2182 $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};
2183 2421
2184 $self->deactivate; 2422 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2424 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2425
2232 $self->unlink_save; 2426 $self->unlink_save;
2233 $self->destroy; 2427 $self->destroy;
2234} 2428}
2235 2429
2243 2437
2244 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2245 2439
2246 $self->unlink_save; 2440 $self->unlink_save;
2247 2441
2248 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2447
2310 : normalise $_ 2504 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2506 ]
2313} 2507}
2314 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
2315=back 2541=back
2316 2542
2317=head3 cf::object 2543=head3 cf::object
2318 2544
2319=cut 2545=cut
2384 2610
2385our $SAY_CHANNEL = { 2611our $SAY_CHANNEL = {
2386 id => "say", 2612 id => "say",
2387 title => "Map", 2613 title => "Map",
2388 reply => "say ", 2614 reply => "say ",
2389 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.",
2390}; 2616};
2391 2617
2392our $CHAT_CHANNEL = { 2618our $CHAT_CHANNEL = {
2393 id => "chat", 2619 id => "chat",
2394 title => "Chat", 2620 title => "Chat",
2451 2677
2452Freezes 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}>).
2453 2679
2454The 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.
2455for 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,
2456though, 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
2457map. 2683map.
2458 2684
2459Will never block. 2685Will never block.
2460 2686
2461=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2483 my ($self) = @_; 2709 my ($self) = @_;
2484 2710
2485 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2486 2712
2713 ++$self->{_link_recursion};
2714
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2716
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2491 2719
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2721}
2494 2722
2495sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2497 2725
2514 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2516 2744
2517 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2520 2748
2521 $map->load; 2749 $map->load;
2522 $map->load_neighbours;
2523 2750
2524 return unless $self->contr->active; 2751 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2752
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2530} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2531 2760
2761}
2762
2532=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)]])
2533 2764
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2544 2775
2545our $GOTOGEN; 2776our $GOTOGEN;
2546 2777
2547sub cf::object::player::goto { 2778sub cf::object::player::goto {
2548 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 }
2549 2786
2550 # 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
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2789
2553 $self->enter_link; 2790 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2574 } 2811 }
2575 } 2812 }
2576 2813
2577 my $map = eval { 2814 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2816
2580 if ($map) { 2817 if ($map) {
2581 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2820 } else {
2584 $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);
2585 } 2822 }
2586 2823
2587 $map 2824 $map
2595 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2598 } 2835 }
2599 2836
2600 $done->() if $done; 2837 $done->($self) if $done;
2601 })->prio (1); 2838 })->prio (1);
2602} 2839}
2603 2840
2604=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2605 2842
2673 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2674 2911
2675 unless (eval { 2912 unless (eval {
2676 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2677 2914
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2687 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2688 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 }
2689 2941
2690 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2691 2943
2692 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2698 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "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. "
2700 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2954
2703 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2956 $self->leave_link;
2705 } 2957 }
2706 })->prio (1); 2958 })->prio (1);
2707} 2959}
2708 2960
2720sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2722 2974
2723 utf8::encode $text; 2975 utf8::encode $text;
2724 $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);
2725} 3002}
2726 3003
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 3005
2729Send 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
2733 3010
2734=cut 3011=cut
2735 3012
2736# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2738 "c/identify" => { 3021 "c/identify" => {
2739 id => "infobox", 3022 id => "infobox",
2740 title => "Identify", 3023 title => "Identify",
2741 reply => undef, 3024 reply => undef,
2742 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2744 "c/examine" => { 3027 "c/examine" => {
2745 id => "infobox", 3028 id => "infobox",
2746 title => "Examine", 3029 title => "Examine",
2747 reply => undef, 3030 reply => undef,
2748 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",
2749 }, 3038 },
2750 "c/book" => { 3039 "c/book" => {
2751 id => "infobox", 3040 id => "infobox",
2752 title => "Book", 3041 title => "Book",
2753 reply => undef, 3042 reply => undef,
2769 id => "infobox", 3058 id => "infobox",
2770 title => "Body Parts", 3059 title => "Body Parts",
2771 reply => undef, 3060 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 3061 tooltip => "Shows which body parts you posess and are available",
2773 }, 3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
2774 "c/skills" => { 3069 "c/skills" => {
2775 id => "infobox", 3070 id => "infobox",
2776 title => "Skills", 3071 title => "Skills",
2777 reply => undef, 3072 reply => undef,
2778 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",
2779 }, 3098 },
2780 "c/uptime" => { 3099 "c/uptime" => {
2781 id => "infobox", 3100 id => "infobox",
2782 title => "Uptime", 3101 title => "Uptime",
2783 reply => undef, 3102 reply => undef,
2793 id => "party", 3112 id => "party",
2794 title => "Party", 3113 title => "Party",
2795 reply => "gsay ", 3114 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 3115 tooltip => "Messages and chat related to your party",
2797 }, 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 },
2798 "c/say" => $SAY_CHANNEL, 3123 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 3124 "c/chat" => $CHAT_CHANNEL,
2800); 3125);
2801 3126
2802sub cf::client::send_msg { 3127sub cf::client::send_msg {
2833 my $pkt = "msg " 3158 my $pkt = "msg "
2834 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2835 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2836 ); 3161 );
2837 3162
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if (8192 < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt); 3163 $self->send_big_packet ($pkt);
2849} 3164}
2850 3165
2851=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2852 3167
2853Sends an ext event to the client. 3168Sends an ext event to the client.
2856 3171
2857sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2858 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2859 3174
2860 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2862 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2863 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2865 } 3180 }
2866} 3181}
2867 3182
2868=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2869 3184
2872=cut 3187=cut
2873 3188
2874sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2875 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2876 3191
2877 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2878 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2879 } elsif ($self->extcmd == 1) {
2880 #TODO: version 1, remove
2881 unshift @msg, msgtype => "reply", msgid => $id;
2882 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2883 }
2884} 3195}
2885 3196
2886=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2887 3198
2888Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2943 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2944 3255
2945 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2946 3257
2947 if (ref $msg) { 3258 if (ref $msg) {
2948 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2949 "ARRAY" eq ref $msg
2950 ? @$msg
2951 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2952 3260
2953 my @reply; 3261 my @reply;
2954 3262
2955 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2956 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2958 3266
2959 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2960 if $reply; 3268 if $reply;
2961 3269
2962 } else { 3270 } else {
2963 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";
2964 } 3272 }
2965 3273
2966 cf::override; 3274 cf::override;
2967 }, 3275 },
2968); 3276);
2988 3296
2989 $coro 3297 $coro
2990} 3298}
2991 3299
2992cf::client->attach ( 3300cf::client->attach (
2993 on_destroy => sub { 3301 on_client_destroy => sub {
2994 my ($ns) = @_; 3302 my ($ns) = @_;
2995 3303
2996 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2997 }, 3305 },
2998); 3306);
3014our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3015 3323
3016$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3017 3325
3018$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3019 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3020 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3021 sort time 3329 sort time
3022)); 3330));
3023 3331
3024# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3028The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
3029 3337
3030 cf::object 3338 cf::object
3031 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
3032 insert remove name archname title slaying race decrease split 3340 insert remove name archname title slaying race decrease split
3341 value
3033 3342
3034 cf::object::player 3343 cf::object::player
3035 player 3344 player
3036 3345
3037 cf::player 3346 cf::player
3043=cut 3352=cut
3044 3353
3045for ( 3354for (
3046 ["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
3047 insert remove inv nrof name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
3048 decrease split destroy change_exp)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3049 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3050 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
3051 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3052) { 3361) {
3053 no strict 'refs';
3054 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3055 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3056 for @funs; 3364 for @funs;
3057} 3365}
3058 3366
3073 3381
3074 my $qcode = $code; 3382 my $qcode = $code;
3075 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3076 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3077 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
3078 local $_; 3389 local $_;
3079 local @safe::cf::_safe_eval_args = values %vars;
3080 3390
3081 my $eval = 3391 my $eval =
3082 "do {\n" 3392 "do {\n"
3083 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3084 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3085 . $code 3395 . $code
3086 . "\n}" 3396 . "\n}"
3087 ; 3397 ;
3088 3398
3399 if ($CFG{safe_eval}) {
3089 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3090 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3091 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 }
3092 3408
3093 if ($@) { 3409 if ($@) {
3094 warn "$@"; 3410 warn "$@",
3095 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3096 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3097 } 3413 }
3098 3414
3099 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3100} 3416}
3101 3417
3115=cut 3431=cut
3116 3432
3117sub register_script_function { 3433sub register_script_function {
3118 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3119 3435
3120 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3121 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3122} 3438}
3123 3439
3124=back 3440=back
3125 3441
3126=cut 3442=cut
3135 # for this (global event?) 3451 # for this (global event?)
3136 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3137 3453
3138 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3139 3455
3140 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3141 3457
3142 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3143 0 < aio_load $path, $facedata
3144 or die "$path: $!";
3145
3146 $facedata = Coro::Storable::thaw $facedata;
3147 3459
3148 $facedata->{version} == 2 3460 $facedata->{version} == 2
3149 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3150 3462
3151 # 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]);
3152 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3153 type => FT_RSRC, 3466 type => FT_RSRC,
3154 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),
3155 }; 3469 };
3156 cf::cede_to_tick; 3470 cf::cede_to_tick;
3157 3471
3158 { 3472 {
3159 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3161 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3162 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3163 3477
3164 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3165 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3166 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3167 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} ;
3168 3483
3169 cf::cede_to_tick; 3484 cf::cede_to_tick;
3170 } 3485 }
3171 3486
3172 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3177 3492
3178 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3179 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3180 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3181 } else { 3496 } else {
3182 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3183 } 3498 }
3184 3499
3185 cf::cede_to_tick; 3500 cf::cede_to_tick;
3186 } 3501 }
3187 } 3502 }
3196 3511
3197 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3198 } 3513 }
3199 3514
3200 { 3515 {
3201 # TODO: for gcfclient pleasure, we should give resources
3202 # that gcfclient doesn't grok a >10000 face index.
3203 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3204 3517
3205 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3206 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3207 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3208 my $data;
3209 3522
3210 if ($info->{type} & 1) { 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3211 # prepend meta info
3212
3213 my $meta = $enc->encode ({
3214 name => $name,
3215 %{ $info->{meta} || {} },
3216 });
3217
3218 $data = pack "(w/a*)*", $meta, $info->{data};
3219 } else {
3220 $data = $info->{data};
3221 }
3222
3223 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3224 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3225 } else { 3526 } else {
3226 $RESOURCE{$name} = $info; 3527# $RESOURCE{$name} = $info; # unused
3227 } 3528 }
3228 3529
3229 cf::cede_to_tick; 3530 cf::cede_to_tick;
3230 } 3531 }
3231 } 3532 }
3232 3533
3233 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3234 3535
3235 1 3536 1
3236} 3537}
3237
3238cf::global->attach (on_resource_update => sub {
3239 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3240 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3241
3242 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3243 my $sound = $soundconf->{compat}[$_]
3244 or next;
3245
3246 my $face = cf::face::find "sound/$sound->[1]";
3247 cf::sound::set $sound->[0] => $face;
3248 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3249 }
3250
3251 while (my ($k, $v) = each %{$soundconf->{event}}) {
3252 my $face = cf::face::find "sound/$v";
3253 cf::sound::set $k => $face;
3254 }
3255 }
3256});
3257 3538
3258register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
3259 my ($ns, $want) = @_; 3540 my ($ns, $want) = @_;
3260 3541
3261 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
3300sub reload_treasures { 3581sub reload_treasures {
3301 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3302 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3303} 3584}
3304 3585
3586sub reload_sound {
3587 trace "loading sound config from $DATADIR/sound\n";
3588
3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3590
3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3592 my $sound = $soundconf->{compat}[$_]
3593 or next;
3594
3595 my $face = cf::face::find "sound/$sound->[1]";
3596 cf::sound::set $sound->[0] => $face;
3597 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3598 }
3599
3600 while (my ($k, $v) = each %{$soundconf->{event}}) {
3601 my $face = cf::face::find "sound/$v";
3602 cf::sound::set $k => $face;
3603 }
3604}
3605
3305sub reload_resources { 3606sub reload_resources {
3306 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3307 3608
3609 reload_exp_table;
3610 reload_materials;
3308 reload_facedata; 3611 reload_facedata;
3612 reload_sound;
3309 reload_archetypes; 3613 reload_archetypes;
3310 reload_regions; 3614 reload_regions;
3311 reload_treasures; 3615 reload_treasures;
3312 3616
3313 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
3314} 3618}
3315 3619
3316sub reload_config { 3620sub reload_config {
3317 open my $fh, "<:utf8", "$CONFDIR/config" 3621 trace "reloading config file...\n";
3318 or return;
3319 3622
3320 local $/; 3623 my $config = load_file "$CONFDIR/config";
3321 *CFG = YAML::Load <$fh>; 3624 utf8::decode $config;
3625 *CFG = decode_yaml $config;
3322 3626
3323 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3324 3628
3325 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3326 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3327 3631
3328 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
3351 3655
3352 seek $fh, 0, 0; 3656 seek $fh, 0, 0;
3353 print $fh $$; 3657 print $fh $$;
3354} 3658}
3355 3659
3660sub main_loop {
3661 trace "EV::loop starting\n";
3662 if (1) {
3663 EV::loop;
3664 }
3665 trace "EV::loop returned\n";
3666 goto &main_loop unless $REALLY_UNLOOP;
3667}
3668
3356sub main { 3669sub main {
3357 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3358 3671
3359 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3360 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3361 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3362 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3363
3364 cf::init_experience;
3365 cf::init_anim;
3366 cf::init_attackmess;
3367 cf::init_dynamic;
3368 3676
3369 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3370 3678
3371 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
3372 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
3378 }; 3686 };
3379 3687
3380 evthread_start IO::AIO::poll_fileno; 3688 evthread_start IO::AIO::poll_fileno;
3381 3689
3382 cf::sync_job { 3690 cf::sync_job {
3691 cf::incloader::init ();
3692
3693 cf::init_anim;
3694 cf::init_attackmess;
3695 cf::init_dynamic;
3696
3697 cf::load_settings;
3698
3383 reload_resources; 3699 reload_resources;
3384 reload_config; 3700 reload_config;
3385 db_init; 3701 db_init;
3386 3702
3387 cf::load_settings;
3388 cf::load_materials;
3389 cf::init_uuid; 3703 cf::init_uuid;
3390 cf::init_signals; 3704 cf::init_signals;
3391 cf::init_commands;
3392 cf::init_skills; 3705 cf::init_skills;
3393 3706
3394 cf::init_beforeplay; 3707 cf::init_beforeplay;
3395 3708
3396 atomic; 3709 atomic;
3398 load_extensions; 3711 load_extensions;
3399 3712
3400 utime time, time, $RUNTIMEFILE; 3713 utime time, time, $RUNTIMEFILE;
3401 3714
3402 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3716 use POSIX ();
3403 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3404 3718
3405 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3406 }; 3720 };
3407 3721
3408 EV::loop; 3722 cf::object::thawer::errors_are_fatal 0;
3723 info "parse errors in files are no longer fatal from this point on.\n";
3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3729 goto &main_loop;
3409} 3730}
3410 3731
3411############################################################################# 3732#############################################################################
3412# initialisation and cleanup 3733# initialisation and cleanup
3413 3734
3414# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3415BEGIN { 3736BEGIN {
3416 our %SIGWATCHER = (); 3737 our %SIGWATCHER = ();
3417 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3418 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3419 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3420 }; 3741 };
3421 } 3742 }
3422} 3743}
3423 3744
3424sub write_runtime_sync { 3745sub write_runtime_sync {
3746 my $t0 = AE::time;
3747
3425 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3426 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3427 3750
3428 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3429 3752
3430 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
3431 3754
3432 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3433 or return; 3756 or return;
3434 3757
3435 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
3436 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
3437 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
3450 or return; 3773 or return;
3451 3774
3452 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3453 and return; 3776 and return;
3454 3777
3455 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3456 3779
3457 1 3780 1
3458} 3781}
3459 3782
3460our $uuid_lock; 3783our $uuid_lock;
3472 or return; 3795 or return;
3473 3796
3474 my $value = uuid_seq uuid_cur; 3797 my $value = uuid_seq uuid_cur;
3475 3798
3476 unless ($value) { 3799 unless ($value) {
3477 warn "cowardly refusing to write zero uuid value!\n"; 3800 info "cowardly refusing to write zero uuid value!\n";
3478 return; 3801 return;
3479 } 3802 }
3480 3803
3481 my $value = uuid_str $value + $uuid_skip; 3804 my $value = uuid_str $value + $uuid_skip;
3482 $uuid_skip = 0; 3805 $uuid_skip = 0;
3492 or return; 3815 or return;
3493 3816
3494 aio_rename "$uuid~", $uuid 3817 aio_rename "$uuid~", $uuid
3495 and return; 3818 and return;
3496 3819
3497 warn "uuid file written ($value).\n"; 3820 trace "uuid file written ($value).\n";
3498 3821
3499 1 3822 1
3500 3823
3501} 3824}
3502 3825
3508} 3831}
3509 3832
3510sub emergency_save() { 3833sub emergency_save() {
3511 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3512 3835
3513 warn "emergency_perl_save: enter\n"; 3836 info "emergency_perl_save: enter\n";
3837
3838 # this is a trade-off: we want to be very quick here, so
3839 # save all maps without fsync, and later call a global sync
3840 # (which in turn might be very very slow)
3841 local $USE_FSYNC = 0;
3514 3842
3515 cf::sync_job { 3843 cf::sync_job {
3516 # this is a trade-off: we want to be very quick here, so 3844 cf::write_runtime_sync; # external watchdog should not bark
3517 # save all maps without fsync, and later call a global sync
3518 # (which in turn might be very very slow)
3519 local $USE_FSYNC = 0;
3520 3845
3521 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3524 warn "emergency_perl_save: begin player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3852 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3854 $pl->save;
3530 } 3855 }
3531 warn "emergency_perl_save: end player save\n"; 3856 info "emergency_perl_save: end player save\n";
3532 3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3533 warn "emergency_perl_save: begin map save\n"; 3860 info "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3863 $map->valid or next;
3537 $map->save; 3864 $map->save;
3538 } 3865 }
3539 warn "emergency_perl_save: end map save\n"; 3866 info "emergency_perl_save: end map save\n";
3540 3867
3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3541 warn "emergency_perl_save: begin database checkpoint\n"; 3870 info "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "emergency_perl_save: end database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3544 3873
3545 warn "emergency_perl_save: begin write uuid\n"; 3874 info "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3875 write_uuid_sync 1;
3547 warn "emergency_perl_save: end write uuid\n"; 3876 info "emergency_perl_save: end write uuid\n";
3877
3878 cf::write_runtime_sync; # external watchdog should not bark
3879
3880 trace "emergency_perl_save: syncing database to disk";
3881 BDB::db_env_txn_checkpoint $DB_ENV;
3882
3883 info "emergency_perl_save: starting sync\n";
3884 IO::AIO::aio_sync sub {
3885 info "emergency_perl_save: finished sync\n";
3886 };
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3889
3890 trace "emergency_perl_save: flushing outstanding aio requests";
3891 while (IO::AIO::nreqs || BDB::nreqs) {
3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3893 }
3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3548 }; 3896 };
3549 3897
3550 warn "emergency_perl_save: starting sync()\n";
3551 IO::AIO::aio_sync sub {
3552 warn "emergency_perl_save: finished sync()\n";
3553 };
3554
3555 warn "emergency_perl_save: leave\n"; 3898 info "emergency_perl_save: leave\n";
3556} 3899}
3557 3900
3558sub post_cleanup { 3901sub post_cleanup {
3559 my ($make_core) = @_; 3902 my ($make_core) = @_;
3560 3903
3904 IO::AIO::flush;
3905
3561 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3562 if $make_core; 3907 if $make_core;
3563 3908
3564 my $fh = pidfile; 3909 my $fh = pidfile;
3565 unlink $PIDFILE if <$fh> == $$; 3910 unlink $PIDFILE if <$fh> == $$;
3566} 3911}
3586 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3587 for my $name (keys %$leaf_symtab) { 3932 for my $name (keys %$leaf_symtab) {
3588 _gv_clear *{"$pkg$name"}; 3933 _gv_clear *{"$pkg$name"};
3589# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3590 } 3935 }
3591 warn "cleared package $pkg\n";#d#
3592} 3936}
3593 3937
3594sub do_reload_perl() { 3938sub do_reload_perl() {
3595 # can/must only be called in main 3939 # can/must only be called in main
3596 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3597 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3598 return; 3942 return;
3599 } 3943 }
3600 3944
3601 return if $RELOAD++; 3945 return if $RELOAD++;
3602 3946
3603 my $t1 = EV::time; 3947 my $t1 = AE::time;
3604 3948
3605 while ($RELOAD) { 3949 while ($RELOAD) {
3606 warn "reloading..."; 3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3607 3952
3608 warn "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3609 3954
3610 cf::sync_job { 3955 cf::sync_job {
3611 cf::write_runtime_sync; # external watchdog should not bark
3612 cf::emergency_save; 3956 #cf::emergency_save;
3613 cf::write_runtime_sync; # external watchdog should not bark
3614 3957
3615 warn "syncing database to disk";
3616 BDB::db_env_txn_checkpoint $DB_ENV;
3617
3618 # if anything goes wrong in here, we should simply crash as we already saved
3619
3620 warn "flushing outstanding aio requests";
3621 while (IO::AIO::nreqs || BDB::nreqs) {
3622 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3623 }
3624
3625 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3626 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3627 %EXT_CORO = (); 3960 %EXT_CORO = ();
3628 3961
3629 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3630 %COMMAND = (); 3963 %COMMAND = ();
3631 3964
3632 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3633 %EXTCMD = (); 3966 %EXTCMD = ();
3634 %EXTICMD = (); 3967 %EXTICMD = ();
3635 3968
3636 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3637 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3638 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3639 3972
3640 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3641 eval { 3974 eval {
3642 $cb->($pkg); 3975 $cb->($pkg);
3643 1 3976 1
3644 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3645 } 3978 }
3646 3979
3647 warn "... clearing $pkg"; 3980 trace "... clearing $pkg";
3648 clear_package $pkg; 3981 clear_package $pkg;
3649 } 3982 }
3650 3983
3651 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3652 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3653 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3654 3987
3655 warn "... unloading $k"; 3988 trace "... unloading $k";
3656 delete $INC{$k}; 3989 delete $INC{$k};
3657 3990
3658 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3659 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3660 3993
3663 } 3996 }
3664 3997
3665 clear_package $k; 3998 clear_package $k;
3666 } 3999 }
3667 4000
3668 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3669 clear_package "safe::$_" 4002 clear_package "safe::$_"
3670 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3671 4004
3672 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3673 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3674 delete $INC{"cf/pod.pm"}; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3675 4008
3676 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3677 # and global variables created in xs 4010 # and global variables created in xs
3678 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3679 4012
3680 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3681 4014
3682 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3683 require cf; 4016 require cf;
3684 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4017 cf::_connect_to_perl_1;
3685 4018
3686 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3687 cf::reload_config; 4020 cf::reload_config;
3688 4021
3689 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3690 cf::load_extensions; 4023 cf::load_extensions;
3691 4024
3692 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3696 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3699 } 4032 }
3700 4033
3701 warn "running post_init jobs"; 4034 cf::_post_init 1;
3702 (pop @POST_INIT)->(1) while @POST_INIT;
3703 4035
3704 warn "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3705 4037
3706 1 4038 1
3707 } or do { 4039 } or do {
3708 warn $@; 4040 error $@;
3709 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3710 }; 4042 };
3711 4043
3712 warn "reloaded";
3713 --$RELOAD; 4044 --$RELOAD;
3714 } 4045 }
3715 4046
3716 $t1 = EV::time - $t1; 4047 $t1 = AE::time - $t1;
3717 warn "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3718}; 4049};
3719 4050
3720our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3721 4052
3722sub reload_perl() { 4053sub reload_perl() {
3724 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3725 4056
3726 $RELOAD_WATCHER ||= cf::async { 4057 $RELOAD_WATCHER ||= cf::async {
3727 Coro::AIO::aio_wait cache_extensions; 4058 Coro::AIO::aio_wait cache_extensions;
3728 4059
3729 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3730 do_reload_perl; 4061 do_reload_perl;
3731 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3732 }; 4063 };
3733 }; 4064 };
3734} 4065}
3743 reload_perl; 4074 reload_perl;
3744 }; 4075 };
3745 } 4076 }
3746}; 4077};
3747 4078
3748unshift @INC, $LIBDIR; 4079#############################################################################
3749 4080
3750my $bug_warning = 0; 4081my $bug_warning = 0;
3751 4082
3752our @WAIT_FOR_TICK;
3753our @WAIT_FOR_TICK_BEGIN;
3754
3755sub wait_for_tick { 4083sub wait_for_tick() {
3756 return if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3757 4085
3758 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3759 push @WAIT_FOR_TICK, $signal;
3760 $signal->wait;
3761} 4087}
3762 4088
3763sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3764 return if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3765 4091
3766 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3767 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3768 $signal->wait; 4094 $signal->wait;
3769} 4095}
3773 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3774 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3775 return; 4101 return;
3776 } 4102 }
3777 4103
3778 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4105
4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3779 4107
3780 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3781 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3782 Coro::async_pool { 4110 Coro::async_pool {
3783 $Coro::current->{desc} = "runtime saver"; 4111 $Coro::current->{desc} = "runtime saver";
3784 write_runtime_sync 4112 write_runtime_sync
3785 or warn "ERROR: unable to write runtime file: $!"; 4113 or error "ERROR: unable to write runtime file: $!";
3786 }; 4114 };
3787 } 4115 }
3788 4116
3789 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3790 $sig->send; 4118 $sig->send;
3791 } 4119 }
3792 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3793 $sig->send;
3794 }
3795 4121
3796 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3797 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3798 4124
3799 if (0) { 4125 if (0) {
3800 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3801 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3802 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3803 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3804 } 4130 }
3805 } 4131 }
3806} 4132}
3807 4133
3808{ 4134{
3809 # configure BDB 4135 # configure BDB
3810 4136
3811 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3812 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3813 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3814 4140
3815 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3816 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3817 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3818 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3853 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3854 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3855 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
3856} 4182}
3857 4183
3858my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3859 4186
3860sub _log_backtrace { 4187sub _log_backtrace {
3861 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3862 4189
3863 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3864 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3865 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3866 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3867 ++$_log_backtrace; 4198 ++$_log_backtrace;
3868 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
3869 async { 4200 async {
3870 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3871 4202
3891 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3892 --$_log_backtrace; 4223 --$_log_backtrace;
3893 }; 4224 };
3894 } else { 4225 } else {
3895 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3896 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3897 } 4228 }
3898} 4229}
3899 4230
3900# load additional modules 4231# load additional modules
3901use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3902 4234
3903END { cf::emergency_save } 4235END { cf::emergency_save }
3904 4236
39051 42371
3906 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines