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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict 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; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
111 125
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
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
146 open my $fh, "<", $RUNTIMEFILE 165 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
149} 168}
150 169
170eval "sub TICK() { $TICK } 1" or die;
171
151mkdir $_ 172mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 174
154our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
155 176
156sub cf::map::normalise; 177sub cf::map::normalise;
157 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
158############################################################################# 183#############################################################################
159 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
160=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
161 197
162=over 4 198=over 4
163 199
164=item $cf::UPTIME 200=item $cf::UPTIME
165 201
166The 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.
167 218
168=item $cf::RUNTIME 219=item $cf::RUNTIME
169 220
170The 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
171every server tick. 222every server tick.
177Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
178directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
179unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
180database environment. 231database environment.
181 232
182=item $cf::NOW
183
184The time of the last (current) server tick.
185
186=item $cf::TICK
187
188The interval between server ticks, in seconds.
189
190=item $cf::LOADAVG 233=item $cf::LOADAVG
191 234
192The 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
193(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
194objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
203from wherever your confdir points to. 246from wherever your confdir points to.
204 247
205=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
206 249
207These 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
208returns 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
209per 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.
210 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
211=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
212 272
213This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
214C<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
215that call. 275that call.
216 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
217=back 283=back
218 284
219=cut 285=cut
220 286
221BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
222 *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 {
223 my $msg = join "", @_; 294 my $msg = join "", @_;
224 295
225 $msg .= "\n" 296 $msg .= "\n"
226 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
227 298
228 $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;
229 300
230 LOG llevError, $msg; 301 LOG llevWarn, $msg;
231 }; 302};
232}
233 303
234$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
236 306
237 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 311 return;#d#
240 }#d# 312 }#d#
241 313
242 # kill coroutine otherwise 314 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 315 Coro::terminate
245}; 316};
246
247$SIG{__DIE__} = sub { }; #d#?
248 317
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
266)) { 335)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 337}
269 338
270$EV::DIED = sub { 339$EV::DIED = sub {
271 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
272}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
273 347
274############################################################################# 348#############################################################################
275 349
276=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
277 351
298 $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;
299 $d 373 $d
300 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
301} 375}
302 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
303=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
304 392
305Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
306 394
307=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
313our $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
314 402
315sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
316sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
317 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
318=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
319 438
320Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
322 441
323The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
324is a reload or not. 443is a reload or not.
325 444
326=cut 445=cut
327 446
328sub post_init(&) { 447sub post_init(&) {
329 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 }
330} 466}
331 467
332=item cf::lock_wait $string 468=item cf::lock_wait $string
333 469
334Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
373} 509}
374 510
375=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
376 512
377Like 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
378get spread over timer. 514get spread over time.
379 515
380=cut 516=cut
381 517
382sub periodic($$) { 518sub periodic($$) {
383 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
387 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
388} 524}
389 525
390=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
391 527
392Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
393This 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
394of 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.
395 535
396The 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
397used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
398 538
399Useful for short background jobs. 539Useful for short background jobs.
400 540
401=cut 541=cut
402 542
403our @SLOT_QUEUE; 543our @SLOT_QUEUE;
404our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
405 546
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
409 550
410 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
411 553
412 while () { 554 while () {
413 next_job: 555 next_job:
556
414 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 558
416 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 563 $job->[2]->send;
420 Coro::cede; 564 Coro::cede;
421 goto next_job; 565 goto next_job;
422 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 568 }
424 } 569 }
425 570
426 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
427 # 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
428 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
429 $signal->wait;
430 } else { 574 } else {
575 $busy = 0;
431 Coro::schedule; 576 Coro::schedule;
432 } 577 }
433 } 578 }
434}; 579};
435 580
436sub get_slot($;$$) { 581sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
438 583
439 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
440 585
441 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
442 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
443 589
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
472=cut 618=cut
473 619
474sub sync_job(&) { 620sub sync_job(&) {
475 my ($job) = @_; 621 my ($job) = @_;
476 622
477 if ($Coro::current == $Coro::main) { 623 if (in_main) {
478 my $time = EV::time; 624 my $time = AE::time;
479 625
480 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
481 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
482 628
483 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
484 630
485 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
486 632
487 my $busy = 1; 633 my $busy = 1;
488 my @res; 634 my @res;
489 635
490 (async { 636 (async {
491 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
492 @res = eval { $job->() }; 638 @res = eval { $job->() };
493 warn $@ if $@; 639 error $@ if $@;
494 undef $busy; 640 undef $busy;
495 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
496 642
497 while ($busy) { 643 while ($busy) {
498 if (Coro::nready) { 644 if (Coro::nready) {
500 } else { 646 } else {
501 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
502 } 648 }
503 } 649 }
504 650
505 my $time = EV::time - $time; 651 my $time = AE::time - $time;
506 652
507 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
508 654
509 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
510 } else { 656 } else {
532 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
533 679
534 $coro 680 $coro
535} 681}
536 682
537=item fork_call { }, $args 683=item fork_call { }, @args
538 684
539Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
540process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
541Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
542never block itself or use any form of event handling. 688never block itself or use any form of event handling.
543 689
544=cut 690=cut
545 691
692sub post_fork {
693 reset_signals;
694}
695
546sub fork_call(&@) { 696sub fork_call(&@) {
547 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
548 698
549 # 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,
550 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
551 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
552 702
553 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
554 reset_signals; 704 cf::post_fork;
555 &$cb 705 &$cb
556 }, @args; 706 } @args;
557 707
558 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 )
559} 720}
560 721
561=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
562 723
563=cut 724=cut
600within each server. 761within each server.
601 762
602=cut 763=cut
603 764
604sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
605 my ($name) = @_; 769 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
607 771
608 eval { 772 eval {
609 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
619} 783}
620 784
621our $DB; 785our $DB;
622 786
623sub db_init { 787sub db_init {
624 cf::sync_job {
625 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
626 };
627} 789}
628 790
629sub db_get($$) { 791sub db_get($$) {
630 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
631 793
632 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
633 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
634 798
635 $! ? () 799 $! ? ()
636 : $data 800 : $data
637 }
638} 801}
639 802
640sub db_put($$$) { 803sub db_put($$$) {
641 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
642 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
670 833
671 my @data; 834 my @data;
672 my $md5; 835 my $md5;
673 836
674 for (0 .. $#$src) { 837 for (0 .. $#$src) {
675 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
676 or Carp::croak "$src->[$_]: $!";
677 } 839 }
678 840
679 # if processing is expensive, check 841 # if processing is expensive, check
680 # checksum first 842 # checksum first
681 if (1) { 843 if (1) {
698 860
699 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
700 my $data = $process->(\@data); 862 my $data = $process->(\@data);
701 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
702 864
703 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
704 866
705 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
706 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
707 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
708 870
718 880
719=cut 881=cut
720 882
721sub datalog($@) { 883sub datalog($@) {
722 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
723 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
724} 886}
725 887
726=back 888=back
727 889
728=cut 890=cut
923 1085
924 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
925 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
926 1088
927 } elsif (ref $type) { 1089 } elsif (ref $type) {
928 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
929 1091
930 } else { 1092 } else {
931 shift @arg; 1093 shift @arg;
932 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
933 } 1095 }
934 } 1096 }
935} 1097}
936 1098
937sub _object_attach { 1099sub _object_attach {
947 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
948 } 1110 }
949 1111
950 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
951 } else { 1113 } else {
952 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
953 } 1115 }
954 1116
955 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
956} 1118}
957 1119
1016 1178
1017 for (@$callbacks) { 1179 for (@$callbacks) {
1018 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1019 1181
1020 if ($@) { 1182 if ($@) {
1021 warn "$@";
1022 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1023 override; 1184 override;
1024 } 1185 }
1025 1186
1026 return 1 if $override; 1187 return 1 if $override;
1027 } 1188 }
1106 for (@$attach) { 1267 for (@$attach) {
1107 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1108 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1109 } 1270 }
1110 } else { 1271 } else {
1111 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1112 } 1273 }
1113 } 1274 }
1114} 1275}
1115 1276
1116cf::attachable->attach ( 1277cf::attachable->attach (
1143 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1144 1305
1145 sync_job { 1306 sync_job {
1146 if (length $$rdata) { 1307 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1148 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1149 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1150 1312
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 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 }
1155 aio_close $fh; 1320 aio_close $fh;
1156 1321
1157 if (@$objs) { 1322 if (@$objs) {
1158 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) {
1159 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1162 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 }
1163 aio_close $fh; 1331 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1333 }
1166 } else { 1334 } else {
1167 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1170 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1171 1339
1172 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1174 } else { 1342 } else {
1175 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1176 } 1344 }
1177 } else { 1345 } else {
1178 aio_unlink $filename; 1346 aio_unlink $filename;
1179 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1180 } 1348 }
1204 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs}; 1373 $av = $st->{objs};
1206 } 1374 }
1207 1375
1208 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1209 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1210 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1211 1380
1212 ($data, $av) 1381 ($data, $av)
1213} 1382}
1214 1383
1215=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1274} 1443}
1275 1444
1276use File::Glob (); 1445use File::Glob ();
1277 1446
1278cf::player->attach ( 1447cf::player->attach (
1279 on_command => sub { 1448 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1281 1450
1282 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1283 or return; 1452 or return;
1284 1453
1307 1476
1308 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1309 if $reply; 1478 if $reply;
1310 1479
1311 } else { 1480 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1482 }
1314 1483
1315 cf::override; 1484 cf::override;
1316 }, 1485 },
1317); 1486);
1318 1487
1319# "readahead" all extensions 1488# "readahead" all extensions
1320sub cache_extensions { 1489sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1490 my $grp = IO::AIO::aio_group;
1322 1491
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1493 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1495 }
1327 }; 1496 };
1328 1497
1329 $grp 1498 $grp
1330} 1499}
1331 1500
1332sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1333 cf::sync_job { 1504 cf::sync_job {
1334 my %todo; 1505 my %todo;
1335 1506
1336 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1337 next unless -r $path; 1508 next unless -r $path;
1355 1526
1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1358 1529
1359 $ext{source} = 1530 $ext{source} =
1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1361 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1362 . $source 1533 . $source
1363 . "\n};\n1"; 1534 . "\n};\n1";
1364 1535
1365 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1366 } 1537 }
1367 1538
1539 my $pass = 0;
1368 my %done; 1540 my %done;
1369 while (%todo) { 1541 while (%todo) {
1370 my $progress; 1542 my $progress;
1371 1543
1544 ++$pass;
1545
1546 ext:
1372 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1549 next ext
1375 unless exists $done{$_}; 1550 unless exists $done{$_};
1376 } 1551 }
1377 1552
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1554
1380 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1559
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1561 if exists $v->{meta}{mandatory};
1388 1562
1389 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1390 } 1572 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1573 }
1396 1574
1397 skip: 1575 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1400 } 1585 }
1401 }; 1586 };
1402} 1587}
1403 1588
1404############################################################################# 1589#############################################################################
1488 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1489 } 1674 }
1490 } 1675 }
1491} 1676}
1492 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1493sub save($) { 1691sub save($) {
1494 my ($pl) = @_; 1692 my ($pl) = @_;
1495 1693
1496 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1497 1695
1502 1700
1503 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1505 1703
1506 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1507 1708
1508 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1710 cf::cede_to_tick;
1510} 1711}
1511 1712
1545 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1546 1747
1547 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1549 1750
1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1551 $pl->deactivate; 1752 $pl->deactivate;
1753
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1554 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1555 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1556 1759
1557 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1558 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1559 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1613 \@logins 1816 \@logins
1614} 1817}
1615 1818
1616=item $player->maps 1819=item $player->maps
1617 1820
1821=item cf::player::maps $login
1822
1618Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1619player. May block. 1824player. May block.
1620 1825
1621=cut 1826=cut
1622 1827
1684=cut 1889=cut
1685 1890
1686sub find_by_path($) { 1891sub find_by_path($) {
1687 my ($path) = @_; 1892 my ($path) = @_;
1688 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1689 my ($match, $specificity); 1896 my ($match, $specificity);
1690 1897
1691 for my $region (list) { 1898 for my $region (list) {
1692 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1693 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1721sub generate_random_map { 1928sub generate_random_map {
1722 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1723 1930
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725 1932
1726 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1736 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1737 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1738 (cf::region::find $rmp->{region}), $rmp->{custom}
1739 )
1740} 1934}
1741 1935
1742=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1743 1937
1744Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1749 1943
1750sub register { 1944sub register {
1751 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1752 my $pkg = caller; 1946 my $pkg = caller;
1753 1947
1754 no strict;
1755 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1756 1949
1757 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1758} 1951}
1759 1952
1760# also paths starting with '/' 1953# also paths starting with '/'
1761$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1762 1955
1763sub thawer_merge { 1956sub thawer_merge {
1764 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1765 1958
1766 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1771} 1964}
1772 1965
1773sub normalise { 1966sub normalise {
1774 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1775 1968
1776 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1777 1970
1778 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1779 1972
1780 # map plan: 1973 # map plan:
1781 # 1974 #
1796 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1797 $path = "$base/$path"; 1990 $path = "$base/$path";
1798 } 1991 }
1799 1992
1800 for ($path) { 1993 for ($path) {
1801 redo if s{//}{/};
1802 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1803 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1804 } 1996 }
1805 1997
1806 $path 1998 $path
1820 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1821 return $self; 2013 return $self;
1822 } 2014 }
1823 } 2015 }
1824 2016
1825 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1826 () 2018 ()
1827} 2019}
1828 2020
2021# may re-bless or do other evil things
1829sub init { 2022sub init {
1830 my ($self) = @_; 2023 my ($self) = @_;
1831 2024
1832 $self 2025 $self
1833} 2026}
1898 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1899 2092
1900 1 2093 1
1901} 2094}
1902 2095
2096# used to laod the header of an original map
1903sub load_header_orig { 2097sub load_header_orig {
1904 my ($self) = @_; 2098 my ($self) = @_;
1905 2099
1906 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1907} 2101}
1908 2102
2103# used to laod the header of an instantiated map
1909sub load_header_temp { 2104sub load_header_temp {
1910 my ($self) = @_; 2105 my ($self) = @_;
1911 2106
1912 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1913} 2108}
1914 2109
2110# called after loading the header from an instantiated map
1915sub prepare_temp { 2111sub prepare_temp {
1916 my ($self) = @_; 2112 my ($self) = @_;
1917 2113
1918 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1919 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1920 # safety 2116 # safety
1921 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1922 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1923} 2119}
1924 2120
2121# called after loading the header from an original map
1925sub prepare_orig { 2122sub prepare_orig {
1926 my ($self) = @_; 2123 my ($self) = @_;
1927 2124
1928 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1929 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1953 2150
1954sub find; 2151sub find;
1955sub find { 2152sub find {
1956 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1957 2154
2155 cf::cede_to_tick;
2156
1958 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1959 2158
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1961 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1962 2161
1963 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1980 2179
1981 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1982 } 2181 }
1983} 2182}
1984 2183
1985sub pre_load { } 2184sub pre_load { }
1986sub post_load { } 2185#sub post_load { } # XS
1987 2186
1988sub load { 2187sub load {
1989 my ($self) = @_; 2188 my ($self) = @_;
1990 2189
1991 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
1994 2193
1995 { 2194 {
1996 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
1997 2196
1998 return unless $self->valid; 2197 return unless $self->valid;
1999 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2000
2001 $self->in_memory (cf::MAP_LOADING);
2002 2199
2003 $self->alloc; 2200 $self->alloc;
2004 2201
2005 $self->pre_load; 2202 $self->pre_load;
2006 cf::cede_to_tick; 2203 cf::cede_to_tick;
2007 2204
2205 if (exists $self->{load_path}) {
2008 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2009 $f->skip_block; 2207 $f->skip_block;
2010 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2011 or return; 2209 or return;
2012 2210
2013 $self->post_load_original 2211 $self->post_load_original
2014 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2015 2213
2016 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2017 utf8::encode $uniq; 2215 utf8::encode $uniq;
2018 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2019 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2020 $self->clear_unique_items; 2218 $self->clear_unique_items;
2021 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2022 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2023 } 2222 }
2024 } 2223 }
2025 }
2026 2224
2027 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2028 2232
2029 cf::cede_to_tick; 2233 cf::cede_to_tick;
2030 # now do the right thing for maps 2234 # now do the right thing for maps
2031 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2032 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2036 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2037 $self->decay_objects; 2241 $self->decay_objects;
2038 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2039 $self->update_buttons; 2243 $self->update_buttons;
2040 cf::cede_to_tick; 2244 cf::cede_to_tick;
2041 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2042 } 2246 }
2043 2247
2044 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2046
2047 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2250 }
2049 2251
2050 $self->post_load; 2252 $self->post_load;
2051}
2052 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2053sub customise_for { 2260sub customise_for {
2054 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2055 2262
2056 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2264 if $self->per_player;
2060# if $self->per_party; 2267# if $self->per_party;
2061 2268
2062 $self 2269 $self
2063} 2270}
2064 2271
2065# find and load all maps in the 3x3 area around a map
2066sub load_neighbours {
2067 my ($map) = @_;
2068
2069 my @neigh; # diagonal neighbours
2070
2071 for (0 .. 3) {
2072 my $neigh = $map->tile_path ($_)
2073 or next;
2074 $neigh = find $neigh, $map
2075 or next;
2076 $neigh->load;
2077
2078 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 }
2082
2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
2085 my $neigh = find $path, $origin
2086 or next;
2087 $neigh->load;
2088 }
2089}
2090
2091sub find_sync { 2272sub find_sync {
2092 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2093 2274
2094 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2095} 2280}
2096 2281
2097sub do_load_sync { 2282sub do_load_sync {
2098 my ($map) = @_; 2283 my ($map) = @_;
2099 2284
2285 # it's a bug to call this from the main context
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2102 2288
2103 cf::sync_job { $map->load }; 2289 $map->load;
2104} 2290}
2105 2291
2106our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2108 2294
2109sub find_async { 2295sub find_async {
2110 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2111 2297
2112 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2113 2299
2114 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2116 } 2302 }
2117 2303
2118 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2119 2305
2120 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2134 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2135 2321
2136 () 2322 ()
2137} 2323}
2138 2324
2325# common code, used by both ->save and ->swapout
2139sub save { 2326sub _save {
2140 my ($self) = @_; 2327 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2328
2144 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2145 2330
2146 return unless $self->dirty; 2331 return unless $self->dirty;
2147 2332
2167 } else { 2352 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2354 }
2170} 2355}
2171 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2172sub swap_out { 2365sub swap_out {
2173 my ($self) = @_; 2366 my ($self) = @_;
2174 2367
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2180 return if $self->players; 2372 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
2383 $self->clear;
2384}
2385
2386sub reset_at {
2387 my ($self) = @_;
2388
2389 # TODO: safety, remove and allow resettable per-player maps
2182 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2183 2391
2392 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2393 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2394
2395 $time + $to
2396}
2397
2398sub should_reset {
2399 my ($self) = @_;
2400
2401 $self->reset_at <= $cf::RUNTIME
2402}
2403
2404sub reset {
2405 my ($self) = @_;
2406
2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2408
2409 return if $self->players;
2410
2411 cf::trace "resetting map ", $self->path, "\n";
2412
2184 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2414
2415 # need to save uniques path
2416 unless ($self->{deny_save}) {
2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2418
2419 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2420 if $uniq;
2421 }
2422
2423 delete $cf::MAP{$self->path};
2185 2424
2186 $self->deactivate; 2425 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2427 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2428
2234 $self->unlink_save; 2429 $self->unlink_save;
2235 $self->destroy; 2430 $self->destroy;
2236} 2431}
2237 2432
2245 2440
2246 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2247 2442
2248 $self->unlink_save; 2443 $self->unlink_save;
2249 2444
2250 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2450
2312 : normalise $_ 2507 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2509 ]
2315} 2510}
2316 2511
2512=item cf::map::static_maps
2513
2514Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2515file in the shared directory excluding F</styles> and F</editor>). May
2516block.
2517
2518=cut
2519
2520sub static_maps() {
2521 my @dirs = "";
2522 my @maps;
2523
2524 while (@dirs) {
2525 my $dir = shift @dirs;
2526
2527 next if $dir eq "/styles" || $dir eq "/editor";
2528
2529 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2530 or return;
2531
2532 for (@$files) {
2533 s/\.map$// or next;
2534 utf8::decode $_;
2535 push @maps, "$dir/$_";
2536 }
2537
2538 push @dirs, map "$dir/$_", @$dirs;
2539 }
2540
2541 \@maps
2542}
2543
2317=back 2544=back
2318 2545
2319=head3 cf::object 2546=head3 cf::object
2320 2547
2321=cut 2548=cut
2386 2613
2387our $SAY_CHANNEL = { 2614our $SAY_CHANNEL = {
2388 id => "say", 2615 id => "say",
2389 title => "Map", 2616 title => "Map",
2390 reply => "say ", 2617 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2618 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2619};
2393 2620
2394our $CHAT_CHANNEL = { 2621our $CHAT_CHANNEL = {
2395 id => "chat", 2622 id => "chat",
2396 title => "Chat", 2623 title => "Chat",
2453 2680
2454Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2455 2682
2456The player should be reasonably safe there for short amounts of time (e.g. 2683The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2685though, as the player cannot control the character while it is on the link
2459map. 2686map.
2460 2687
2461Will never block. 2688Will never block.
2462 2689
2463=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2485 my ($self) = @_; 2712 my ($self) = @_;
2486 2713
2487 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2488 2715
2716 ++$self->{_link_recursion};
2717
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2719
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2493 2722
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2724}
2496 2725
2497sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2499 2728
2516 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2518 2747
2519 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2522 2751
2523 $map->load; 2752 $map->load;
2524 $map->load_neighbours;
2525 2753
2526 return unless $self->contr->active; 2754 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2755
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2532} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2533 2763
2764}
2765
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2767
2536Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2771the new (success) or old (failed) map position. In either case, $done will
2546 2778
2547our $GOTOGEN; 2779our $GOTOGEN;
2548 2780
2549sub cf::object::player::goto { 2781sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2551 2789
2552 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2792
2555 $self->enter_link; 2793 $self->enter_link;
2575 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2576 } 2814 }
2577 } 2815 }
2578 2816
2579 my $map = eval { 2817 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2581 2819
2582 if ($map) { 2820 if ($map) {
2583 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2823 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2825 }
2588 2826
2589 $map 2827 $map
2597 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2600 } 2838 }
2601 2839
2602 $done->() if $done; 2840 $done->($self) if $done;
2603 })->prio (1); 2841 })->prio (1);
2604} 2842}
2605 2843
2606=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2607 2845
2675 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2676 2914
2677 unless (eval { 2915 unless (eval {
2678 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2679 2917
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2689 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2691 2944
2692 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2693 2946
2694 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
2700 $self->message ("Something went wrong deep within the deliantra server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2957
2705 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2959 $self->leave_link;
2707 } 2960 }
2708 })->prio (1); 2961 })->prio (1);
2709} 2962}
2710 2963
2722sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2724 2977
2725 utf8::encode $text; 2978 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2980}
2981
2982=item $client->send_big_packet ($pkt)
2983
2984Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required.
2986
2987=cut
2988
2989our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2990
2991sub cf::client::send_big_packet {
2992 my ($self, $pkt) = @_;
2993
2994 # try lzf for large packets
2995 $pkt = "lzf " . Compress::LZF::compress $pkt
2996 if 1024 <= length $pkt and $self->{can_lzf};
2997
2998 # split very large packets
2999 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3000 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3001 $pkt = "frag";
3002 }
3003
3004 $self->send_packet ($pkt);
2727} 3005}
2728 3006
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 3008
2731Send a drawinfo or msg packet to the client, formatting the msg for the 3009Send a drawinfo or msg packet to the client, formatting the msg for the
2735 3013
2736=cut 3014=cut
2737 3015
2738# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2740 "c/identify" => { 3024 "c/identify" => {
2741 id => "infobox", 3025 id => "infobox",
2742 title => "Identify", 3026 title => "Identify",
2743 reply => undef, 3027 reply => undef,
2744 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2746 "c/examine" => { 3030 "c/examine" => {
2747 id => "infobox", 3031 id => "infobox",
2748 title => "Examine", 3032 title => "Examine",
2749 reply => undef, 3033 reply => undef,
2750 tooltip => "Signs and other items you examined", 3034 tooltip => "Signs and other items you examined",
3035 },
3036 "c/shopinfo" => {
3037 id => "infobox",
3038 title => "Shop Info",
3039 reply => undef,
3040 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 3041 },
2752 "c/book" => { 3042 "c/book" => {
2753 id => "infobox", 3043 id => "infobox",
2754 title => "Book", 3044 title => "Book",
2755 reply => undef, 3045 reply => undef,
2783 id => "infobox", 3073 id => "infobox",
2784 title => "Skills", 3074 title => "Skills",
2785 reply => undef, 3075 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 3076 tooltip => "Shows your experience per skill and item power",
2787 }, 3077 },
3078 "c/shopitems" => {
3079 id => "infobox",
3080 title => "Shop Items",
3081 reply => undef,
3082 tooltip => "Shows the items currently for sale in this shop",
3083 },
2788 "c/resistances" => { 3084 "c/resistances" => {
2789 id => "infobox", 3085 id => "infobox",
2790 title => "Resistances", 3086 title => "Resistances",
2791 reply => undef, 3087 reply => undef,
2792 tooltip => "Shows your resistances", 3088 tooltip => "Shows your resistances",
2794 "c/pets" => { 3090 "c/pets" => {
2795 id => "infobox", 3091 id => "infobox",
2796 title => "Pets", 3092 title => "Pets",
2797 reply => undef, 3093 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 3094 tooltip => "Shows information abotu your pets/a specific pet",
3095 },
3096 "c/perceiveself" => {
3097 id => "infobox",
3098 title => "Perceive Self",
3099 reply => undef,
3100 tooltip => "You gained detailed knowledge about yourself",
2799 }, 3101 },
2800 "c/uptime" => { 3102 "c/uptime" => {
2801 id => "infobox", 3103 id => "infobox",
2802 title => "Uptime", 3104 title => "Uptime",
2803 reply => undef, 3105 reply => undef,
2859 my $pkt = "msg " 3161 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3162 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3164 );
2863 3165
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3166 $self->send_big_packet ($pkt);
2875} 3167}
2876 3168
2877=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2878 3170
2879Sends an ext event to the client. 3171Sends an ext event to the client.
2882 3174
2883sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2885 3177
2886 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 } 3183 }
2892} 3184}
2893 3185
2894=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2895 3187
2899 3191
2900sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2902 3194
2903 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove 3198 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 } 3201 }
2910} 3202}
2911 3203
2912=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2913 3205
2984 3276
2985 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
2986 if $reply; 3278 if $reply;
2987 3279
2988 } else { 3280 } else {
2989 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2990 } 3282 }
2991 3283
2992 cf::override; 3284 cf::override;
2993 }, 3285 },
2994); 3286);
3014 3306
3015 $coro 3307 $coro
3016} 3308}
3017 3309
3018cf::client->attach ( 3310cf::client->attach (
3019 on_destroy => sub { 3311 on_client_destroy => sub {
3020 my ($ns) = @_; 3312 my ($ns) = @_;
3021 3313
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3315 },
3024); 3316);
3040our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3041 3333
3042$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3043 3335
3044$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3047 sort time 3339 sort time
3048)); 3340));
3049 3341
3050# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3075 decrease split destroy change_exp value msg lore send_msg)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3076 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3077 ["cf::player" => qw(peaceful send_msg)], 3369 ["cf::player" => qw(peaceful send_msg)],
3078 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3079) { 3371) {
3080 no strict 'refs';
3081 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3083 for @funs; 3374 for @funs;
3084} 3375}
3085 3376
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3104 3395
3105 %vars = (_dummy => 0) unless %vars; 3396 %vars = (_dummy => 0) unless %vars;
3106 3397
3398 my @res;
3107 local $_; 3399 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3400
3110 my $eval = 3401 my $eval =
3111 "do {\n" 3402 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3405 . $code
3115 . "\n}" 3406 . "\n}"
3116 ; 3407 ;
3117 3408
3409 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3413 sub_generation_inc;
3414 } else {
3415 local @cf::_safe_eval_args = values %vars;
3416 @res = wantarray ? eval eval : scalar eval $eval;
3417 }
3121 3418
3122 if ($@) { 3419 if ($@) {
3123 warn "$@"; 3420 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3126 } 3423 }
3127 3424
3128 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3129} 3426}
3130 3427
3144=cut 3441=cut
3145 3442
3146sub register_script_function { 3443sub register_script_function {
3147 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3148 3445
3149 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3151} 3448}
3152 3449
3153=back 3450=back
3154 3451
3155=cut 3452=cut
3164 # for this (global event?) 3461 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3463
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3465
3169 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3170 3467
3171 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3172 0 < aio_load $path, $facedata
3173 or die "$path: $!";
3174
3175 $facedata = Coro::Storable::thaw $facedata;
3176 3469
3177 $facedata->{version} == 2 3470 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3472
3180 # patch in the exptable 3473 # patch in the exptable
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3476 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3477 data => $exp_table,
3478 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3479 };
3185 cf::cede_to_tick; 3480 cf::cede_to_tick;
3186 3481
3187 { 3482 {
3188 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3487
3193 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3197 3493
3198 cf::cede_to_tick; 3494 cf::cede_to_tick;
3199 } 3495 }
3200 3496
3201 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3206 3502
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3506 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3508 }
3213 3509
3214 cf::cede_to_tick; 3510 cf::cede_to_tick;
3215 } 3511 }
3216 } 3512 }
3225 3521
3226 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3227 } 3523 }
3228 3524
3229 { 3525 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3233 3527
3234 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3529 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3531
3239 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3254 } else { 3534 } else {
3255 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3256 } 3536 }
3257 3537
3258 cf::cede_to_tick; 3538 cf::cede_to_tick;
3259 } 3539 }
3260 } 3540 }
3261 3541
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3543
3264 1 3544 1
3265} 3545}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3546
3287register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3289 3549
3290 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3589sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3332} 3592}
3333 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3334sub reload_resources { 3614sub reload_resources {
3335 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3336 3616
3617 reload_exp_table;
3618 reload_materials;
3337 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3338 reload_archetypes; 3621 reload_archetypes;
3339 reload_regions; 3622 reload_regions;
3340 reload_treasures; 3623 reload_treasures;
3341 3624
3342 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3343} 3626}
3344 3627
3345sub reload_config { 3628sub reload_config {
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3347 or return;
3348 3630
3349 local $/; 3631 my $config = load_file "$CONFDIR/config";
3350 *CFG = YAML::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3351 3634
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3636
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356 3639
3357 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3380 3663
3381 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3382 print $fh $$; 3665 print $fh $$;
3383} 3666}
3384 3667
3668sub main_loop {
3669 trace "EV::loop starting\n";
3670 if (1) {
3671 EV::loop;
3672 }
3673 trace "EV::loop returned\n";
3674 goto &main_loop unless $REALLY_UNLOOP;
3675}
3676
3385sub main { 3677sub main {
3386 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3387 3679
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397 3684
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3686
3400 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3407 }; 3694 };
3408 3695
3409 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3410 3697
3411 cf::sync_job { 3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3705 cf::load_settings;
3706
3412 reload_resources; 3707 reload_resources;
3413 reload_config; 3708 reload_config;
3414 db_init; 3709 db_init;
3415 3710
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3711 cf::init_uuid;
3419 cf::init_signals; 3712 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3713 cf::init_skills;
3422 3714
3423 cf::init_beforeplay; 3715 cf::init_beforeplay;
3424 3716
3425 atomic; 3717 atomic;
3427 load_extensions; 3719 load_extensions;
3428 3720
3429 utime time, time, $RUNTIMEFILE; 3721 utime time, time, $RUNTIMEFILE;
3430 3722
3431 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3724 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3726
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3435 }; 3728 };
3436 3729
3437 EV::loop; 3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 my $free_main; $free_main = EV::idle sub {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :)
3736 };
3737
3738 goto &main_loop;
3438} 3739}
3439 3740
3440############################################################################# 3741#############################################################################
3441# initialisation and cleanup 3742# initialisation and cleanup
3442 3743
3443# install some emergency cleanup handlers 3744# install some emergency cleanup handlers
3444BEGIN { 3745BEGIN {
3445 our %SIGWATCHER = (); 3746 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3747 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3748 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3749 cf::cleanup "SIG$signal";
3449 }; 3750 };
3450 } 3751 }
3451} 3752}
3452 3753
3453sub write_runtime_sync { 3754sub write_runtime_sync {
3755 my $t0 = AE::time;
3756
3454 # first touch the runtime file to show we are still running: 3757 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3758 # the fsync below can take a very very long time.
3456 3759
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3760 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3761
3459 my $guard = cf::lock_acquire "write_runtime"; 3762 my $guard = cf::lock_acquire "write_runtime";
3460 3763
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3764 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3765 or return;
3463 3766
3464 my $value = $cf::RUNTIME + 90 + 10; 3767 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3768 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3769 # 60 allows for the watchdog to kill the server.
3479 or return; 3782 or return;
3480 3783
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3784 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3785 and return;
3483 3786
3484 warn "runtime file written.\n"; 3787 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3788
3486 1 3789 1
3487} 3790}
3488 3791
3489our $uuid_lock; 3792our $uuid_lock;
3501 or return; 3804 or return;
3502 3805
3503 my $value = uuid_seq uuid_cur; 3806 my $value = uuid_seq uuid_cur;
3504 3807
3505 unless ($value) { 3808 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3809 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3810 return;
3508 } 3811 }
3509 3812
3510 my $value = uuid_str $value + $uuid_skip; 3813 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3814 $uuid_skip = 0;
3521 or return; 3824 or return;
3522 3825
3523 aio_rename "$uuid~", $uuid 3826 aio_rename "$uuid~", $uuid
3524 and return; 3827 and return;
3525 3828
3526 warn "uuid file written ($value).\n"; 3829 trace "uuid file written ($value).\n";
3527 3830
3528 1 3831 1
3529 3832
3530} 3833}
3531 3834
3537} 3840}
3538 3841
3539sub emergency_save() { 3842sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3843 my $freeze_guard = cf::freeze_mainloop;
3541 3844
3542 warn "emergency_perl_save: enter\n"; 3845 info "emergency_perl_save: enter\n";
3846
3847 # this is a trade-off: we want to be very quick here, so
3848 # save all maps without fsync, and later call a global sync
3849 # (which in turn might be very very slow)
3850 local $USE_FSYNC = 0;
3543 3851
3544 cf::sync_job { 3852 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 3853 cf::write_runtime_sync; # external watchdog should not bark
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549 3854
3550 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 3858 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 3860 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 3861 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 3863 $pl->save;
3559 } 3864 }
3560 warn "emergency_perl_save: end player save\n"; 3865 info "emergency_perl_save: end player save\n";
3561 3866
3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3562 warn "emergency_perl_save: begin map save\n"; 3869 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 3872 $map->valid or next;
3566 $map->save; 3873 $map->save;
3567 } 3874 }
3568 warn "emergency_perl_save: end map save\n"; 3875 info "emergency_perl_save: end map save\n";
3569 3876
3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3570 warn "emergency_perl_save: begin database checkpoint\n"; 3879 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3573 3882
3574 warn "emergency_perl_save: begin write uuid\n"; 3883 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 3884 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n"; 3885 info "emergency_perl_save: end write uuid\n";
3886
3887 cf::write_runtime_sync; # external watchdog should not bark
3888
3889 trace "emergency_perl_save: syncing database to disk";
3890 BDB::db_env_txn_checkpoint $DB_ENV;
3891
3892 info "emergency_perl_save: starting sync\n";
3893 IO::AIO::aio_sync sub {
3894 info "emergency_perl_save: finished sync\n";
3895 };
3896
3897 cf::write_runtime_sync; # external watchdog should not bark
3898
3899 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3902 }
3903
3904 cf::write_runtime_sync; # external watchdog should not bark
3577 }; 3905 };
3578 3906
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3584 warn "emergency_perl_save: leave\n"; 3907 info "emergency_perl_save: leave\n";
3585} 3908}
3586 3909
3587sub post_cleanup { 3910sub post_cleanup {
3588 my ($make_core) = @_; 3911 my ($make_core) = @_;
3589 3912
3913 IO::AIO::flush;
3914
3590 warn Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3916 if $make_core;
3592 3917
3593 my $fh = pidfile; 3918 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 3919 unlink $PIDFILE if <$fh> == $$;
3595} 3920}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3940 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 3941 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 3942 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3943# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 3944 }
3620 warn "cleared package $pkg\n";#d#
3621} 3945}
3622 3946
3623sub do_reload_perl() { 3947sub do_reload_perl() {
3624 # can/must only be called in main 3948 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 3949 unless (in_main) {
3626 warn "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
3627 return; 3951 return;
3628 } 3952 }
3629 3953
3630 return if $RELOAD++; 3954 return if $RELOAD++;
3631 3955
3632 my $t1 = EV::time; 3956 my $t1 = AE::time;
3633 3957
3634 while ($RELOAD) { 3958 while ($RELOAD) {
3635 warn "reloading..."; 3959 cf::get_slot 0.1, -1, "reload_perl";
3960 info "perl_reload: reloading...";
3636 3961
3637 warn "entering sync_job"; 3962 trace "perl_reload: entering sync_job";
3638 3963
3639 cf::sync_job { 3964 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 3965 #cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 3966
3644 warn "syncing database to disk";
3645 BDB::db_env_txn_checkpoint $DB_ENV;
3646
3647 # if anything goes wrong in here, we should simply crash as we already saved
3648
3649 warn "flushing outstanding aio requests";
3650 while (IO::AIO::nreqs || BDB::nreqs) {
3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3652 }
3653
3654 warn "cancelling all extension coros"; 3967 trace "perl_reload: cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 3969 %EXT_CORO = ();
3657 3970
3658 warn "removing commands"; 3971 trace "perl_reload: removing commands";
3659 %COMMAND = (); 3972 %COMMAND = ();
3660 3973
3661 warn "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
3662 %EXTCMD = (); 3975 %EXTCMD = ();
3663 %EXTICMD = (); 3976 %EXTICMD = ();
3664 3977
3665 warn "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 3980 trace "... unloading $pkg";
3668 3981
3669 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
3670 eval { 3983 eval {
3671 $cb->($pkg); 3984 $cb->($pkg);
3672 1 3985 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 3986 } or error "$pkg unloaded, but with errors: $@";
3674 } 3987 }
3675 3988
3676 warn "... clearing $pkg"; 3989 trace "... clearing $pkg";
3677 clear_package $pkg; 3990 clear_package $pkg;
3678 } 3991 }
3679 3992
3680 warn "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 3996
3684 warn "... unloading $k"; 3997 trace "... unloading $k";
3685 delete $INC{$k}; 3998 delete $INC{$k};
3686 3999
3687 $k =~ s/\.pm$//; 4000 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 4001 $k =~ s/\//::/g;
3689 4002
3692 } 4005 }
3693 4006
3694 clear_package $k; 4007 clear_package $k;
3695 } 4008 }
3696 4009
3697 warn "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 4011 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4012 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 4013
3701 warn "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 4017
3705 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
3706 # and global variables created in xs 4019 # and global variables created in xs
3707 #clear_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
3708 4021
3709 warn "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
3710 4023
3711 warn "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
3712 require cf; 4025 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4026 cf::_connect_to_perl_1;
3714 4027
3715 warn "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
3716 cf::reload_config; 4029 cf::reload_config;
3717 4030
3718 warn "loading extensions"; 4031 trace "perl_reload: loading extensions";
3719 cf::load_extensions; 4032 cf::load_extensions;
3720 4033
3721 if ($REATTACH_ON_RELOAD) { 4034 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
3725 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
3728 } 4041 }
3729 4042
3730 warn "running post_init jobs"; 4043 cf::_post_init 1;
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732 4044
3733 warn "leaving sync_job"; 4045 trace "perl_reload: leaving sync_job";
3734 4046
3735 1 4047 1
3736 } or do { 4048 } or do {
3737 warn $@; 4049 error $@;
3738 cf::cleanup "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
3739 }; 4051 };
3740 4052
3741 warn "reloaded";
3742 --$RELOAD; 4053 --$RELOAD;
3743 } 4054 }
3744 4055
3745 $t1 = EV::time - $t1; 4056 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 4057 info "perl_reload: completed in ${t1}s\n";
3747}; 4058};
3748 4059
3749our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
3750 4061
3751sub reload_perl() { 4062sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 4064 # coro crashes during coro_state_free->destroy here.
3754 4065
3755 $RELOAD_WATCHER ||= cf::async { 4066 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 4067 Coro::AIO::aio_wait cache_extensions;
3757 4068
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4069 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 4070 do_reload_perl;
3760 undef $RELOAD_WATCHER; 4071 undef $RELOAD_WATCHER;
3761 }; 4072 };
3762 }; 4073 };
3763} 4074}
3772 reload_perl; 4083 reload_perl;
3773 }; 4084 };
3774 } 4085 }
3775}; 4086};
3776 4087
3777unshift @INC, $LIBDIR; 4088#############################################################################
3778 4089
3779my $bug_warning = 0; 4090my $bug_warning = 0;
3780 4091
3781our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN;
3783
3784sub wait_for_tick { 4092sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3786 4094
3787 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
3788 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait;
3790} 4096}
3791 4097
3792sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794 4100
3795 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4103 $signal->wait;
3798} 4104}
3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3803 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
3804 return; 4110 return;
3805 } 4111 }
3806 4112
3807 cf::server_tick; # one server iteration 4113 cf::one_tick; # one server iteration
4114
4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 4116
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4119 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4120 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4121 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4122 or error "ERROR: unable to write runtime file: $!";
3815 }; 4123 };
3816 } 4124 }
3817 4125
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4127 $sig->send;
3820 } 4128 }
3821 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
3822 $sig->send;
3823 }
3824 4130
3825 $LOAD = ($NOW - $TICK_START) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3827 4133
3828 if (0) { 4134 if (0) {
3829 if ($NEXT_TICK) { 4135 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4136 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4137 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4138 debug "jitter $JITTER\n";#d#
3833 } 4139 }
3834 } 4140 }
3835} 4141}
3836 4142
3837{ 4143{
3838 # configure BDB 4144 # configure BDB
3839 4145
3840 BDB::min_parallel 8; 4146 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4147 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4148 $AnyEvent::BDB::WATCHER->priority (1);
3843 4149
3844 unless ($DB_ENV) { 4150 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4151 $DB_ENV = BDB::db_env_create;
3882 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4190 undef $AnyEvent::AIO::WATCHER;
3885} 4191}
3886 4192
3887my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
3888 4195
3889sub _log_backtrace { 4196sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
3891 4198
3892 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
3893 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4207 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4208 my $perl_bt = Carp::longmess $msg;
3898 async { 4209 async {
3899 $Coro::current->{desc} = "abt $msg"; 4210 $Coro::current->{desc} = "abt $msg";
3900 4211
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4232 --$_log_backtrace;
3922 }; 4233 };
3923 } else { 4234 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4237 }
3927} 4238}
3928 4239
3929# load additional modules 4240# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4241require "cf/$_.pm" for @EXTRA_MODULES;
4242cf::_connect_to_perl_2;
3931 4243
3932END { cf::emergency_save } 4244END { cf::emergency_save }
3933 4245
39341 42461
3935 4247

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines