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.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %RESOURCE; 113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default 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
117our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 132
119our %CFG; 133our %CFG;
120 134
121our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
123our $NOW; 138our $NOW;
124 139
125our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
126our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
127our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
134our $JITTER; # average jitter 149our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
136 151
137our @POST_INIT; 152our @POST_INIT;
138 153
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
140 159
141binmode STDOUT; 160binmode STDOUT;
142binmode STDERR; 161binmode STDERR;
143 162
144# read virtual server time, if available 163# read virtual server time, if available
155 174
156our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
157 176
158sub cf::map::normalise; 177sub cf::map::normalise;
159 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
160############################################################################# 183#############################################################################
161 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
162=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
163 197
164=over 4 198=over 4
165 199
166=item $cf::UPTIME 200=item $cf::UPTIME
167 201
168The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
169 218
170=item $cf::RUNTIME 219=item $cf::RUNTIME
171 220
172The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
173every server tick. 222every server tick.
179Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
180directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
181unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
182database environment. 231database environment.
183 232
184=item $cf::NOW
185
186The time of the last (current) server tick.
187
188=item $cf::TICK
189
190The interval between server ticks, in seconds.
191
192=item $cf::LOADAVG 233=item $cf::LOADAVG
193 234
194The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
195(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
196objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
205from wherever your confdir points to. 246from wherever your confdir points to.
206 247
207=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
208 249
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
210returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
213=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
214 272
215This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 275that call.
218 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
219=back 283=back
220 284
221=cut 285=cut
222 286
223BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 294 my $msg = join "", @_;
226 295
227 $msg .= "\n" 296 $msg .= "\n"
228 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
229 298
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 300
232 LOG llevError, $msg; 301 LOG llevWarn, $msg;
233 }; 302};
234}
235 303
236$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
238 306
239 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 311 return;#d#
242 }#d# 312 }#d#
243 313
244 # kill coroutine otherwise 314 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 315 Coro::terminate
247}; 316};
248
249$SIG{__DIE__} = sub { }; #d#?
250 317
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 335)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 337}
271 338
272$EV::DIED = sub { 339$EV::DIED = sub {
273 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
274}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
275 347
276############################################################################# 348#############################################################################
277 349
278=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
279 351
300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
301 $d 373 $d
302 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
303} 375}
304 376
377=item $scalar = 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
305=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
306 392
307Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
308 394
309=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
315our $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
316 402
317sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
319 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
320=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
321 438
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
324 441
325The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 443is a reload or not.
327 444
328=cut 445=cut
329 446
330sub post_init(&) { 447sub post_init(&) {
331 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 }
332} 466}
333 467
334=item cf::lock_wait $string 468=item cf::lock_wait $string
335 469
336Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
375} 509}
376 510
377=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
378 512
379Like 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
380get spread over timer. 514get spread over time.
381 515
382=cut 516=cut
383 517
384sub periodic($$) { 518sub periodic($$) {
385 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
389 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
390} 524}
391 525
392=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
393 527
394Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
395This 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
396of 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.
397 535
398The 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
399used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
400 538
401Useful for short background jobs. 539Useful for short background jobs.
402 540
403=cut 541=cut
404 542
405our @SLOT_QUEUE; 543our @SLOT_QUEUE;
406our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
407 546
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
411 550
412 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
413 553
414 while () { 554 while () {
415 next_job: 555 next_job:
556
416 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 558
418 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 563 $job->[2]->send;
422 Coro::cede; 564 Coro::cede;
423 goto next_job; 565 goto next_job;
424 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 568 }
426 } 569 }
427 570
428 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
431 $signal->wait;
432 } else { 574 } else {
575 $busy = 0;
433 Coro::schedule; 576 Coro::schedule;
434 } 577 }
435 } 578 }
436}; 579};
437 580
438sub get_slot($;$$) { 581sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
440 583
441 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
442 585
443 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
444 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
445 589
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
474=cut 618=cut
475 619
476sub sync_job(&) { 620sub sync_job(&) {
477 my ($job) = @_; 621 my ($job) = @_;
478 622
479 if ($Coro::current == $Coro::main) { 623 if (in_main) {
480 my $time = EV::time; 624 my $time = AE::time;
481 625
482 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
484 628
485 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
486 630
487 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
488 632
489 my $busy = 1; 633 my $busy = 1;
490 my @res; 634 my @res;
491 635
492 (async { 636 (async {
493 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 638 @res = eval { $job->() };
495 warn $@ if $@; 639 error $@ if $@;
496 undef $busy; 640 undef $busy;
497 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
498 642
499 while ($busy) { 643 while ($busy) {
500 if (Coro::nready) { 644 if (Coro::nready) {
502 } else { 646 } else {
503 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
504 } 648 }
505 } 649 }
506 650
507 my $time = EV::time - $time; 651 my $time = AE::time - $time;
508 652
509 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
510 654
511 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
512 } else { 656 } else {
534 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
535 679
536 $coro 680 $coro
537} 681}
538 682
539=item fork_call { }, $args 683=item fork_call { }, @args
540 684
541Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 688never block itself or use any form of event handling.
545 689
546=cut 690=cut
547 691
692sub post_fork {
693 reset_signals;
694}
695
548sub fork_call(&@) { 696sub fork_call(&@) {
549 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
550 698
551 # 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,
552 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
554 702
555 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
556 reset_signals; 704 cf::post_fork;
557 &$cb 705 &$cb
558 }, @args; 706 } @args;
559 707
560 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 )
561} 720}
562 721
563=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
564 723
565=cut 724=cut
602within each server. 761within each server.
603 762
604=cut 763=cut
605 764
606sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
607 my ($name) = @_; 769 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
609 771
610 eval { 772 eval {
611 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
621} 783}
622 784
623our $DB; 785our $DB;
624 786
625sub db_init { 787sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
628 };
629} 789}
630 790
631sub db_get($$) { 791sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
633 793
634 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
635 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
636 798
637 $! ? () 799 $! ? ()
638 : $data 800 : $data
639 }
640} 801}
641 802
642sub db_put($$$) { 803sub db_put($$$) {
643 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
672 833
673 my @data; 834 my @data;
674 my $md5; 835 my $md5;
675 836
676 for (0 .. $#$src) { 837 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
678 or Carp::croak "$src->[$_]: $!";
679 } 839 }
680 840
681 # if processing is expensive, check 841 # if processing is expensive, check
682 # checksum first 842 # checksum first
683 if (1) { 843 if (1) {
700 860
701 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 862 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
704 864
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 866
707 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
710 870
720 880
721=cut 881=cut
722 882
723sub datalog($@) { 883sub datalog($@) {
724 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 886}
727 887
728=back 888=back
729 889
730=cut 890=cut
925 1085
926 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1088
929 } elsif (ref $type) { 1089 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
931 1091
932 } else { 1092 } else {
933 shift @arg; 1093 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
935 } 1095 }
936 } 1096 }
937} 1097}
938 1098
939sub _object_attach { 1099sub _object_attach {
949 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
950 } 1110 }
951 1111
952 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
953 } else { 1113 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1115 }
956 1116
957 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
958} 1118}
959 1119
1018 1178
1019 for (@$callbacks) { 1179 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1021 1181
1022 if ($@) { 1182 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1184 override;
1026 } 1185 }
1027 1186
1028 return 1 if $override; 1187 return 1 if $override;
1029 } 1188 }
1108 for (@$attach) { 1267 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1111 } 1270 }
1112 } else { 1271 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1273 }
1115 } 1274 }
1116} 1275}
1117 1276
1118cf::attachable->attach ( 1277cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1146 1305
1147 sync_job { 1306 sync_job {
1148 if (length $$rdata) { 1307 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1152 1312
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 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 }
1157 aio_close $fh; 1320 aio_close $fh;
1158 1321
1159 if (@$objs) { 1322 if (@$objs) {
1160 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) {
1161 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1164 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 }
1165 aio_close $fh; 1331 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1333 }
1168 } else { 1334 } else {
1169 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1173 1339
1174 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1342 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1178 } 1344 }
1179 } else { 1345 } else {
1180 aio_unlink $filename; 1346 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1182 } 1348 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1373 $av = $st->{objs};
1208 } 1374 }
1209 1375
1210 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1213 1380
1214 ($data, $av) 1381 ($data, $av)
1215} 1382}
1216 1383
1217=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1276} 1443}
1277 1444
1278use File::Glob (); 1445use File::Glob ();
1279 1446
1280cf::player->attach ( 1447cf::player->attach (
1281 on_command => sub { 1448 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1283 1450
1284 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1285 or return; 1452 or return;
1286 1453
1294 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1295 1462
1296 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1297 1464
1298 if (ref $msg) { 1465 if (ref $msg) {
1299 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1300 "ARRAY" eq ref $msg
1301 ? @$msg
1302 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1303 1467
1304 my @reply; 1468 my @reply;
1305 1469
1306 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1307 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1309 1473
1310 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1475 if $reply;
1312 1476
1313 } else { 1477 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1479 }
1316 1480
1317 cf::override; 1481 cf::override;
1318 }, 1482 },
1319); 1483);
1320 1484
1321# "readahead" all extensions 1485# "readahead" all extensions
1322sub cache_extensions { 1486sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1487 my $grp = IO::AIO::aio_group;
1324 1488
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1490 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1492 }
1329 }; 1493 };
1330 1494
1331 $grp 1495 $grp
1332} 1496}
1333 1497
1334sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1335 cf::sync_job { 1501 cf::sync_job {
1336 my %todo; 1502 my %todo;
1337 1503
1338 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1505 next unless -r $path;
1357 1523
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1526
1361 $ext{source} = 1527 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1364 . $source 1530 . $source
1365 . "\n};\n1"; 1531 . "\n};\n1";
1366 1532
1367 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1368 } 1534 }
1369 1535
1536 my $pass = 0;
1370 my %done; 1537 my %done;
1371 while (%todo) { 1538 while (%todo) {
1372 my $progress; 1539 my $progress;
1373 1540
1541 ++$pass;
1542
1543 ext:
1374 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1546 next ext
1377 unless exists $done{$_}; 1547 unless exists $done{$_};
1378 } 1548 }
1379 1549
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1551
1382 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1556
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1558 if exists $v->{meta}{mandatory};
1390 1559
1391 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;
1392 } 1569 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1570 }
1398 1571
1399 skip: 1572 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 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 }
1402 } 1582 }
1403 }; 1583 };
1404} 1584}
1405 1585
1406############################################################################# 1586#############################################################################
1490 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1491 } 1671 }
1492 } 1672 }
1493} 1673}
1494 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
1495sub save($) { 1688sub save($) {
1496 my ($pl) = @_; 1689 my ($pl) = @_;
1497 1690
1498 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1499 1692
1504 1697
1505 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1507 1700
1508 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];
1509 1705
1510 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1707 cf::cede_to_tick;
1512} 1708}
1513 1709
1547 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1548 1744
1549 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1550 $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
1551 1747
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553 $pl->deactivate; 1749 $pl->deactivate;
1750
1554 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;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1557 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1558 1756
1559 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1561 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1615 \@logins 1813 \@logins
1616} 1814}
1617 1815
1618=item $player->maps 1816=item $player->maps
1619 1817
1818=item cf::player::maps $login
1819
1620Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1621player. May block. 1821player. May block.
1622 1822
1623=cut 1823=cut
1624 1824
1686=cut 1886=cut
1687 1887
1688sub find_by_path($) { 1888sub find_by_path($) {
1689 my ($path) = @_; 1889 my ($path) = @_;
1690 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1691 my ($match, $specificity); 1893 my ($match, $specificity);
1692 1894
1693 for my $region (list) { 1895 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1723sub generate_random_map { 1925sub generate_random_map {
1724 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1725 1927
1726 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
1727 1929
1728 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom}
1741 )
1742} 1931}
1743 1932
1744=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1745 1934
1746Register 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
1751 1940
1752sub register { 1941sub register {
1753 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1943 my $pkg = caller;
1755 1944
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1946
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1948}
1761 1949
1762# also paths starting with '/' 1950# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1952
1765sub thawer_merge { 1953sub thawer_merge {
1766 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1767 1955
1768 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1773} 1961}
1774 1962
1775sub normalise { 1963sub normalise {
1776 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1777 1965
1778 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1779 1967
1780 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1781 1969
1782 # map plan: 1970 # map plan:
1783 # 1971 #
1798 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 1987 $path = "$base/$path";
1800 } 1988 }
1801 1989
1802 for ($path) { 1990 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1806 } 1993 }
1807 1994
1808 $path 1995 $path
1822 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1823 return $self; 2010 return $self;
1824 } 2011 }
1825 } 2012 }
1826 2013
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 2015 ()
1829} 2016}
1830 2017
2018# may re-bless or do other evil things
1831sub init { 2019sub init {
1832 my ($self) = @_; 2020 my ($self) = @_;
1833 2021
1834 $self 2022 $self
1835} 2023}
1900 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1901 2089
1902 1 2090 1
1903} 2091}
1904 2092
2093# used to laod the header of an original map
1905sub load_header_orig { 2094sub load_header_orig {
1906 my ($self) = @_; 2095 my ($self) = @_;
1907 2096
1908 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1909} 2098}
1910 2099
2100# used to laod the header of an instantiated map
1911sub load_header_temp { 2101sub load_header_temp {
1912 my ($self) = @_; 2102 my ($self) = @_;
1913 2103
1914 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1915} 2105}
1916 2106
2107# called after loading the header from an instantiated map
1917sub prepare_temp { 2108sub prepare_temp {
1918 my ($self) = @_; 2109 my ($self) = @_;
1919 2110
1920 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1921 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1922 # safety 2113 # safety
1923 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1924 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1925} 2116}
1926 2117
2118# called after loading the header from an original map
1927sub prepare_orig { 2119sub prepare_orig {
1928 my ($self) = @_; 2120 my ($self) = @_;
1929 2121
1930 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1931 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1955 2147
1956sub find; 2148sub find;
1957sub find { 2149sub find {
1958 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1959 2151
2152 cf::cede_to_tick;
2153
1960 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1961 2155
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1964 2158
1965 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1982 2176
1983 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1984 } 2178 }
1985} 2179}
1986 2180
1987sub pre_load { } 2181sub pre_load { }
1988sub post_load { } 2182#sub post_load { } # XS
1989 2183
1990sub load { 2184sub load {
1991 my ($self) = @_; 2185 my ($self) = @_;
1992 2186
1993 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1996 2190
1997 { 2191 {
1998 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1999 2193
2000 return unless $self->valid; 2194 return unless $self->valid;
2001 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2002
2003 $self->in_memory (cf::MAP_LOADING);
2004 2196
2005 $self->alloc; 2197 $self->alloc;
2006 2198
2007 $self->pre_load; 2199 $self->pre_load;
2008 cf::cede_to_tick; 2200 cf::cede_to_tick;
2009 2201
2202 if (exists $self->{load_path}) {
2010 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2011 $f->skip_block; 2204 $f->skip_block;
2012 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2013 or return; 2206 or return;
2014 2207
2015 $self->post_load_original 2208 $self->post_load_original
2016 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2017 2210
2018 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2019 utf8::encode $uniq; 2212 utf8::encode $uniq;
2020 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2021 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2022 $self->clear_unique_items; 2215 $self->clear_unique_items;
2023 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2024 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2025 } 2219 }
2026 } 2220 }
2027 }
2028 2221
2029 $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);
2030 2229
2031 cf::cede_to_tick; 2230 cf::cede_to_tick;
2032 # now do the right thing for maps 2231 # now do the right thing for maps
2033 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2034 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2038 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2039 $self->decay_objects; 2238 $self->decay_objects;
2040 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2041 $self->update_buttons; 2240 $self->update_buttons;
2042 cf::cede_to_tick; 2241 cf::cede_to_tick;
2043 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2044 } 2243 }
2045 2244
2046 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2047 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2048
2049 $self->in_memory (cf::MAP_ACTIVE);
2050 } 2247 }
2051 2248
2052 $self->post_load; 2249 $self->post_load;
2053}
2054 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
2055sub customise_for { 2257sub customise_for {
2056 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2057 2259
2058 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2261 if $self->per_player;
2062# if $self->per_party; 2264# if $self->per_party;
2063 2265
2064 $self 2266 $self
2065} 2267}
2066 2268
2067# find and load all maps in the 3x3 area around a map
2068sub load_neighbours {
2069 my ($map) = @_;
2070
2071 my @neigh; # diagonal neighbours
2072
2073 for (0 .. 3) {
2074 my $neigh = $map->tile_path ($_)
2075 or next;
2076 $neigh = find $neigh, $map
2077 or next;
2078 $neigh->load;
2079
2080 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 }
2084
2085 for (grep defined $_->[0], @neigh) {
2086 my ($path, $origin) = @$_;
2087 my $neigh = find $path, $origin
2088 or next;
2089 $neigh->load;
2090 }
2091}
2092
2093sub find_sync { 2269sub find_sync {
2094 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2095 2271
2096 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
2097} 2277}
2098 2278
2099sub do_load_sync { 2279sub do_load_sync {
2100 my ($map) = @_; 2280 my ($map) = @_;
2101 2281
2282 # it's a bug to call this from the main context
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2104 2285
2105 cf::sync_job { $map->load }; 2286 $map->load;
2106} 2287}
2107 2288
2108our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2110 2291
2111sub find_async { 2292sub find_async {
2112 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2113 2294
2114 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2115 2296
2116 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2118 } 2299 }
2119 2300
2120 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2121 2302
2122 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2136 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2137 2318
2138 () 2319 ()
2139} 2320}
2140 2321
2322# common code, used by both ->save and ->swapout
2141sub save { 2323sub _save {
2142 my ($self) = @_; 2324 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2325
2146 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2147 2327
2148 return unless $self->dirty; 2328 return unless $self->dirty;
2149 2329
2169 } else { 2349 } else {
2170 $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);
2171 } 2351 }
2172} 2352}
2173 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2174sub swap_out { 2362sub swap_out {
2175 my ($self) = @_; 2363 my ($self) = @_;
2176 2364
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2182 return if $self->players; 2369 return if $self->players;
2183 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
2184 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2185 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
2186 $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};
2187 2421
2188 $self->deactivate; 2422 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2424 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2425
2236 $self->unlink_save; 2426 $self->unlink_save;
2237 $self->destroy; 2427 $self->destroy;
2238} 2428}
2239 2429
2247 2437
2248 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2249 2439
2250 $self->unlink_save; 2440 $self->unlink_save;
2251 2441
2252 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2447
2314 : normalise $_ 2504 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2506 ]
2317} 2507}
2318 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
2319=back 2541=back
2320 2542
2321=head3 cf::object 2543=head3 cf::object
2322 2544
2323=cut 2545=cut
2455 2677
2456Freezes 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}>).
2457 2679
2458The 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.
2459for 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,
2460though, 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
2461map. 2683map.
2462 2684
2463Will never block. 2685Will never block.
2464 2686
2465=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2487 my ($self) = @_; 2709 my ($self) = @_;
2488 2710
2489 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2490 2712
2713 ++$self->{_link_recursion};
2714
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2716
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2495 2719
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2721}
2498 2722
2499sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2501 2725
2518 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2520 2744
2521 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2524 2748
2525 $map->load; 2749 $map->load;
2526 $map->load_neighbours;
2527 2750
2528 return unless $self->contr->active; 2751 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2752
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2534} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2535 2760
2761}
2762
2536=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)]])
2537 2764
2538Moves 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
2539her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2540that 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
2541the 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
2548 2775
2549our $GOTOGEN; 2776our $GOTOGEN;
2550 2777
2551sub cf::object::player::goto { 2778sub cf::object::player::goto {
2552 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 }
2553 2786
2554 # 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
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2789
2557 $self->enter_link; 2790 $self->enter_link;
2577 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2578 } 2811 }
2579 } 2812 }
2580 2813
2581 my $map = eval { 2814 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2583 2816
2584 if ($map) { 2817 if ($map) {
2585 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2820 } else {
2588 $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);
2589 } 2822 }
2590 2823
2591 $map 2824 $map
2599 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2602 } 2835 }
2603 2836
2604 $done->() if $done; 2837 $done->($self) if $done;
2605 })->prio (1); 2838 })->prio (1);
2606} 2839}
2607 2840
2608=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2609 2842
2677 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2678 2911
2679 unless (eval { 2912 unless (eval {
2680 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2681 2914
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2691 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2692 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 }
2693 2941
2694 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2695 2943
2696 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2702 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2954
2707 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2956 $self->leave_link;
2709 } 2957 }
2710 })->prio (1); 2958 })->prio (1);
2711} 2959}
2712 2960
2724sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2726 2974
2727 utf8::encode $text; 2975 utf8::encode $text;
2728 $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);
2729} 3002}
2730 3003
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 3005
2733Send 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
2737 3010
2738=cut 3011=cut
2739 3012
2740# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2742 "c/identify" => { 3021 "c/identify" => {
2743 id => "infobox", 3022 id => "infobox",
2744 title => "Identify", 3023 title => "Identify",
2745 reply => undef, 3024 reply => undef,
2746 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2748 "c/examine" => { 3027 "c/examine" => {
2749 id => "infobox", 3028 id => "infobox",
2750 title => "Examine", 3029 title => "Examine",
2751 reply => undef, 3030 reply => undef,
2752 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",
2753 }, 3038 },
2754 "c/book" => { 3039 "c/book" => {
2755 id => "infobox", 3040 id => "infobox",
2756 title => "Book", 3041 title => "Book",
2757 reply => undef, 3042 reply => undef,
2785 id => "infobox", 3070 id => "infobox",
2786 title => "Skills", 3071 title => "Skills",
2787 reply => undef, 3072 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 3073 tooltip => "Shows your experience per skill and item power",
2789 }, 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 },
2790 "c/resistances" => { 3081 "c/resistances" => {
2791 id => "infobox", 3082 id => "infobox",
2792 title => "Resistances", 3083 title => "Resistances",
2793 reply => undef, 3084 reply => undef,
2794 tooltip => "Shows your resistances", 3085 tooltip => "Shows your resistances",
2796 "c/pets" => { 3087 "c/pets" => {
2797 id => "infobox", 3088 id => "infobox",
2798 title => "Pets", 3089 title => "Pets",
2799 reply => undef, 3090 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 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",
2801 }, 3098 },
2802 "c/uptime" => { 3099 "c/uptime" => {
2803 id => "infobox", 3100 id => "infobox",
2804 title => "Uptime", 3101 title => "Uptime",
2805 reply => undef, 3102 reply => undef,
2861 my $pkt = "msg " 3158 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3161 );
2865 3162
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3163 $self->send_big_packet ($pkt);
2877} 3164}
2878 3165
2879=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2880 3167
2881Sends an ext event to the client. 3168Sends an ext event to the client.
2884 3171
2885sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2887 3174
2888 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3180 }
2894} 3181}
2895 3182
2896=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2897 3184
2900=cut 3187=cut
2901 3188
2902sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2904 3191
2905 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912} 3195}
2913 3196
2914=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2915 3198
2916Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2971 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2972 3255
2973 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2974 3257
2975 if (ref $msg) { 3258 if (ref $msg) {
2976 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2977 "ARRAY" eq ref $msg
2978 ? @$msg
2979 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2980 3260
2981 my @reply; 3261 my @reply;
2982 3262
2983 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2984 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2986 3266
2987 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2988 if $reply; 3268 if $reply;
2989 3269
2990 } else { 3270 } else {
2991 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";
2992 } 3272 }
2993 3273
2994 cf::override; 3274 cf::override;
2995 }, 3275 },
2996); 3276);
3016 3296
3017 $coro 3297 $coro
3018} 3298}
3019 3299
3020cf::client->attach ( 3300cf::client->attach (
3021 on_destroy => sub { 3301 on_client_destroy => sub {
3022 my ($ns) = @_; 3302 my ($ns) = @_;
3023 3303
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3305 },
3026); 3306);
3042our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3043 3323
3044$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3045 3325
3046$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3049 sort time 3329 sort time
3050)); 3330));
3051 3331
3052# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3077 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3081) { 3361) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3364 for @funs;
3086} 3365}
3087 3366
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3106 3385
3107 %vars = (_dummy => 0) unless %vars; 3386 %vars = (_dummy => 0) unless %vars;
3108 3387
3388 my @res;
3109 local $_; 3389 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3390
3112 my $eval = 3391 my $eval =
3113 "do {\n" 3392 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3395 . $code
3117 . "\n}" 3396 . "\n}"
3118 ; 3397 ;
3119 3398
3399 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 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 }
3123 3408
3124 if ($@) { 3409 if ($@) {
3125 warn "$@"; 3410 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3128 } 3413 }
3129 3414
3130 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3131} 3416}
3132 3417
3146=cut 3431=cut
3147 3432
3148sub register_script_function { 3433sub register_script_function {
3149 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3150 3435
3151 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3153} 3438}
3154 3439
3155=back 3440=back
3156 3441
3157=cut 3442=cut
3166 # for this (global event?) 3451 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3168 3453
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3455
3171 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3172 3457
3173 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3174 0 < aio_load $path, $facedata
3175 or die "$path: $!";
3176
3177 $facedata = Coro::Storable::thaw $facedata;
3178 3459
3179 $facedata->{version} == 2 3460 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3462
3182 # 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]);
3183 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3466 type => FT_RSRC,
3185 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),
3186 }; 3469 };
3187 cf::cede_to_tick; 3470 cf::cede_to_tick;
3188 3471
3189 { 3472 {
3190 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3192 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3477
3195 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 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} ;
3199 3483
3200 cf::cede_to_tick; 3484 cf::cede_to_tick;
3201 } 3485 }
3202 3486
3203 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3208 3492
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3496 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3498 }
3215 3499
3216 cf::cede_to_tick; 3500 cf::cede_to_tick;
3217 } 3501 }
3218 } 3502 }
3227 3511
3228 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3229 } 3513 }
3230 3514
3231 { 3515 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3235 3517
3236 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3519 if (defined (my $type = delete $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3522
3241 if ($info->{type} & 1) { 3523 cf::face::set_data $idx, 0, delete $info->{data}, delete $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, (keys %$info && (~$type & 1)) ? $info : undef; # any keys left are stashed into meta unless prepended
3256 } else { 3526 } else {
3257 $RESOURCE{$name} = $info; 3527# $RESOURCE{$name} = $info; # unused
3258 } 3528 }
3259 3529
3260 cf::cede_to_tick; 3530 cf::cede_to_tick;
3261 } 3531 }
3262 } 3532 }
3263 3533
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3535
3266 1 3536 1
3267} 3537}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3538
3289register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3540 my ($ns, $want) = @_;
3291 3541
3292 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
3331sub reload_treasures { 3581sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3334} 3584}
3335 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
3336sub reload_resources { 3606sub reload_resources {
3337 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3338 3608
3609 reload_exp_table;
3610 reload_materials;
3339 reload_facedata; 3611 reload_facedata;
3612 reload_sound;
3340 reload_archetypes; 3613 reload_archetypes;
3341 reload_regions; 3614 reload_regions;
3342 reload_treasures; 3615 reload_treasures;
3343 3616
3344 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
3345} 3618}
3346 3619
3347sub reload_config { 3620sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3621 trace "reloading config file...\n";
3349 or return;
3350 3622
3351 local $/; 3623 my $config = load_file "$CONFDIR/config";
3352 *CFG = YAML::Load <$fh>; 3624 utf8::decode $config;
3625 *CFG = decode_yaml $config;
3353 3626
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3628
3356 $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};
3357 $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};
3358 3631
3359 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
3382 3655
3383 seek $fh, 0, 0; 3656 seek $fh, 0, 0;
3384 print $fh $$; 3657 print $fh $$;
3385} 3658}
3386 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
3387sub main { 3669sub main {
3388 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3389 3671
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 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.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3676
3400 $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
3401 3678
3402 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
3409 }; 3686 };
3410 3687
3411 evthread_start IO::AIO::poll_fileno; 3688 evthread_start IO::AIO::poll_fileno;
3412 3689
3413 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
3414 reload_resources; 3699 reload_resources;
3415 reload_config; 3700 reload_config;
3416 db_init; 3701 db_init;
3417 3702
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3703 cf::init_uuid;
3421 cf::init_signals; 3704 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3705 cf::init_skills;
3424 3706
3425 cf::init_beforeplay; 3707 cf::init_beforeplay;
3426 3708
3427 atomic; 3709 atomic;
3429 load_extensions; 3711 load_extensions;
3430 3712
3431 utime time, time, $RUNTIMEFILE; 3713 utime time, time, $RUNTIMEFILE;
3432 3714
3433 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3716 use POSIX ();
3434 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};
3435 3718
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3437 }; 3720 };
3438 3721
3439 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;
3440} 3730}
3441 3731
3442############################################################################# 3732#############################################################################
3443# initialisation and cleanup 3733# initialisation and cleanup
3444 3734
3445# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3446BEGIN { 3736BEGIN {
3447 our %SIGWATCHER = (); 3737 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3451 }; 3741 };
3452 } 3742 }
3453} 3743}
3454 3744
3455sub write_runtime_sync { 3745sub write_runtime_sync {
3746 my $t0 = AE::time;
3747
3456 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3458 3750
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3752
3461 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
3462 3754
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3756 or return;
3465 3757
3466 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
3481 or return; 3773 or return;
3482 3774
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3776 and return;
3485 3777
3486 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3779
3488 1 3780 1
3489} 3781}
3490 3782
3491our $uuid_lock; 3783our $uuid_lock;
3503 or return; 3795 or return;
3504 3796
3505 my $value = uuid_seq uuid_cur; 3797 my $value = uuid_seq uuid_cur;
3506 3798
3507 unless ($value) { 3799 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 3800 info "cowardly refusing to write zero uuid value!\n";
3509 return; 3801 return;
3510 } 3802 }
3511 3803
3512 my $value = uuid_str $value + $uuid_skip; 3804 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3805 $uuid_skip = 0;
3523 or return; 3815 or return;
3524 3816
3525 aio_rename "$uuid~", $uuid 3817 aio_rename "$uuid~", $uuid
3526 and return; 3818 and return;
3527 3819
3528 warn "uuid file written ($value).\n"; 3820 trace "uuid file written ($value).\n";
3529 3821
3530 1 3822 1
3531 3823
3532} 3824}
3533 3825
3539} 3831}
3540 3832
3541sub emergency_save() { 3833sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3543 3835
3544 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;
3545 3842
3546 cf::sync_job { 3843 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 3844 cf::write_runtime_sync; # external watchdog should not bark
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551 3845
3552 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3852 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3854 $pl->save;
3561 } 3855 }
3562 warn "emergency_perl_save: end player save\n"; 3856 info "emergency_perl_save: end player save\n";
3563 3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3564 warn "emergency_perl_save: begin map save\n"; 3860 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3863 $map->valid or next;
3568 $map->save; 3864 $map->save;
3569 } 3865 }
3570 warn "emergency_perl_save: end map save\n"; 3866 info "emergency_perl_save: end map save\n";
3571 3867
3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3572 warn "emergency_perl_save: begin database checkpoint\n"; 3870 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3575 3873
3576 warn "emergency_perl_save: begin write uuid\n"; 3874 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3875 write_uuid_sync 1;
3578 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
3579 }; 3896 };
3580 3897
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3586 warn "emergency_perl_save: leave\n"; 3898 info "emergency_perl_save: leave\n";
3587} 3899}
3588 3900
3589sub post_cleanup { 3901sub post_cleanup {
3590 my ($make_core) = @_; 3902 my ($make_core) = @_;
3591 3903
3904 IO::AIO::flush;
3905
3592 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3907 if $make_core;
3594 3908
3595 my $fh = pidfile; 3909 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 3910 unlink $PIDFILE if <$fh> == $$;
3597} 3911}
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3932 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3933 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3935 }
3622 warn "cleared package $pkg\n";#d#
3623} 3936}
3624 3937
3625sub do_reload_perl() { 3938sub do_reload_perl() {
3626 # can/must only be called in main 3939 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3628 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3629 return; 3942 return;
3630 } 3943 }
3631 3944
3632 return if $RELOAD++; 3945 return if $RELOAD++;
3633 3946
3634 my $t1 = EV::time; 3947 my $t1 = AE::time;
3635 3948
3636 while ($RELOAD) { 3949 while ($RELOAD) {
3637 warn "reloading..."; 3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3638 3952
3639 warn "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3640 3954
3641 cf::sync_job { 3955 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 3956 #cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark
3645 3957
3646 warn "syncing database to disk";
3647 BDB::db_env_txn_checkpoint $DB_ENV;
3648
3649 # if anything goes wrong in here, we should simply crash as we already saved
3650
3651 warn "flushing outstanding aio requests";
3652 while (IO::AIO::nreqs || BDB::nreqs) {
3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3654 }
3655
3656 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 3960 %EXT_CORO = ();
3659 3961
3660 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3661 %COMMAND = (); 3963 %COMMAND = ();
3662 3964
3663 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3664 %EXTCMD = (); 3966 %EXTCMD = ();
3665 %EXTICMD = (); 3967 %EXTICMD = ();
3666 3968
3667 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3670 3972
3671 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3672 eval { 3974 eval {
3673 $cb->($pkg); 3975 $cb->($pkg);
3674 1 3976 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3676 } 3978 }
3677 3979
3678 warn "... clearing $pkg"; 3980 trace "... clearing $pkg";
3679 clear_package $pkg; 3981 clear_package $pkg;
3680 } 3982 }
3681 3983
3682 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 3987
3686 warn "... unloading $k"; 3988 trace "... unloading $k";
3687 delete $INC{$k}; 3989 delete $INC{$k};
3688 3990
3689 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3691 3993
3694 } 3996 }
3695 3997
3696 clear_package $k; 3998 clear_package $k;
3697 } 3999 }
3698 4000
3699 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 4002 clear_package "safe::$_"
3701 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);
3702 4004
3703 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 4008
3707 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3708 # and global variables created in xs 4010 # and global variables created in xs
3709 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3710 4012
3711 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3712 4014
3713 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3714 require cf; 4016 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4017 cf::_connect_to_perl_1;
3716 4018
3717 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3718 cf::reload_config; 4020 cf::reload_config;
3719 4021
3720 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3721 cf::load_extensions; 4023 cf::load_extensions;
3722 4024
3723 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3727 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3730 } 4032 }
3731 4033
3732 warn "running post_init jobs"; 4034 cf::_post_init 1;
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734 4035
3735 warn "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3736 4037
3737 1 4038 1
3738 } or do { 4039 } or do {
3739 warn $@; 4040 error $@;
3740 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3741 }; 4042 };
3742 4043
3743 warn "reloaded";
3744 --$RELOAD; 4044 --$RELOAD;
3745 } 4045 }
3746 4046
3747 $t1 = EV::time - $t1; 4047 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3749}; 4049};
3750 4050
3751our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3752 4052
3753sub reload_perl() { 4053sub reload_perl() {
3755 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3756 4056
3757 $RELOAD_WATCHER ||= cf::async { 4057 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 4058 Coro::AIO::aio_wait cache_extensions;
3759 4059
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 4061 do_reload_perl;
3762 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3763 }; 4063 };
3764 }; 4064 };
3765} 4065}
3774 reload_perl; 4074 reload_perl;
3775 }; 4075 };
3776 } 4076 }
3777}; 4077};
3778 4078
3779unshift @INC, $LIBDIR; 4079#############################################################################
3780 4080
3781my $bug_warning = 0; 4081my $bug_warning = 0;
3782 4082
3783our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN;
3785
3786sub wait_for_tick { 4083sub wait_for_tick() {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3788 4085
3789 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3790 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait;
3792} 4087}
3793 4088
3794sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3796 4091
3797 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4094 $signal->wait;
3800} 4095}
3804 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"
3805 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3806 return; 4101 return;
3807 } 4102 }
3808 4103
3809 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#
3810 4107
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $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.;
3813 Coro::async_pool { 4110 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4111 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4112 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4113 or error "ERROR: unable to write runtime file: $!";
3817 }; 4114 };
3818 } 4115 }
3819 4116
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4118 $sig->send;
3822 } 4119 }
3823 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3824 $sig->send;
3825 }
3826 4121
3827 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3828 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3829 4124
3830 if (0) { 4125 if (0) {
3831 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3835 } 4130 }
3836 } 4131 }
3837} 4132}
3838 4133
3839{ 4134{
3840 # configure BDB 4135 # configure BDB
3841 4136
3842 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3845 4140
3846 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3848 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3849 $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;
3884 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3885 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3886 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
3887} 4182}
3888 4183
3889my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3890 4186
3891sub _log_backtrace { 4187sub _log_backtrace {
3892 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3893 4189
3894 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3895 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3896 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3897 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3898 ++$_log_backtrace; 4198 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
3900 async { 4200 async {
3901 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3902 4202
3922 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3923 --$_log_backtrace; 4223 --$_log_backtrace;
3924 }; 4224 };
3925 } else { 4225 } else {
3926 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3927 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3928 } 4228 }
3929} 4229}
3930 4230
3931# load additional modules 4231# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3933 4234
3934END { cf::emergency_save } 4235END { cf::emergency_save }
3935 4236
39361 42371
3937 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines