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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines