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.464 by root, Thu Jan 1 18:35:48 2009 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "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)
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;
2038 cf::cede_to_tick; 2244 cf::cede_to_tick;
2039 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2040 } 2246 }
2041 2247
2042 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2044
2045 $self->in_memory (cf::MAP_ACTIVE);
2046 } 2250 }
2047 2251
2048 $self->post_load; 2252 $self->post_load;
2049}
2050 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2051sub customise_for { 2260sub customise_for {
2052 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2053 2262
2054 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2264 if $self->per_player;
2058# if $self->per_party; 2267# if $self->per_party;
2059 2268
2060 $self 2269 $self
2061} 2270}
2062 2271
2063# find and load all maps in the 3x3 area around a map
2064sub load_neighbours {
2065 my ($map) = @_;
2066
2067 my @neigh; # diagonal neighbours
2068
2069 for (0 .. 3) {
2070 my $neigh = $map->tile_path ($_)
2071 or next;
2072 $neigh = find $neigh, $map
2073 or next;
2074 $neigh->load;
2075
2076 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 }
2080
2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
2083 my $neigh = find $path, $origin
2084 or next;
2085 $neigh->load;
2086 }
2087}
2088
2089sub find_sync { 2272sub find_sync {
2090 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2091 2274
2092 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2093} 2280}
2094 2281
2095sub do_load_sync { 2282sub do_load_sync {
2096 my ($map) = @_; 2283 my ($map) = @_;
2097 2284
2285 # it's a bug to call this from the main context
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2100 2288
2101 cf::sync_job { $map->load }; 2289 $map->load;
2102} 2290}
2103 2291
2104our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2106 2294
2107sub find_async { 2295sub find_async {
2108 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2109 2297
2110 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2111 2299
2112 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2114 } 2302 }
2115 2303
2116 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2117 2305
2118 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2132 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2133 2321
2134 () 2322 ()
2135} 2323}
2136 2324
2325# common code, used by both ->save and ->swapout
2137sub save { 2326sub _save {
2138 my ($self) = @_; 2327 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2328
2142 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2143 2330
2144 return unless $self->dirty; 2331 return unless $self->dirty;
2145 2332
2165 } else { 2352 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2354 }
2168} 2355}
2169 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2170sub swap_out { 2365sub swap_out {
2171 my ($self) = @_; 2366 my ($self) = @_;
2172 2367
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2178 return if $self->players; 2372 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
2383 $self->clear;
2384}
2385
2386sub reset_at {
2387 my ($self) = @_;
2388
2389 # TODO: safety, remove and allow resettable per-player maps
2180 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2181 2391
2392 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2393 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2394
2395 $time + $to
2396}
2397
2398sub should_reset {
2399 my ($self) = @_;
2400
2401 $self->reset_at <= $cf::RUNTIME
2402}
2403
2404sub reset {
2405 my ($self) = @_;
2406
2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2408
2409 return if $self->players;
2410
2411 cf::trace "resetting map ", $self->path, "\n";
2412
2182 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2414
2415 # need to save uniques path
2416 unless ($self->{deny_save}) {
2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2418
2419 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2420 if $uniq;
2421 }
2422
2423 delete $cf::MAP{$self->path};
2183 2424
2184 $self->deactivate; 2425 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2427 $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 2428
2232 $self->unlink_save; 2429 $self->unlink_save;
2233 $self->destroy; 2430 $self->destroy;
2234} 2431}
2235 2432
2243 2440
2244 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2245 2442
2246 $self->unlink_save; 2443 $self->unlink_save;
2247 2444
2248 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2450
2310 : normalise $_ 2507 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2509 ]
2313} 2510}
2314 2511
2512=item cf::map::static_maps
2513
2514Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2515file in the shared directory excluding F</styles> and F</editor>). May
2516block.
2517
2518=cut
2519
2520sub static_maps() {
2521 my @dirs = "";
2522 my @maps;
2523
2524 while (@dirs) {
2525 my $dir = shift @dirs;
2526
2527 next if $dir eq "/styles" || $dir eq "/editor";
2528
2529 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2530 or return;
2531
2532 for (@$files) {
2533 s/\.map$// or next;
2534 utf8::decode $_;
2535 push @maps, "$dir/$_";
2536 }
2537
2538 push @dirs, map "$dir/$_", @$dirs;
2539 }
2540
2541 \@maps
2542}
2543
2315=back 2544=back
2316 2545
2317=head3 cf::object 2546=head3 cf::object
2318 2547
2319=cut 2548=cut
2384 2613
2385our $SAY_CHANNEL = { 2614our $SAY_CHANNEL = {
2386 id => "say", 2615 id => "say",
2387 title => "Map", 2616 title => "Map",
2388 reply => "say ", 2617 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2618 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2619};
2391 2620
2392our $CHAT_CHANNEL = { 2621our $CHAT_CHANNEL = {
2393 id => "chat", 2622 id => "chat",
2394 title => "Chat", 2623 title => "Chat",
2451 2680
2452Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2453 2682
2454The player should be reasonably safe there for short amounts of time (e.g. 2683The player should be reasonably safe there for short amounts of time (e.g.
2455for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link 2685though, as the player cannot control the character while it is on the link
2457map. 2686map.
2458 2687
2459Will never block. 2688Will never block.
2460 2689
2461=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2483 my ($self) = @_; 2712 my ($self) = @_;
2484 2713
2485 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2486 2715
2716 ++$self->{_link_recursion};
2717
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2719
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2491 2722
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2724}
2494 2725
2495sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2497 2728
2514 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2516 2747
2517 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2520 2751
2521 $map->load; 2752 $map->load;
2522 $map->load_neighbours;
2523 2753
2524 return unless $self->contr->active; 2754 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2755
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2530} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2531 2763
2764}
2765
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533 2767
2534Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2771the new (success) or old (failed) map position. In either case, $done will
2544 2778
2545our $GOTOGEN; 2779our $GOTOGEN;
2546 2780
2547sub cf::object::player::goto { 2781sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2549 2789
2550 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2792
2553 $self->enter_link; 2793 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2574 } 2814 }
2575 } 2815 }
2576 2816
2577 my $map = eval { 2817 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2819
2580 if ($map) { 2820 if ($map) {
2581 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2823 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2825 }
2586 2826
2587 $map 2827 $map
2595 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2598 } 2838 }
2599 2839
2600 $done->() if $done; 2840 $done->($self) if $done;
2601 })->prio (1); 2841 })->prio (1);
2602} 2842}
2603 2843
2604=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2605 2845
2673 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2674 2914
2675 unless (eval { 2915 unless (eval {
2676 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2677 2917
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; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2687 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2689 2944
2690 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2691 2946
2692 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
2698 $self->message ("Something went wrong deep within the deliantra server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2700 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2957
2703 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2959 $self->leave_link;
2705 } 2960 }
2706 })->prio (1); 2961 })->prio (1);
2707} 2962}
2708 2963
2720sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2722 2977
2723 utf8::encode $text; 2978 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2980}
2981
2982=item $client->send_big_packet ($pkt)
2983
2984Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required.
2986
2987=cut
2988
2989our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2990
2991sub cf::client::send_big_packet {
2992 my ($self, $pkt) = @_;
2993
2994 # try lzf for large packets
2995 $pkt = "lzf " . Compress::LZF::compress $pkt
2996 if 1024 <= length $pkt and $self->{can_lzf};
2997
2998 # split very large packets
2999 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3000 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3001 $pkt = "frag";
3002 }
3003
3004 $self->send_packet ($pkt);
2725} 3005}
2726 3006
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 3008
2729Send a drawinfo or msg packet to the client, formatting the msg for the 3009Send a drawinfo or msg packet to the client, formatting the msg for the
2733 3013
2734=cut 3014=cut
2735 3015
2736# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2738 "c/identify" => { 3024 "c/identify" => {
2739 id => "infobox", 3025 id => "infobox",
2740 title => "Identify", 3026 title => "Identify",
2741 reply => undef, 3027 reply => undef,
2742 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2744 "c/examine" => { 3030 "c/examine" => {
2745 id => "infobox", 3031 id => "infobox",
2746 title => "Examine", 3032 title => "Examine",
2747 reply => undef, 3033 reply => undef,
2748 tooltip => "Signs and other items you examined", 3034 tooltip => "Signs and other items you examined",
3035 },
3036 "c/shopinfo" => {
3037 id => "infobox",
3038 title => "Shop Info",
3039 reply => undef,
3040 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 3041 },
2750 "c/book" => { 3042 "c/book" => {
2751 id => "infobox", 3043 id => "infobox",
2752 title => "Book", 3044 title => "Book",
2753 reply => undef, 3045 reply => undef,
2769 id => "infobox", 3061 id => "infobox",
2770 title => "Body Parts", 3062 title => "Body Parts",
2771 reply => undef, 3063 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 3064 tooltip => "Shows which body parts you posess and are available",
2773 }, 3065 },
3066 "c/statistics" => {
3067 id => "infobox",
3068 title => "Statistics",
3069 reply => undef,
3070 tooltip => "Shows your primary statistics",
3071 },
2774 "c/skills" => { 3072 "c/skills" => {
2775 id => "infobox", 3073 id => "infobox",
2776 title => "Skills", 3074 title => "Skills",
2777 reply => undef, 3075 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 3076 tooltip => "Shows your experience per skill and item power",
3077 },
3078 "c/shopitems" => {
3079 id => "infobox",
3080 title => "Shop Items",
3081 reply => undef,
3082 tooltip => "Shows the items currently for sale in this shop",
3083 },
3084 "c/resistances" => {
3085 id => "infobox",
3086 title => "Resistances",
3087 reply => undef,
3088 tooltip => "Shows your resistances",
3089 },
3090 "c/pets" => {
3091 id => "infobox",
3092 title => "Pets",
3093 reply => undef,
3094 tooltip => "Shows information abotu your pets/a specific pet",
3095 },
3096 "c/perceiveself" => {
3097 id => "infobox",
3098 title => "Perceive Self",
3099 reply => undef,
3100 tooltip => "You gained detailed knowledge about yourself",
2779 }, 3101 },
2780 "c/uptime" => { 3102 "c/uptime" => {
2781 id => "infobox", 3103 id => "infobox",
2782 title => "Uptime", 3104 title => "Uptime",
2783 reply => undef, 3105 reply => undef,
2839 my $pkt = "msg " 3161 my $pkt = "msg "
2840 . $self->{json_coder}->encode ( 3162 . $self->{json_coder}->encode (
2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2842 ); 3164 );
2843 3165
2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2847
2848 # split very large packets
2849 if (8192 < length $pkt and $self->{can_lzf}) {
2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2851 $pkt = "frag";
2852 }
2853
2854 $self->send_packet ($pkt); 3166 $self->send_big_packet ($pkt);
2855} 3167}
2856 3168
2857=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2858 3170
2859Sends an ext event to the client. 3171Sends an ext event to the client.
2862 3174
2863sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2864 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2865 3177
2866 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2868 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2869 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2870 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2871 } 3183 }
2872} 3184}
2873 3185
2874=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2875 3187
2879 3191
2880sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2881 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2882 3194
2883 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2885 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2886 #TODO: version 1, remove 3198 #TODO: version 1, remove
2887 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3201 }
2890} 3202}
2891 3203
2892=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2893 3205
2964 3276
2965 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
2966 if $reply; 3278 if $reply;
2967 3279
2968 } else { 3280 } else {
2969 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2970 } 3282 }
2971 3283
2972 cf::override; 3284 cf::override;
2973 }, 3285 },
2974); 3286);
2994 3306
2995 $coro 3307 $coro
2996} 3308}
2997 3309
2998cf::client->attach ( 3310cf::client->attach (
2999 on_destroy => sub { 3311 on_client_destroy => sub {
3000 my ($ns) = @_; 3312 my ($ns) = @_;
3001 3313
3002 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3003 }, 3315 },
3004); 3316);
3020our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3021 3333
3022$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3023 3335
3024$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3025 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3026 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3027 sort time 3339 sort time
3028)); 3340));
3029 3341
3030# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3034The following functions and methods are available within a safe environment: 3346The following functions and methods are available within a safe environment:
3035 3347
3036 cf::object 3348 cf::object
3037 contr pay_amount pay_player map x y force_find force_add destroy 3349 contr pay_amount pay_player map x y force_find force_add destroy
3038 insert remove name archname title slaying race decrease split 3350 insert remove name archname title slaying race decrease split
3351 value
3039 3352
3040 cf::object::player 3353 cf::object::player
3041 player 3354 player
3042 3355
3043 cf::player 3356 cf::player
3049=cut 3362=cut
3050 3363
3051for ( 3364for (
3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3365 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3053 insert remove inv nrof name archname title slaying race 3366 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3055 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3056 ["cf::player" => qw(peaceful)], 3369 ["cf::player" => qw(peaceful send_msg)],
3057 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3058) { 3371) {
3059 no strict 'refs';
3060 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3061 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3062 for @funs; 3374 for @funs;
3063} 3375}
3064 3376
3079 3391
3080 my $qcode = $code; 3392 my $qcode = $code;
3081 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3082 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3083 3395
3396 %vars = (_dummy => 0) unless %vars;
3397
3398 my @res;
3084 local $_; 3399 local $_;
3085 local @safe::cf::_safe_eval_args = values %vars;
3086 3400
3087 my $eval = 3401 my $eval =
3088 "do {\n" 3402 "do {\n"
3089 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3090 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3091 . $code 3405 . $code
3092 . "\n}" 3406 . "\n}"
3093 ; 3407 ;
3094 3408
3409 if ($CFG{safe_eval}) {
3095 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3096 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3097 sub_generation_inc; 3413 sub_generation_inc;
3414 } else {
3415 local @cf::_safe_eval_args = values %vars;
3416 @res = wantarray ? eval eval : scalar eval $eval;
3417 }
3098 3418
3099 if ($@) { 3419 if ($@) {
3100 warn "$@"; 3420 warn "$@",
3101 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3102 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3103 } 3423 }
3104 3424
3105 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3106} 3426}
3107 3427
3121=cut 3441=cut
3122 3442
3123sub register_script_function { 3443sub register_script_function {
3124 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3125 3445
3126 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3127 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3128} 3448}
3129 3449
3130=back 3450=back
3131 3451
3132=cut 3452=cut
3141 # for this (global event?) 3461 # for this (global event?)
3142 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3143 3463
3144 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3145 3465
3146 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3147 3467
3148 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3149 0 < aio_load $path, $facedata
3150 or die "$path: $!";
3151
3152 $facedata = Coro::Storable::thaw $facedata;
3153 3469
3154 $facedata->{version} == 2 3470 $facedata->{version} == 2
3155 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3156 3472
3157 # patch in the exptable 3473 # patch in the exptable
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3158 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3159 type => FT_RSRC, 3476 type => FT_RSRC,
3160 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3477 data => $exp_table,
3478 hash => (Digest::MD5::md5 $exp_table),
3161 }; 3479 };
3162 cf::cede_to_tick; 3480 cf::cede_to_tick;
3163 3481
3164 { 3482 {
3165 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3167 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3168 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3169 3487
3170 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3171 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3172 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3173 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3174 3493
3175 cf::cede_to_tick; 3494 cf::cede_to_tick;
3176 } 3495 }
3177 3496
3178 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3183 3502
3184 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3185 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3186 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3187 } else { 3506 } else {
3188 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3189 } 3508 }
3190 3509
3191 cf::cede_to_tick; 3510 cf::cede_to_tick;
3192 } 3511 }
3193 } 3512 }
3202 3521
3203 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3204 } 3523 }
3205 3524
3206 { 3525 {
3207 # TODO: for gcfclient pleasure, we should give resources
3208 # that gcfclient doesn't grok a >10000 face index.
3209 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3210 3527
3211 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3212 if (defined $info->{type}) { 3529 if (defined $info->{type}) {
3213 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3214 my $data;
3215 3531
3216 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3217 # prepend meta info
3218
3219 my $meta = $enc->encode ({
3220 name => $name,
3221 %{ $info->{meta} || {} },
3222 });
3223
3224 $data = pack "(w/a*)*", $meta, $info->{data};
3225 } else {
3226 $data = $info->{data};
3227 }
3228
3229 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3230 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3231 } else { 3534 } else {
3232 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3233 } 3536 }
3234 3537
3235 cf::cede_to_tick; 3538 cf::cede_to_tick;
3236 } 3539 }
3237 } 3540 }
3238 3541
3239 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3240 3543
3241 1 3544 1
3242} 3545}
3243
3244cf::global->attach (on_resource_update => sub {
3245 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3246 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3247
3248 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3249 my $sound = $soundconf->{compat}[$_]
3250 or next;
3251
3252 my $face = cf::face::find "sound/$sound->[1]";
3253 cf::sound::set $sound->[0] => $face;
3254 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3255 }
3256
3257 while (my ($k, $v) = each %{$soundconf->{event}}) {
3258 my $face = cf::face::find "sound/$v";
3259 cf::sound::set $k => $face;
3260 }
3261 }
3262});
3263 3546
3264register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3265 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3266 3549
3267 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3306sub reload_treasures { 3589sub reload_treasures {
3307 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3308 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3309} 3592}
3310 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3311sub reload_resources { 3614sub reload_resources {
3312 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3313 3616
3617 reload_exp_table;
3618 reload_materials;
3314 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3315 reload_archetypes; 3621 reload_archetypes;
3316 reload_regions; 3622 reload_regions;
3317 reload_treasures; 3623 reload_treasures;
3318 3624
3319 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3320} 3626}
3321 3627
3322sub reload_config { 3628sub reload_config {
3323 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3324 or return;
3325 3630
3326 local $/; 3631 my $config = load_file "$CONFDIR/config";
3327 *CFG = YAML::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3328 3634
3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3330 3636
3331 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3332 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3333 3639
3334 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3357 3663
3358 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3359 print $fh $$; 3665 print $fh $$;
3360} 3666}
3361 3667
3668sub main_loop {
3669 trace "EV::loop starting\n";
3670 if (1) {
3671 EV::loop;
3672 }
3673 trace "EV::loop returned\n";
3674 goto &main_loop unless $REALLY_UNLOOP;
3675}
3676
3362sub main { 3677sub main {
3363 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3364 3679
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374 3684
3375 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3376 3686
3377 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3378 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3384 }; 3694 };
3385 3695
3386 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3387 3697
3388 cf::sync_job { 3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3705 cf::load_settings;
3706
3389 reload_resources; 3707 reload_resources;
3390 reload_config; 3708 reload_config;
3391 db_init; 3709 db_init;
3392 3710
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid; 3711 cf::init_uuid;
3396 cf::init_signals; 3712 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills; 3713 cf::init_skills;
3399 3714
3400 cf::init_beforeplay; 3715 cf::init_beforeplay;
3401 3716
3402 atomic; 3717 atomic;
3404 load_extensions; 3719 load_extensions;
3405 3720
3406 utime time, time, $RUNTIMEFILE; 3721 utime time, time, $RUNTIMEFILE;
3407 3722
3408 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3724 use POSIX ();
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410 3726
3411 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3412 }; 3728 };
3413 3729
3414 EV::loop; 3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 my $free_main; $free_main = EV::idle sub {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :)
3736 };
3737
3738 goto &main_loop;
3415} 3739}
3416 3740
3417############################################################################# 3741#############################################################################
3418# initialisation and cleanup 3742# initialisation and cleanup
3419 3743
3420# install some emergency cleanup handlers 3744# install some emergency cleanup handlers
3421BEGIN { 3745BEGIN {
3422 our %SIGWATCHER = (); 3746 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 3747 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3748 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 3749 cf::cleanup "SIG$signal";
3426 }; 3750 };
3427 } 3751 }
3428} 3752}
3429 3753
3430sub write_runtime_sync { 3754sub write_runtime_sync {
3755 my $t0 = AE::time;
3756
3431 # first touch the runtime file to show we are still running: 3757 # first touch the runtime file to show we are still running:
3432 # the fsync below can take a very very long time. 3758 # the fsync below can take a very very long time.
3433 3759
3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3760 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3435 3761
3436 my $guard = cf::lock_acquire "write_runtime"; 3762 my $guard = cf::lock_acquire "write_runtime";
3437 3763
3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3764 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3439 or return; 3765 or return;
3440 3766
3441 my $value = $cf::RUNTIME + 90 + 10; 3767 my $value = $cf::RUNTIME + 90 + 10;
3442 # 10 is the runtime save interval, for a monotonic clock 3768 # 10 is the runtime save interval, for a monotonic clock
3443 # 60 allows for the watchdog to kill the server. 3769 # 60 allows for the watchdog to kill the server.
3456 or return; 3782 or return;
3457 3783
3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3784 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3459 and return; 3785 and return;
3460 3786
3461 warn "runtime file written.\n"; 3787 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3462 3788
3463 1 3789 1
3464} 3790}
3465 3791
3466our $uuid_lock; 3792our $uuid_lock;
3478 or return; 3804 or return;
3479 3805
3480 my $value = uuid_seq uuid_cur; 3806 my $value = uuid_seq uuid_cur;
3481 3807
3482 unless ($value) { 3808 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n"; 3809 info "cowardly refusing to write zero uuid value!\n";
3484 return; 3810 return;
3485 } 3811 }
3486 3812
3487 my $value = uuid_str $value + $uuid_skip; 3813 my $value = uuid_str $value + $uuid_skip;
3488 $uuid_skip = 0; 3814 $uuid_skip = 0;
3498 or return; 3824 or return;
3499 3825
3500 aio_rename "$uuid~", $uuid 3826 aio_rename "$uuid~", $uuid
3501 and return; 3827 and return;
3502 3828
3503 warn "uuid file written ($value).\n"; 3829 trace "uuid file written ($value).\n";
3504 3830
3505 1 3831 1
3506 3832
3507} 3833}
3508 3834
3514} 3840}
3515 3841
3516sub emergency_save() { 3842sub emergency_save() {
3517 my $freeze_guard = cf::freeze_mainloop; 3843 my $freeze_guard = cf::freeze_mainloop;
3518 3844
3519 warn "emergency_perl_save: enter\n"; 3845 info "emergency_perl_save: enter\n";
3846
3847 # this is a trade-off: we want to be very quick here, so
3848 # save all maps without fsync, and later call a global sync
3849 # (which in turn might be very very slow)
3850 local $USE_FSYNC = 0;
3520 3851
3521 cf::sync_job { 3852 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so 3853 cf::write_runtime_sync; # external watchdog should not bark
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526 3854
3527 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
3530 warn "emergency_perl_save: begin player save\n"; 3858 info "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3860 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3861 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3863 $pl->save;
3536 } 3864 }
3537 warn "emergency_perl_save: end player save\n"; 3865 info "emergency_perl_save: end player save\n";
3538 3866
3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3539 warn "emergency_perl_save: begin map save\n"; 3869 info "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3872 $map->valid or next;
3543 $map->save; 3873 $map->save;
3544 } 3874 }
3545 warn "emergency_perl_save: end map save\n"; 3875 info "emergency_perl_save: end map save\n";
3546 3876
3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3547 warn "emergency_perl_save: begin database checkpoint\n"; 3879 info "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "emergency_perl_save: end database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3550 3882
3551 warn "emergency_perl_save: begin write uuid\n"; 3883 info "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3884 write_uuid_sync 1;
3553 warn "emergency_perl_save: end write uuid\n"; 3885 info "emergency_perl_save: end write uuid\n";
3886
3887 cf::write_runtime_sync; # external watchdog should not bark
3888
3889 trace "emergency_perl_save: syncing database to disk";
3890 BDB::db_env_txn_checkpoint $DB_ENV;
3891
3892 info "emergency_perl_save: starting sync\n";
3893 IO::AIO::aio_sync sub {
3894 info "emergency_perl_save: finished sync\n";
3895 };
3896
3897 cf::write_runtime_sync; # external watchdog should not bark
3898
3899 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3902 }
3903
3904 cf::write_runtime_sync; # external watchdog should not bark
3554 }; 3905 };
3555 3906
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
3561 warn "emergency_perl_save: leave\n"; 3907 info "emergency_perl_save: leave\n";
3562} 3908}
3563 3909
3564sub post_cleanup { 3910sub post_cleanup {
3565 my ($make_core) = @_; 3911 my ($make_core) = @_;
3566 3912
3913 IO::AIO::flush;
3914
3567 warn Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
3568 if $make_core; 3916 if $make_core;
3569 3917
3570 my $fh = pidfile; 3918 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$; 3919 unlink $PIDFILE if <$fh> == $$;
3572} 3920}
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3940 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) { 3941 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"}; 3942 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3943# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 } 3944 }
3597 warn "cleared package $pkg\n";#d#
3598} 3945}
3599 3946
3600sub do_reload_perl() { 3947sub do_reload_perl() {
3601 # can/must only be called in main 3948 # can/must only be called in main
3602 if ($Coro::current != $Coro::main) { 3949 unless (in_main) {
3603 warn "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
3604 return; 3951 return;
3605 } 3952 }
3606 3953
3607 return if $RELOAD++; 3954 return if $RELOAD++;
3608 3955
3609 my $t1 = EV::time; 3956 my $t1 = AE::time;
3610 3957
3611 while ($RELOAD) { 3958 while ($RELOAD) {
3612 warn "reloading..."; 3959 cf::get_slot 0.1, -1, "reload_perl";
3960 info "perl_reload: reloading...";
3613 3961
3614 warn "entering sync_job"; 3962 trace "perl_reload: entering sync_job";
3615 3963
3616 cf::sync_job { 3964 cf::sync_job {
3617 cf::write_runtime_sync; # external watchdog should not bark
3618 cf::emergency_save; 3965 #cf::emergency_save;
3619 cf::write_runtime_sync; # external watchdog should not bark
3620 3966
3621 warn "syncing database to disk";
3622 BDB::db_env_txn_checkpoint $DB_ENV;
3623
3624 # if anything goes wrong in here, we should simply crash as we already saved
3625
3626 warn "flushing outstanding aio requests";
3627 while (IO::AIO::nreqs || BDB::nreqs) {
3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3629 }
3630
3631 warn "cancelling all extension coros"; 3967 trace "perl_reload: cancelling all extension coros";
3632 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
3633 %EXT_CORO = (); 3969 %EXT_CORO = ();
3634 3970
3635 warn "removing commands"; 3971 trace "perl_reload: removing commands";
3636 %COMMAND = (); 3972 %COMMAND = ();
3637 3973
3638 warn "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
3639 %EXTCMD = (); 3975 %EXTCMD = ();
3640 %EXTICMD = (); 3976 %EXTICMD = ();
3641 3977
3642 warn "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
3643 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
3644 warn "... unloading $pkg"; 3980 trace "... unloading $pkg";
3645 3981
3646 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
3647 eval { 3983 eval {
3648 $cb->($pkg); 3984 $cb->($pkg);
3649 1 3985 1
3650 } or warn "$pkg unloaded, but with errors: $@"; 3986 } or error "$pkg unloaded, but with errors: $@";
3651 } 3987 }
3652 3988
3653 warn "... clearing $pkg"; 3989 trace "... clearing $pkg";
3654 clear_package $pkg; 3990 clear_package $pkg;
3655 } 3991 }
3656 3992
3657 warn "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660 3996
3661 warn "... unloading $k"; 3997 trace "... unloading $k";
3662 delete $INC{$k}; 3998 delete $INC{$k};
3663 3999
3664 $k =~ s/\.pm$//; 4000 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g; 4001 $k =~ s/\//::/g;
3666 4002
3669 } 4005 }
3670 4006
3671 clear_package $k; 4007 clear_package $k;
3672 } 4008 }
3673 4009
3674 warn "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
3675 clear_package "safe::$_" 4011 clear_package "safe::$_"
3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4012 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3677 4013
3678 warn "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
3679 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
3680 delete $INC{"cf/pod.pm"}; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3681 4017
3682 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
3683 # and global variables created in xs 4019 # and global variables created in xs
3684 #clear_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
3685 4021
3686 warn "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
3687 4023
3688 warn "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
3689 require cf; 4025 require cf;
3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4026 cf::_connect_to_perl_1;
3691 4027
3692 warn "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
3693 cf::reload_config; 4029 cf::reload_config;
3694 4030
3695 warn "loading extensions"; 4031 trace "perl_reload: loading extensions";
3696 cf::load_extensions; 4032 cf::load_extensions;
3697 4033
3698 if ($REATTACH_ON_RELOAD) { 4034 if ($REATTACH_ON_RELOAD) {
3699 warn "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
3700 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
3701 warn "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
3702 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
3703 warn "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
3704 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
3705 } 4041 }
3706 4042
3707 warn "running post_init jobs"; 4043 cf::_post_init 1;
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709 4044
3710 warn "leaving sync_job"; 4045 trace "perl_reload: leaving sync_job";
3711 4046
3712 1 4047 1
3713 } or do { 4048 } or do {
3714 warn $@; 4049 error $@;
3715 cf::cleanup "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
3716 }; 4051 };
3717 4052
3718 warn "reloaded";
3719 --$RELOAD; 4053 --$RELOAD;
3720 } 4054 }
3721 4055
3722 $t1 = EV::time - $t1; 4056 $t1 = AE::time - $t1;
3723 warn "reload completed in ${t1}s\n"; 4057 info "perl_reload: completed in ${t1}s\n";
3724}; 4058};
3725 4059
3726our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
3727 4061
3728sub reload_perl() { 4062sub reload_perl() {
3730 # coro crashes during coro_state_free->destroy here. 4064 # coro crashes during coro_state_free->destroy here.
3731 4065
3732 $RELOAD_WATCHER ||= cf::async { 4066 $RELOAD_WATCHER ||= cf::async {
3733 Coro::AIO::aio_wait cache_extensions; 4067 Coro::AIO::aio_wait cache_extensions;
3734 4068
3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4069 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3736 do_reload_perl; 4070 do_reload_perl;
3737 undef $RELOAD_WATCHER; 4071 undef $RELOAD_WATCHER;
3738 }; 4072 };
3739 }; 4073 };
3740} 4074}
3749 reload_perl; 4083 reload_perl;
3750 }; 4084 };
3751 } 4085 }
3752}; 4086};
3753 4087
3754unshift @INC, $LIBDIR; 4088#############################################################################
3755 4089
3756my $bug_warning = 0; 4090my $bug_warning = 0;
3757 4091
3758our @WAIT_FOR_TICK;
3759our @WAIT_FOR_TICK_BEGIN;
3760
3761sub wait_for_tick { 4092sub wait_for_tick() {
3762 return if tick_inhibit || $Coro::current == $Coro::main; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3763 4094
3764 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
3765 push @WAIT_FOR_TICK, $signal;
3766 $signal->wait;
3767} 4096}
3768 4097
3769sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
3770 return if tick_inhibit || $Coro::current == $Coro::main; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3771 4100
3772 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
3773 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
3774 $signal->wait; 4103 $signal->wait;
3775} 4104}
3779 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3780 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
3781 return; 4110 return;
3782 } 4111 }
3783 4112
3784 cf::server_tick; # one server iteration 4113 cf::one_tick; # one server iteration
4114
4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3785 4116
3786 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3787 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3788 Coro::async_pool { 4119 Coro::async_pool {
3789 $Coro::current->{desc} = "runtime saver"; 4120 $Coro::current->{desc} = "runtime saver";
3790 write_runtime_sync 4121 write_runtime_sync
3791 or warn "ERROR: unable to write runtime file: $!"; 4122 or error "ERROR: unable to write runtime file: $!";
3792 }; 4123 };
3793 } 4124 }
3794 4125
3795 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3796 $sig->send; 4127 $sig->send;
3797 } 4128 }
3798 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
3799 $sig->send;
3800 }
3801 4130
3802 $LOAD = ($NOW - $TICK_START) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
3803 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3804 4133
3805 if (0) { 4134 if (0) {
3806 if ($NEXT_TICK) { 4135 if ($NEXT_TICK) {
3807 my $jitter = $TICK_START - $NEXT_TICK; 4136 my $jitter = $TICK_START - $NEXT_TICK;
3808 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4137 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3809 warn "jitter $JITTER\n";#d# 4138 debug "jitter $JITTER\n";#d#
3810 } 4139 }
3811 } 4140 }
3812} 4141}
3813 4142
3814{ 4143{
3815 # configure BDB 4144 # configure BDB
3816 4145
3817 BDB::min_parallel 8; 4146 BDB::min_parallel 16;
3818 BDB::max_poll_reqs $TICK * 0.1; 4147 BDB::max_poll_reqs $TICK * 0.1;
3819 $AnyEvent::BDB::WATCHER->priority (1); 4148 $AnyEvent::BDB::WATCHER->priority (1);
3820 4149
3821 unless ($DB_ENV) { 4150 unless ($DB_ENV) {
3822 $DB_ENV = BDB::db_env_create; 4151 $DB_ENV = BDB::db_env_create;
3859 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
3860 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
3861 undef $AnyEvent::AIO::WATCHER; 4190 undef $AnyEvent::AIO::WATCHER;
3862} 4191}
3863 4192
3864my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
3865 4195
3866sub _log_backtrace { 4196sub _log_backtrace {
3867 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
3868 4198
3869 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
3870 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3871 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
3872 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
3873 ++$_log_backtrace; 4207 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg; 4208 my $perl_bt = Carp::longmess $msg;
3875 async { 4209 async {
3876 $Coro::current->{desc} = "abt $msg"; 4210 $Coro::current->{desc} = "abt $msg";
3877 4211
3897 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
3898 --$_log_backtrace; 4232 --$_log_backtrace;
3899 }; 4233 };
3900 } else { 4234 } else {
3901 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
3902 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3903 } 4237 }
3904} 4238}
3905 4239
3906# load additional modules 4240# load additional modules
3907use cf::pod; 4241require "cf/$_.pm" for @EXTRA_MODULES;
4242cf::_connect_to_perl_2;
3908 4243
3909END { cf::emergency_save } 4244END { cf::emergency_save }
3910 4245
39111 42461
3912 4247

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines