ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.571 by root, Wed May 4 19:04:45 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
155 174
156our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
157 176
158sub cf::map::normalise; 177sub cf::map::normalise;
159 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
160############################################################################# 183#############################################################################
161 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
162=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
163 197
164=over 4 198=over 4
165 199
166=item $cf::UPTIME 200=item $cf::UPTIME
167 201
168The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
169 218
170=item $cf::RUNTIME 219=item $cf::RUNTIME
171 220
172The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
173every server tick. 222every server tick.
179Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
180directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
181unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
182database environment. 231database environment.
183 232
184=item $cf::NOW
185
186The time of the last (current) server tick.
187
188=item $cf::TICK
189
190The interval between server ticks, in seconds.
191
192=item $cf::LOADAVG 233=item $cf::LOADAVG
193 234
194The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
195(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
196objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
205from wherever your confdir points to. 246from wherever your confdir points to.
206 247
207=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
208 249
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
210returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
213=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
214 272
215This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 275that call.
218 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
219=back 283=back
220 284
221=cut 285=cut
222 286
223BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 294 my $msg = join "", @_;
226 295
227 $msg .= "\n" 296 $msg .= "\n"
228 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
229 298
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 300
232 LOG llevError, $msg; 301 LOG llevWarn, $msg;
233 }; 302};
234}
235 303
236$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
238 306
239 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 311 return;#d#
242 }#d# 312 }#d#
243 313
244 # kill coroutine otherwise 314 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 315 Coro::terminate
247}; 316};
248
249$SIG{__DIE__} = sub { }; #d#?
250 317
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 335)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 337}
271 338
272$EV::DIED = sub { 339$EV::DIED = sub {
273 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
274}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
275 347
276############################################################################# 348#############################################################################
277 349
278=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
279 351
300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
301 $d 373 $d
302 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
303} 375}
304 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
305=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
306 392
307Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
308 394
309=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316 402
317sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
319 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
320=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
321 438
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
324 441
325The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 443is a reload or not.
327 444
328=cut 445=cut
329 446
330sub post_init(&) { 447sub post_init(&) {
331 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
332} 466}
333 467
334=item cf::lock_wait $string 468=item cf::lock_wait $string
335 469
336Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
375} 509}
376 510
377=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
378 512
379Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 514get spread over time.
381 515
382=cut 516=cut
383 517
384sub periodic($$) { 518sub periodic($$) {
385 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
389 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
390} 524}
391 525
392=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
393 527
394Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
395This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
396of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
397 535
398The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
399used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
400 538
401Useful for short background jobs. 539Useful for short background jobs.
402 540
403=cut 541=cut
404 542
405our @SLOT_QUEUE; 543our @SLOT_QUEUE;
406our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
407 546
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
411 550
412 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
413 553
414 while () { 554 while () {
415 next_job: 555 next_job:
556
416 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 558
418 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 563 $job->[2]->send;
422 Coro::cede; 564 Coro::cede;
423 goto next_job; 565 goto next_job;
424 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 568 }
426 } 569 }
427 570
428 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
431 $signal->wait;
432 } else { 574 } else {
575 $busy = 0;
433 Coro::schedule; 576 Coro::schedule;
434 } 577 }
435 } 578 }
436}; 579};
437 580
438sub get_slot($;$$) { 581sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
440 583
441 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
442 585
443 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
444 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
445 589
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
474=cut 618=cut
475 619
476sub sync_job(&) { 620sub sync_job(&) {
477 my ($job) = @_; 621 my ($job) = @_;
478 622
479 if ($Coro::current == $Coro::main) { 623 if (in_main) {
480 my $time = EV::time; 624 my $time = AE::time;
481 625
482 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
484 628
485 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
486 630
487 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
488 632
489 my $busy = 1; 633 my $busy = 1;
490 my @res; 634 my @res;
491 635
492 (async { 636 (async {
493 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 638 @res = eval { $job->() };
495 warn $@ if $@; 639 error $@ if $@;
496 undef $busy; 640 undef $busy;
497 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
498 642
499 while ($busy) { 643 while ($busy) {
500 if (Coro::nready) { 644 if (Coro::nready) {
502 } else { 646 } else {
503 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
504 } 648 }
505 } 649 }
506 650
507 my $time = EV::time - $time; 651 my $time = AE::time - $time;
508 652
509 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
510 654
511 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
512 } else { 656 } else {
534 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
535 679
536 $coro 680 $coro
537} 681}
538 682
539=item fork_call { }, $args 683=item fork_call { }, @args
540 684
541Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 688never block itself or use any form of event handling.
545 689
546=cut 690=cut
547 691
692sub post_fork {
693 reset_signals;
694}
695
548sub fork_call(&@) { 696sub fork_call(&@) {
549 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
550 698
551 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
554 702
555 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
556 reset_signals; 704 cf::post_fork;
557 &$cb 705 &$cb
558 }, @args; 706 } @args;
559 707
560 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
561} 720}
562 721
563=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
564 723
565=cut 724=cut
602within each server. 761within each server.
603 762
604=cut 763=cut
605 764
606sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
607 my ($name) = @_; 769 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
609 771
610 eval { 772 eval {
611 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
621} 783}
622 784
623our $DB; 785our $DB;
624 786
625sub db_init { 787sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
628 };
629} 789}
630 790
631sub db_get($$) { 791sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
633 793
634 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
635 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
636 798
637 $! ? () 799 $! ? ()
638 : $data 800 : $data
639 }
640} 801}
641 802
642sub db_put($$$) { 803sub db_put($$$) {
643 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
672 833
673 my @data; 834 my @data;
674 my $md5; 835 my $md5;
675 836
676 for (0 .. $#$src) { 837 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
678 or Carp::croak "$src->[$_]: $!";
679 } 839 }
680 840
681 # if processing is expensive, check 841 # if processing is expensive, check
682 # checksum first 842 # checksum first
683 if (1) { 843 if (1) {
700 860
701 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 862 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
704 864
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 866
707 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
710 870
720 880
721=cut 881=cut
722 882
723sub datalog($@) { 883sub datalog($@) {
724 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 886}
727 887
728=back 888=back
729 889
730=cut 890=cut
925 1085
926 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1088
929 } elsif (ref $type) { 1089 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
931 1091
932 } else { 1092 } else {
933 shift @arg; 1093 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
935 } 1095 }
936 } 1096 }
937} 1097}
938 1098
939sub _object_attach { 1099sub _object_attach {
949 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
950 } 1110 }
951 1111
952 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
953 } else { 1113 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1115 }
956 1116
957 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
958} 1118}
959 1119
1018 1178
1019 for (@$callbacks) { 1179 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1021 1181
1022 if ($@) { 1182 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1184 override;
1026 } 1185 }
1027 1186
1028 return 1 if $override; 1187 return 1 if $override;
1029 } 1188 }
1108 for (@$attach) { 1267 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1111 } 1270 }
1112 } else { 1271 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1273 }
1115 } 1274 }
1116} 1275}
1117 1276
1118cf::attachable->attach ( 1277cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1146 1305
1147 sync_job { 1306 sync_job {
1148 if (length $$rdata) { 1307 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1152 1312
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1318 aio_fsync $fh;
1319 }
1157 aio_close $fh; 1320 aio_close $fh;
1158 1321
1159 if (@$objs) { 1322 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1329 aio_fsync $fh;
1330 }
1165 aio_close $fh; 1331 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1333 }
1168 } else { 1334 } else {
1169 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1173 1339
1174 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1342 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1178 } 1344 }
1179 } else { 1345 } else {
1180 aio_unlink $filename; 1346 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1182 } 1348 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1373 $av = $st->{objs};
1208 } 1374 }
1209 1375
1210 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1213 1380
1214 ($data, $av) 1381 ($data, $av)
1215} 1382}
1216 1383
1217=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1276} 1443}
1277 1444
1278use File::Glob (); 1445use File::Glob ();
1279 1446
1280cf::player->attach ( 1447cf::player->attach (
1281 on_command => sub { 1448 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1283 1450
1284 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1285 or return; 1452 or return;
1286 1453
1309 1476
1310 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1478 if $reply;
1312 1479
1313 } else { 1480 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1482 }
1316 1483
1317 cf::override; 1484 cf::override;
1318 }, 1485 },
1319); 1486);
1320 1487
1321# "readahead" all extensions 1488# "readahead" all extensions
1322sub cache_extensions { 1489sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1490 my $grp = IO::AIO::aio_group;
1324 1491
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1493 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1495 }
1329 }; 1496 };
1330 1497
1331 $grp 1498 $grp
1332} 1499}
1333 1500
1334sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1335 cf::sync_job { 1504 cf::sync_job {
1336 my %todo; 1505 my %todo;
1337 1506
1338 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1508 next unless -r $path;
1357 1526
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1529
1361 $ext{source} = 1530 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1364 . $source 1533 . $source
1365 . "\n};\n1"; 1534 . "\n};\n1";
1366 1535
1367 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1368 } 1537 }
1369 1538
1539 my $pass = 0;
1370 my %done; 1540 my %done;
1371 while (%todo) { 1541 while (%todo) {
1372 my $progress; 1542 my $progress;
1373 1543
1544 ++$pass;
1545
1546 ext:
1374 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1549 next ext
1377 unless exists $done{$_}; 1550 unless exists $done{$_};
1378 } 1551 }
1379 1552
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1554
1382 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1559
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1561 if exists $v->{meta}{mandatory};
1390 1562
1391 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;
1392 } 1572 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1573 }
1398 1574
1399 skip: 1575 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 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 }
1402 } 1585 }
1403 }; 1586 };
1404} 1587}
1405 1588
1406############################################################################# 1589#############################################################################
1490 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1491 } 1674 }
1492 } 1675 }
1493} 1676}
1494 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
1495sub save($) { 1691sub save($) {
1496 my ($pl) = @_; 1692 my ($pl) = @_;
1497 1693
1498 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1499 1695
1504 1700
1505 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1507 1703
1508 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];
1509 1708
1510 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1710 cf::cede_to_tick;
1512} 1711}
1513 1712
1547 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1548 1747
1549 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1550 $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
1551 1750
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553 $pl->deactivate; 1752 $pl->deactivate;
1753
1554 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;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1557 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1558 1759
1559 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1561 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1615 \@logins 1816 \@logins
1616} 1817}
1617 1818
1618=item $player->maps 1819=item $player->maps
1619 1820
1821=item cf::player::maps $login
1822
1620Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1621player. May block. 1824player. May block.
1622 1825
1623=cut 1826=cut
1624 1827
1686=cut 1889=cut
1687 1890
1688sub find_by_path($) { 1891sub find_by_path($) {
1689 my ($path) = @_; 1892 my ($path) = @_;
1690 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1691 my ($match, $specificity); 1896 my ($match, $specificity);
1692 1897
1693 for my $region (list) { 1898 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1723sub generate_random_map { 1928sub generate_random_map {
1724 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1725 1930
1726 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
1727 1932
1728 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom}
1741 )
1742} 1934}
1743 1935
1744=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1745 1937
1746Register 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
1751 1943
1752sub register { 1944sub register {
1753 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1946 my $pkg = caller;
1755 1947
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1949
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1951}
1761 1952
1762# also paths starting with '/' 1953# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1955
1765sub thawer_merge { 1956sub thawer_merge {
1766 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1767 1958
1768 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1773} 1964}
1774 1965
1775sub normalise { 1966sub normalise {
1776 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1777 1968
1778 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1779 1970
1780 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1781 1972
1782 # map plan: 1973 # map plan:
1783 # 1974 #
1798 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 1990 $path = "$base/$path";
1800 } 1991 }
1801 1992
1802 for ($path) { 1993 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1806 } 1996 }
1807 1997
1808 $path 1998 $path
1822 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1823 return $self; 2013 return $self;
1824 } 2014 }
1825 } 2015 }
1826 2016
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 2018 ()
1829} 2019}
1830 2020
2021# may re-bless or do other evil things
1831sub init { 2022sub init {
1832 my ($self) = @_; 2023 my ($self) = @_;
1833 2024
1834 $self 2025 $self
1835} 2026}
1900 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1901 2092
1902 1 2093 1
1903} 2094}
1904 2095
2096# used to laod the header of an original map
1905sub load_header_orig { 2097sub load_header_orig {
1906 my ($self) = @_; 2098 my ($self) = @_;
1907 2099
1908 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1909} 2101}
1910 2102
2103# used to laod the header of an instantiated map
1911sub load_header_temp { 2104sub load_header_temp {
1912 my ($self) = @_; 2105 my ($self) = @_;
1913 2106
1914 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1915} 2108}
1916 2109
2110# called after loading the header from an instantiated map
1917sub prepare_temp { 2111sub prepare_temp {
1918 my ($self) = @_; 2112 my ($self) = @_;
1919 2113
1920 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1921 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1922 # safety 2116 # safety
1923 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1924 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1925} 2119}
1926 2120
2121# called after loading the header from an original map
1927sub prepare_orig { 2122sub prepare_orig {
1928 my ($self) = @_; 2123 my ($self) = @_;
1929 2124
1930 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1931 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1955 2150
1956sub find; 2151sub find;
1957sub find { 2152sub find {
1958 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1959 2154
2155 cf::cede_to_tick;
2156
1960 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1961 2158
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1964 2161
1965 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1982 2179
1983 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1984 } 2181 }
1985} 2182}
1986 2183
1987sub pre_load { } 2184sub pre_load { }
1988sub post_load { } 2185#sub post_load { } # XS
1989 2186
1990sub load { 2187sub load {
1991 my ($self) = @_; 2188 my ($self) = @_;
1992 2189
1993 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
1996 2193
1997 { 2194 {
1998 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
1999 2196
2000 return unless $self->valid; 2197 return unless $self->valid;
2001 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2002
2003 $self->in_memory (cf::MAP_LOADING);
2004 2199
2005 $self->alloc; 2200 $self->alloc;
2006 2201
2007 $self->pre_load; 2202 $self->pre_load;
2008 cf::cede_to_tick; 2203 cf::cede_to_tick;
2009 2204
2205 if (exists $self->{load_path}) {
2010 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2011 $f->skip_block; 2207 $f->skip_block;
2012 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2013 or return; 2209 or return;
2014 2210
2015 $self->post_load_original 2211 $self->post_load_original
2016 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2017 2213
2018 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2019 utf8::encode $uniq; 2215 utf8::encode $uniq;
2020 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2021 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2022 $self->clear_unique_items; 2218 $self->clear_unique_items;
2023 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2024 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2025 } 2222 }
2026 } 2223 }
2027 }
2028 2224
2029 $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);
2030 2232
2031 cf::cede_to_tick; 2233 cf::cede_to_tick;
2032 # now do the right thing for maps 2234 # now do the right thing for maps
2033 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2034 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2037 2239
2038 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2039 $self->decay_objects; 2241 $self->decay_objects;
2040 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2041 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2042 cf::cede_to_tick; 2245 cf::cede_to_tick;
2043 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2044 } 2247 }
2045 2248
2046 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2047 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2048
2049 $self->in_memory (cf::MAP_ACTIVE);
2050 } 2251 }
2051 2252
2052 $self->post_load; 2253 $self->post_load;
2053}
2054 2254
2255 1
2256}
2257
2258# customize the map for a given player, i.e.
2259# return the _real_ map. used by e.g. per-player
2260# maps to change the path to ~playername/mappath
2055sub customise_for { 2261sub customise_for {
2056 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2057 2263
2058 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2265 if $self->per_player;
2075 or next; 2281 or next;
2076 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2077 or next; 2283 or next;
2078 $neigh->load; 2284 $neigh->load;
2079 2285
2286 # now find the diagonal neighbours
2080 push @neigh, 2287 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2290 }
2084 2291
2091} 2298}
2092 2299
2093sub find_sync { 2300sub find_sync {
2094 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2095 2302
2096 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2097} 2308}
2098 2309
2099sub do_load_sync { 2310sub do_load_sync {
2100 my ($map) = @_; 2311 my ($map) = @_;
2101 2312
2313 # it's a bug to call this from the main context
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2104 2316
2105 cf::sync_job { $map->load }; 2317 $map->load;
2106} 2318}
2107 2319
2108our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2110 2322
2111sub find_async { 2323sub find_async {
2112 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2113 2325
2114 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2115 2327
2116 if (my $map = $cf::MAP{$path}) { 2328 if (my $map = $cf::MAP{$path}) {
2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2329 return $map if !$load || $map->linkable;
2118 } 2330 }
2119 2331
2120 $MAP_PREFETCH{$path} |= $load; 2332 $MAP_PREFETCH{$path} |= $load;
2121 2333
2122 $MAP_PREFETCHER ||= cf::async { 2334 $MAP_PREFETCHER ||= cf::async {
2136 $MAP_PREFETCHER->prio (6); 2348 $MAP_PREFETCHER->prio (6);
2137 2349
2138 () 2350 ()
2139} 2351}
2140 2352
2353# common code, used by both ->save and ->swapout
2141sub save { 2354sub _save {
2142 my ($self) = @_; 2355 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2356
2146 $self->{last_save} = $cf::RUNTIME; 2357 $self->{last_save} = $cf::RUNTIME;
2147 2358
2148 return unless $self->dirty; 2359 return unless $self->dirty;
2149 2360
2169 } else { 2380 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2381 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2382 }
2172} 2383}
2173 2384
2385sub save {
2386 my ($self) = @_;
2387
2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
2389
2390 $self->_save;
2391}
2392
2174sub swap_out { 2393sub swap_out {
2175 my ($self) = @_; 2394 my ($self) = @_;
2176 2395
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2396 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2397
2398 return if !$self->linkable;
2399 return if $self->{deny_save};
2182 return if $self->players; 2400 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2401
2402 # first deactivate the map and "unlink" it from the core
2403 $self->deactivate;
2404 $_->clear_links_to ($self) for values %cf::MAP;
2405 $self->state (cf::MAP_SWAPPED);
2406
2407 # then atomically save
2408 $self->_save;
2409
2410 # then free the map
2411 $self->clear;
2412}
2413
2414sub reset_at {
2415 my ($self) = @_;
2416
2417 # TODO: safety, remove and allow resettable per-player maps
2184 return if $self->{deny_save}; 2418 return 1e99 if $self->{deny_reset};
2185 2419
2420 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2421 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2422
2423 $time + $to
2424}
2425
2426sub should_reset {
2427 my ($self) = @_;
2428
2429 $self->reset_at <= $cf::RUNTIME
2430}
2431
2432sub reset {
2433 my ($self) = @_;
2434
2435 my $lock = cf::lock_acquire "map_data:$self->{path}";
2436
2437 return if $self->players;
2438
2439 cf::trace "resetting map ", $self->path, "\n";
2440
2186 $self->in_memory (cf::MAP_SWAPPED); 2441 $self->state (cf::MAP_SWAPPED);
2442
2443 # need to save uniques path
2444 unless ($self->{deny_save}) {
2445 my $uniq = $self->uniq_path; utf8::encode $uniq;
2446
2447 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2448 if $uniq;
2449 }
2450
2451 delete $cf::MAP{$self->path};
2187 2452
2188 $self->deactivate; 2453 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2454 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2455 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2456
2236 $self->unlink_save; 2457 $self->unlink_save;
2237 $self->destroy; 2458 $self->destroy;
2238} 2459}
2239 2460
2247 2468
2248 delete $cf::MAP{$self->path}; 2469 delete $cf::MAP{$self->path};
2249 2470
2250 $self->unlink_save; 2471 $self->unlink_save;
2251 2472
2252 bless $self, "cf::map"; 2473 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2474 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2475 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2476 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2477 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2478
2314 : normalise $_ 2535 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2536 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2537 ]
2317} 2538}
2318 2539
2540=item cf::map::static_maps
2541
2542Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2543file in the shared directory excluding F</styles> and F</editor>). May
2544block.
2545
2546=cut
2547
2548sub static_maps() {
2549 my @dirs = "";
2550 my @maps;
2551
2552 while (@dirs) {
2553 my $dir = shift @dirs;
2554
2555 next if $dir eq "/styles" || $dir eq "/editor";
2556
2557 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2558 or return;
2559
2560 for (@$files) {
2561 s/\.map$// or next;
2562 utf8::decode $_;
2563 push @maps, "$dir/$_";
2564 }
2565
2566 push @dirs, map "$dir/$_", @$dirs;
2567 }
2568
2569 \@maps
2570}
2571
2319=back 2572=back
2320 2573
2321=head3 cf::object 2574=head3 cf::object
2322 2575
2323=cut 2576=cut
2455 2708
2456Freezes the player and moves him/her to a special map (C<{link}>). 2709Freezes the player and moves him/her to a special map (C<{link}>).
2457 2710
2458The player should be reasonably safe there for short amounts of time (e.g. 2711The player should be reasonably safe there for short amounts of time (e.g.
2459for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2712for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link 2713though, as the player cannot control the character while it is on the link
2461map. 2714map.
2462 2715
2463Will never block. 2716Will never block.
2464 2717
2465=item $player_object->leave_link ($map, $x, $y) 2718=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2739sub cf::object::player::enter_link {
2487 my ($self) = @_; 2740 my ($self) = @_;
2488 2741
2489 $self->deactivate_recursive; 2742 $self->deactivate_recursive;
2490 2743
2744 ++$self->{_link_recursion};
2745
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2746 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2747
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2749 if $self->map && $self->map->{path} ne "{link}";
2495 2750
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2751 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2752}
2498 2753
2499sub cf::object::player::leave_link { 2754sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2755 my ($self, $map, $x, $y) = @_;
2501 2756
2518 ($x, $y) = (-1, -1) 2773 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2774 unless (defined $x) && (defined $y);
2520 2775
2521 # use -1 or undef as default coordinates, not 0, 0 2776 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2777 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2778 if $x <= 0 && $y <= 0;
2524 2779
2525 $map->load; 2780 $map->load;
2526 $map->load_neighbours; 2781 $map->load_neighbours;
2527 2782
2528 return unless $self->contr->active; 2783 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2784
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2785 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2786 if ($self->enter_map ($map, $x, $y)) {
2534} 2787 # entering was successful
2788 delete $self->{_link_recursion};
2789 # only activate afterwards, to support waiting in hooks
2790 $self->activate_recursive;
2791 }
2535 2792
2793}
2794
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2795=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2796
2538Moves the player to the given map-path and coordinates by first freezing 2797Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2798her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2799that has to return the map if sucecssful, and then unfreezes the player on
2541the new (success) or old (failed) map position. In either case, $done will 2800the new (success) or old (failed) map position. In either case, $done will
2548 2807
2549our $GOTOGEN; 2808our $GOTOGEN;
2550 2809
2551sub cf::object::player::goto { 2810sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2811 my ($self, $path, $x, $y, $check, $done) = @_;
2812
2813 if ($self->{_link_recursion} >= $MAX_LINKS) {
2814 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2815 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2816 ($path, $x, $y) = @$EMERGENCY_POSITION;
2817 }
2553 2818
2554 # do generation counting so two concurrent goto's will be executed in-order 2819 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2820 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2821
2557 $self->enter_link; 2822 $self->enter_link;
2577 ($path, $x, $y) = (undef, undef, undef); 2842 ($path, $x, $y) = (undef, undef, undef);
2578 } 2843 }
2579 } 2844 }
2580 2845
2581 my $map = eval { 2846 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2847 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2583 2848
2584 if ($map) { 2849 if ($map) {
2585 $map = $map->customise_for ($self); 2850 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2851 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2852 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2853 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2854 }
2590 2855
2591 $map 2856 $map
2599 if ($gen == $self->{_goto_generation}) { 2864 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2865 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2866 $self->leave_link ($map, $x, $y);
2602 } 2867 }
2603 2868
2604 $done->() if $done; 2869 $done->($self) if $done;
2605 })->prio (1); 2870 })->prio (1);
2606} 2871}
2607 2872
2608=item $player_object->enter_exit ($exit_object) 2873=item $player_object->enter_exit ($exit_object)
2609 2874
2677 $Coro::current->{desc} = "enter_exit"; 2942 $Coro::current->{desc} = "enter_exit";
2678 2943
2679 unless (eval { 2944 unless (eval {
2680 $self->deactivate_recursive; # just to be sure 2945 $self->deactivate_recursive; # just to be sure
2681 2946
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2691 my $x = $exit->stats->hp; 2948 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp; 2949 my $y = $exit->stats->sp;
2950
2951 # special map handling
2952 my $slaying = $exit->slaying;
2953
2954 # special map handling
2955 if ($slaying eq "/!") {
2956 my $guard = cf::lock_acquire "exit_prepare:$exit";
2957
2958 prepare_random_map $exit
2959 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2960
2961 $map = $exit->slaying;
2962
2963 } elsif ($slaying eq '!up') {
2964 $map = $exit->map->tile_path (cf::TILE_UP);
2965 $x = $exit->x;
2966 $y = $exit->y;
2967
2968 } elsif ($slaying eq '!down') {
2969 $map = $exit->map->tile_path (cf::TILE_DOWN);
2970 $x = $exit->x;
2971 $y = $exit->y;
2972 }
2693 2973
2694 $self->goto ($map, $x, $y); 2974 $self->goto ($map, $x, $y);
2695 2975
2696 # if exit is damned, update players death & WoR home-position 2976 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y) 2977 $self->contr->savebed ($map, $x, $y)
2702 $self->message ("Something went wrong deep within the deliantra server. " 2982 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2983 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2984 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2985 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2986
2707 warn "ERROR in enter_exit: $@"; 2987 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2988 $self->leave_link;
2709 } 2989 }
2710 })->prio (1); 2990 })->prio (1);
2711} 2991}
2712 2992
2724sub cf::client::send_drawinfo { 3004sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 3005 my ($self, $text, $flags) = @_;
2726 3006
2727 utf8::encode $text; 3007 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3008 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3009}
3010
3011=item $client->send_big_packet ($pkt)
3012
3013Like C<send_packet>, but tries to compress large packets, and fragments
3014them as required.
3015
3016=cut
3017
3018our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3019
3020sub cf::client::send_big_packet {
3021 my ($self, $pkt) = @_;
3022
3023 # try lzf for large packets
3024 $pkt = "lzf " . Compress::LZF::compress $pkt
3025 if 1024 <= length $pkt and $self->{can_lzf};
3026
3027 # split very large packets
3028 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3029 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3030 $pkt = "frag";
3031 }
3032
3033 $self->send_packet ($pkt);
2729} 3034}
2730 3035
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 3036=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 3037
2733Send a drawinfo or msg packet to the client, formatting the msg for the 3038Send a drawinfo or msg packet to the client, formatting the msg for the
2737 3042
2738=cut 3043=cut
2739 3044
2740# non-persistent channels (usually the info channel) 3045# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 3046our %CHANNEL = (
3047 "c/motd" => {
3048 id => "infobox",
3049 title => "MOTD",
3050 reply => undef,
3051 tooltip => "The message of the day",
3052 },
2742 "c/identify" => { 3053 "c/identify" => {
2743 id => "infobox", 3054 id => "infobox",
2744 title => "Identify", 3055 title => "Identify",
2745 reply => undef, 3056 reply => undef,
2746 tooltip => "Items recently identified", 3057 tooltip => "Items recently identified",
2748 "c/examine" => { 3059 "c/examine" => {
2749 id => "infobox", 3060 id => "infobox",
2750 title => "Examine", 3061 title => "Examine",
2751 reply => undef, 3062 reply => undef,
2752 tooltip => "Signs and other items you examined", 3063 tooltip => "Signs and other items you examined",
3064 },
3065 "c/shopinfo" => {
3066 id => "infobox",
3067 title => "Shop Info",
3068 reply => undef,
3069 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 3070 },
2754 "c/book" => { 3071 "c/book" => {
2755 id => "infobox", 3072 id => "infobox",
2756 title => "Book", 3073 title => "Book",
2757 reply => undef, 3074 reply => undef,
2785 id => "infobox", 3102 id => "infobox",
2786 title => "Skills", 3103 title => "Skills",
2787 reply => undef, 3104 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 3105 tooltip => "Shows your experience per skill and item power",
2789 }, 3106 },
3107 "c/shopitems" => {
3108 id => "infobox",
3109 title => "Shop Items",
3110 reply => undef,
3111 tooltip => "Shows the items currently for sale in this shop",
3112 },
2790 "c/resistances" => { 3113 "c/resistances" => {
2791 id => "infobox", 3114 id => "infobox",
2792 title => "Resistances", 3115 title => "Resistances",
2793 reply => undef, 3116 reply => undef,
2794 tooltip => "Shows your resistances", 3117 tooltip => "Shows your resistances",
2796 "c/pets" => { 3119 "c/pets" => {
2797 id => "infobox", 3120 id => "infobox",
2798 title => "Pets", 3121 title => "Pets",
2799 reply => undef, 3122 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 3123 tooltip => "Shows information abotu your pets/a specific pet",
3124 },
3125 "c/perceiveself" => {
3126 id => "infobox",
3127 title => "Perceive Self",
3128 reply => undef,
3129 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3130 },
2802 "c/uptime" => { 3131 "c/uptime" => {
2803 id => "infobox", 3132 id => "infobox",
2804 title => "Uptime", 3133 title => "Uptime",
2805 reply => undef, 3134 reply => undef,
2861 my $pkt = "msg " 3190 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3191 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3192 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3193 );
2865 3194
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3195 $self->send_big_packet ($pkt);
2877} 3196}
2878 3197
2879=item $client->ext_msg ($type, @msg) 3198=item $client->ext_msg ($type, @msg)
2880 3199
2881Sends an ext event to the client. 3200Sends an ext event to the client.
2884 3203
2885sub cf::client::ext_msg($$@) { 3204sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3205 my ($self, $type, @msg) = @_;
2887 3206
2888 if ($self->extcmd == 2) { 3207 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3208 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3209 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3210 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3211 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3212 }
2894} 3213}
2895 3214
2896=item $client->ext_reply ($msgid, @msg) 3215=item $client->ext_reply ($msgid, @msg)
2897 3216
2901 3220
2902sub cf::client::ext_reply($$@) { 3221sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3222 my ($self, $id, @msg) = @_;
2904 3223
2905 if ($self->extcmd == 2) { 3224 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3225 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3226 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3227 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3228 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3229 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3230 }
2912} 3231}
2913 3232
2914=item $success = $client->query ($flags, "text", \&cb) 3233=item $success = $client->query ($flags, "text", \&cb)
2915 3234
2986 3305
2987 $ns->ext_reply ($reply, @reply) 3306 $ns->ext_reply ($reply, @reply)
2988 if $reply; 3307 if $reply;
2989 3308
2990 } else { 3309 } else {
2991 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3310 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2992 } 3311 }
2993 3312
2994 cf::override; 3313 cf::override;
2995 }, 3314 },
2996); 3315);
3016 3335
3017 $coro 3336 $coro
3018} 3337}
3019 3338
3020cf::client->attach ( 3339cf::client->attach (
3021 on_destroy => sub { 3340 on_client_destroy => sub {
3022 my ($ns) = @_; 3341 my ($ns) = @_;
3023 3342
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3343 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3344 },
3026); 3345);
3042our $safe_hole = new Safe::Hole; 3361our $safe_hole = new Safe::Hole;
3043 3362
3044$SIG{FPE} = 'IGNORE'; 3363$SIG{FPE} = 'IGNORE';
3045 3364
3046$safe->permit_only (Opcode::opset qw( 3365$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3366 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3367 grepstart grepwhile mapstart mapwhile
3049 sort time 3368 sort time
3050)); 3369));
3051 3370
3052# here we export the classes and methods available to script code 3371# here we export the classes and methods available to script code
3077 decrease split destroy change_exp value msg lore send_msg)], 3396 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3397 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful send_msg)], 3398 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3399 ["cf::map" => qw(trigger)],
3081) { 3400) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3401 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3402 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3403 for @funs;
3086} 3404}
3087 3405
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3422 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3423 $qcode =~ s/\n/\\n/g;
3106 3424
3107 %vars = (_dummy => 0) unless %vars; 3425 %vars = (_dummy => 0) unless %vars;
3108 3426
3427 my @res;
3109 local $_; 3428 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3429
3112 my $eval = 3430 my $eval =
3113 "do {\n" 3431 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3432 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3433 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3434 . $code
3117 . "\n}" 3435 . "\n}"
3118 ; 3436 ;
3119 3437
3438 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3439 sub_generation_inc;
3440 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3441 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3442 sub_generation_inc;
3443 } else {
3444 local @cf::_safe_eval_args = values %vars;
3445 @res = wantarray ? eval eval : scalar eval $eval;
3446 }
3123 3447
3124 if ($@) { 3448 if ($@) {
3125 warn "$@"; 3449 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3450 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3451 "with arguments " . (join " ", %vars) . "\n";
3128 } 3452 }
3129 3453
3130 wantarray ? @res : $res[0] 3454 wantarray ? @res : $res[0]
3131} 3455}
3132 3456
3146=cut 3470=cut
3147 3471
3148sub register_script_function { 3472sub register_script_function {
3149 my ($fun, $cb) = @_; 3473 my ($fun, $cb) = @_;
3150 3474
3151 no strict 'refs'; 3475 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3476 *$fun = $safe_hole->wrap ($cb);
3153} 3477}
3154 3478
3155=back 3479=back
3156 3480
3157=cut 3481=cut
3166 # for this (global event?) 3490 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = (); 3491 %ext::player_env::MUSIC_FACE_CACHE = ();
3168 3492
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3493 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3494
3171 warn "loading facedata from $path\n"; 3495 trace "loading facedata from $path\n";
3172 3496
3173 my $facedata; 3497 my $facedata = decode_storable load_file $path;
3174 0 < aio_load $path, $facedata
3175 or die "$path: $!";
3176
3177 $facedata = Coro::Storable::thaw $facedata;
3178 3498
3179 $facedata->{version} == 2 3499 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3500 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3501
3182 # patch in the exptable 3502 # patch in the exptable
3503 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3183 $facedata->{resource}{"res/exp_table"} = { 3504 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3505 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3506 data => $exp_table,
3507 hash => (Digest::MD5::md5 $exp_table),
3186 }; 3508 };
3187 cf::cede_to_tick; 3509 cf::cede_to_tick;
3188 3510
3189 { 3511 {
3190 my $faces = $facedata->{faceinfo}; 3512 my $faces = $facedata->{faceinfo};
3192 while (my ($face, $info) = each %$faces) { 3514 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3515 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3516
3195 cf::face::set_visibility $idx, $info->{visibility}; 3517 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3518 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3519 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3520 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3521 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3199 3522
3200 cf::cede_to_tick; 3523 cf::cede_to_tick;
3201 } 3524 }
3202 3525
3203 while (my ($face, $info) = each %$faces) { 3526 while (my ($face, $info) = each %$faces) {
3208 3531
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3532 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3533 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3534 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3535 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3536 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3537 }
3215 3538
3216 cf::cede_to_tick; 3539 cf::cede_to_tick;
3217 } 3540 }
3218 } 3541 }
3227 3550
3228 cf::anim::invalidate_all; # d'oh 3551 cf::anim::invalidate_all; # d'oh
3229 } 3552 }
3230 3553
3231 { 3554 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3555 my $res = $facedata->{resource};
3235 3556
3236 while (my ($name, $info) = each %$res) { 3557 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3558 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3560
3241 if ($info->{type} & 1) { 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $info->{type};
3256 } else { 3563 } else {
3257 $RESOURCE{$name} = $info; 3564 $RESOURCE{$name} = $info; # unused
3258 } 3565 }
3259 3566
3260 cf::cede_to_tick; 3567 cf::cede_to_tick;
3261 } 3568 }
3262 } 3569 }
3263 3570
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3571 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3572
3266 1 3573 1
3267} 3574}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3575
3289register_exticmd fx_want => sub { 3576register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3577 my ($ns, $want) = @_;
3291 3578
3292 while (my ($k, $v) = each %$want) { 3579 while (my ($k, $v) = each %$want) {
3331sub reload_treasures { 3618sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3619 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3620 or die "unable to load treasurelists\n";
3334} 3621}
3335 3622
3623sub reload_sound {
3624 trace "loading sound config from $DATADIR/sound\n";
3625
3626 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3627
3628 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3629 my $sound = $soundconf->{compat}[$_]
3630 or next;
3631
3632 my $face = cf::face::find "sound/$sound->[1]";
3633 cf::sound::set $sound->[0] => $face;
3634 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3635 }
3636
3637 while (my ($k, $v) = each %{$soundconf->{event}}) {
3638 my $face = cf::face::find "sound/$v";
3639 cf::sound::set $k => $face;
3640 }
3641}
3642
3336sub reload_resources { 3643sub reload_resources {
3337 warn "reloading resource files...\n"; 3644 trace "reloading resource files...\n";
3338 3645
3646 reload_exp_table;
3647 reload_materials;
3339 reload_facedata; 3648 reload_facedata;
3649 reload_sound;
3340 reload_archetypes; 3650 reload_archetypes;
3341 reload_regions; 3651 reload_regions;
3342 reload_treasures; 3652 reload_treasures;
3343 3653
3344 warn "finished reloading resource files\n"; 3654 trace "finished reloading resource files\n";
3345} 3655}
3346 3656
3347sub reload_config { 3657sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3658 trace "reloading config file...\n";
3349 or return;
3350 3659
3351 local $/; 3660 my $config = load_file "$CONFDIR/config";
3352 *CFG = YAML::Load <$fh>; 3661 utf8::decode $config;
3662 *CFG = decode_yaml $config;
3353 3663
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3664 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3665
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3666 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3667 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3668
3359 if (exists $CFG{mlockall}) { 3669 if (exists $CFG{mlockall}) {
3382 3692
3383 seek $fh, 0, 0; 3693 seek $fh, 0, 0;
3384 print $fh $$; 3694 print $fh $$;
3385} 3695}
3386 3696
3697sub main_loop {
3698 trace "EV::loop starting\n";
3699 if (1) {
3700 EV::loop;
3701 }
3702 trace "EV::loop returned\n";
3703 goto &main_loop unless $REALLY_UNLOOP;
3704}
3705
3387sub main { 3706sub main {
3388 cf::init_globals; # initialise logging 3707 cf::init_globals; # initialise logging
3389 3708
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3709 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3710 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3711 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3712 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3713
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3714 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3715
3402 # we must not ever block the main coroutine 3716 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3717 local $Coro::idle = sub {
3409 }; 3723 };
3410 3724
3411 evthread_start IO::AIO::poll_fileno; 3725 evthread_start IO::AIO::poll_fileno;
3412 3726
3413 cf::sync_job { 3727 cf::sync_job {
3728 cf::incloader::init ();
3729
3730 cf::init_anim;
3731 cf::init_attackmess;
3732 cf::init_dynamic;
3733
3734 cf::load_settings;
3735
3414 reload_resources; 3736 reload_resources;
3415 reload_config; 3737 reload_config;
3416 db_init; 3738 db_init;
3417 3739
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3740 cf::init_uuid;
3421 cf::init_signals; 3741 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3742 cf::init_skills;
3424 3743
3425 cf::init_beforeplay; 3744 cf::init_beforeplay;
3426 3745
3427 atomic; 3746 atomic;
3429 load_extensions; 3748 load_extensions;
3430 3749
3431 utime time, time, $RUNTIMEFILE; 3750 utime time, time, $RUNTIMEFILE;
3432 3751
3433 # no (long-running) fork's whatsoever before this point(!) 3752 # no (long-running) fork's whatsoever before this point(!)
3753 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3754 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3755
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3756 cf::_post_init 0;
3437 }; 3757 };
3438 3758
3439 EV::loop; 3759 cf::object::thawer::errors_are_fatal 0;
3760 info "parse errors in files are no longer fatal from this point on.\n";
3761
3762 my $free_main; $free_main = EV::idle sub {
3763 undef $free_main;
3764 undef &main; # free gobs of memory :)
3765 };
3766
3767 goto &main_loop;
3440} 3768}
3441 3769
3442############################################################################# 3770#############################################################################
3443# initialisation and cleanup 3771# initialisation and cleanup
3444 3772
3445# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
3446BEGIN { 3774BEGIN {
3447 our %SIGWATCHER = (); 3775 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
3451 }; 3779 };
3452 } 3780 }
3453} 3781}
3454 3782
3455sub write_runtime_sync { 3783sub write_runtime_sync {
3784 my $t0 = AE::time;
3785
3456 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
3458 3788
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3790
3461 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
3462 3792
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3794 or return;
3465 3795
3466 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
3481 or return; 3811 or return;
3482 3812
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3814 and return;
3485 3815
3486 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3817
3488 1 3818 1
3489} 3819}
3490 3820
3491our $uuid_lock; 3821our $uuid_lock;
3503 or return; 3833 or return;
3504 3834
3505 my $value = uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3506 3836
3507 unless ($value) { 3837 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 3838 info "cowardly refusing to write zero uuid value!\n";
3509 return; 3839 return;
3510 } 3840 }
3511 3841
3512 my $value = uuid_str $value + $uuid_skip; 3842 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3843 $uuid_skip = 0;
3523 or return; 3853 or return;
3524 3854
3525 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3526 and return; 3856 and return;
3527 3857
3528 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3529 3859
3530 1 3860 1
3531 3861
3532} 3862}
3533 3863
3539} 3869}
3540 3870
3541sub emergency_save() { 3871sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3543 3873
3544 warn "emergency_perl_save: enter\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3545 3880
3546 cf::sync_job { 3881 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 3882 cf::write_runtime_sync; # external watchdog should not bark
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551 3883
3552 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3890 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3892 $pl->save;
3561 } 3893 }
3562 warn "emergency_perl_save: end player save\n"; 3894 info "emergency_perl_save: end player save\n";
3563 3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3564 warn "emergency_perl_save: begin map save\n"; 3898 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3901 $map->valid or next;
3568 $map->save; 3902 $map->save;
3569 } 3903 }
3570 warn "emergency_perl_save: end map save\n"; 3904 info "emergency_perl_save: end map save\n";
3571 3905
3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3572 warn "emergency_perl_save: begin database checkpoint\n"; 3908 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3575 3911
3576 warn "emergency_perl_save: begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3913 write_uuid_sync 1;
3578 warn "emergency_perl_save: end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 3934 };
3580 3935
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3586 warn "emergency_perl_save: leave\n"; 3936 info "emergency_perl_save: leave\n";
3587} 3937}
3588 3938
3589sub post_cleanup { 3939sub post_cleanup {
3590 my ($make_core) = @_; 3940 my ($make_core) = @_;
3591 3941
3942 IO::AIO::flush;
3943
3592 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3945 if $make_core;
3594 3946
3595 my $fh = pidfile; 3947 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 3948 unlink $PIDFILE if <$fh> == $$;
3597} 3949}
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3969 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3970 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3971 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3972# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3973 }
3622 warn "cleared package $pkg\n";#d#
3623} 3974}
3624 3975
3625sub do_reload_perl() { 3976sub do_reload_perl() {
3626 # can/must only be called in main 3977 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3628 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3629 return; 3980 return;
3630 } 3981 }
3631 3982
3632 return if $RELOAD++; 3983 return if $RELOAD++;
3633 3984
3634 my $t1 = EV::time; 3985 my $t1 = AE::time;
3635 3986
3636 while ($RELOAD) { 3987 while ($RELOAD) {
3637 warn "reloading..."; 3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3638 3990
3639 warn "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3640 3992
3641 cf::sync_job { 3993 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 3994 #cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark
3645 3995
3646 warn "syncing database to disk";
3647 BDB::db_env_txn_checkpoint $DB_ENV;
3648
3649 # if anything goes wrong in here, we should simply crash as we already saved
3650
3651 warn "flushing outstanding aio requests";
3652 while (IO::AIO::nreqs || BDB::nreqs) {
3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3654 }
3655
3656 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 3998 %EXT_CORO = ();
3659 3999
3660 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3661 %COMMAND = (); 4001 %COMMAND = ();
3662 4002
3663 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3664 %EXTCMD = (); 4004 %EXTCMD = ();
3665 %EXTICMD = (); 4005 %EXTICMD = ();
3666 4006
3667 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3670 4010
3671 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3672 eval { 4012 eval {
3673 $cb->($pkg); 4013 $cb->($pkg);
3674 1 4014 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
3676 } 4016 }
3677 4017
3678 warn "... clearing $pkg"; 4018 trace "... clearing $pkg";
3679 clear_package $pkg; 4019 clear_package $pkg;
3680 } 4020 }
3681 4021
3682 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 4025
3686 warn "... unloading $k"; 4026 trace "... unloading $k";
3687 delete $INC{$k}; 4027 delete $INC{$k};
3688 4028
3689 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3691 4031
3694 } 4034 }
3695 4035
3696 clear_package $k; 4036 clear_package $k;
3697 } 4037 }
3698 4038
3699 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 4040 clear_package "safe::$_"
3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3702 4042
3703 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 4046
3707 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3708 # and global variables created in xs 4048 # and global variables created in xs
3709 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3710 4050
3711 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3712 4052
3713 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3714 require cf; 4054 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4055 cf::_connect_to_perl_1;
3716 4056
3717 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3718 cf::reload_config; 4058 cf::reload_config;
3719 4059
3720 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3721 cf::load_extensions; 4061 cf::load_extensions;
3722 4062
3723 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3727 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3730 } 4070 }
3731 4071
3732 warn "running post_init jobs"; 4072 cf::_post_init 1;
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734 4073
3735 warn "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3736 4075
3737 1 4076 1
3738 } or do { 4077 } or do {
3739 warn $@; 4078 error $@;
3740 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3741 }; 4080 };
3742 4081
3743 warn "reloaded";
3744 --$RELOAD; 4082 --$RELOAD;
3745 } 4083 }
3746 4084
3747 $t1 = EV::time - $t1; 4085 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3749}; 4087};
3750 4088
3751our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3752 4090
3753sub reload_perl() { 4091sub reload_perl() {
3755 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3756 4094
3757 $RELOAD_WATCHER ||= cf::async { 4095 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 4096 Coro::AIO::aio_wait cache_extensions;
3759 4097
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 4099 do_reload_perl;
3762 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
3763 }; 4101 };
3764 }; 4102 };
3765} 4103}
3774 reload_perl; 4112 reload_perl;
3775 }; 4113 };
3776 } 4114 }
3777}; 4115};
3778 4116
3779unshift @INC, $LIBDIR; 4117#############################################################################
3780 4118
3781my $bug_warning = 0; 4119my $bug_warning = 0;
3782 4120
3783our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN;
3785
3786sub wait_for_tick { 4121sub wait_for_tick() {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3788 4123
3789 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3790 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait;
3792} 4125}
3793 4126
3794sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3796 4129
3797 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4132 $signal->wait;
3800} 4133}
3804 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3805 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3806 return; 4139 return;
3807 } 4140 }
3808 4141
3809 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4143
4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3810 4145
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 4148 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4150 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3817 }; 4152 };
3818 } 4153 }
3819 4154
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4156 $sig->send;
3822 } 4157 }
3823 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3824 $sig->send;
3825 }
3826 4159
3827 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3828 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3829 4162
3830 if (0) { 4163 if (0) {
3831 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
3835 } 4168 }
3836 } 4169 }
3837} 4170}
3838 4171
3839{ 4172{
3840 # configure BDB 4173 # configure BDB
3841 4174
3842 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4177 $AnyEvent::BDB::WATCHER->priority (1);
3845 4178
3846 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3884 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3885 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3886 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
3887} 4220}
3888 4221
3889my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3890 4224
3891sub _log_backtrace { 4225sub _log_backtrace {
3892 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3893 4227
3894 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3895 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3896 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3897 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3898 ++$_log_backtrace; 4236 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
3900 async { 4238 async {
3901 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
3902 4240
3922 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
3923 --$_log_backtrace; 4261 --$_log_backtrace;
3924 }; 4262 };
3925 } else { 4263 } else {
3926 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
3927 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3928 } 4266 }
3929} 4267}
3930 4268
3931# load additional modules 4269# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4270require "cf/$_.pm" for @EXTRA_MODULES;
4271cf::_connect_to_perl_2;
3933 4272
3934END { cf::emergency_save } 4273END { cf::emergency_save }
3935 4274
39361 42751
3937 4276

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines