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.453 by root, Tue Sep 23 04:29:11 2008 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 Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
94our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 112
103our %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;
104 120
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 123our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
109 125
110our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 129our $DB_ENV;
114 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
115our %CFG; 133our %CFG;
116 134
117our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
119our $NOW; 138our $NOW;
120 139
121our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
122our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
123our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
129our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 149our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
132 151
133our @POST_INIT; 152our @POST_INIT;
153
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;
134 159
135binmode STDOUT; 160binmode STDOUT;
136binmode STDERR; 161binmode STDERR;
137 162
138# read virtual server time, if available 163# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 165 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
143} 168}
144 169
170eval "sub TICK() { $TICK } 1" or die;
171
145mkdir $_ 172mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 174
148our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
149 176
150sub cf::map::normalise; 177sub cf::map::normalise;
151 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
152############################################################################# 183#############################################################################
153 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
154=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
155 197
156=over 4 198=over 4
157 199
158=item $cf::UPTIME 200=item $cf::UPTIME
159 201
160The 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.
161 218
162=item $cf::RUNTIME 219=item $cf::RUNTIME
163 220
164The 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
165every server tick. 222every server tick.
171Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
172directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
173unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
174database environment. 231database environment.
175 232
176=item $cf::NOW
177
178The time of the last (current) server tick.
179
180=item $cf::TICK
181
182The interval between server ticks, in seconds.
183
184=item $cf::LOADAVG 233=item $cf::LOADAVG
185 234
186The 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
187(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
188objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
197from wherever your confdir points to. 246from wherever your confdir points to.
198 247
199=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
200 249
201These 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
202returns 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
203per 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.
204 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
205=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
206 272
207This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 275that call.
210 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
211=back 283=back
212 284
213=cut 285=cut
214 286
215BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
216 *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 {
217 my $msg = join "", @_; 294 my $msg = join "", @_;
218 295
219 $msg .= "\n" 296 $msg .= "\n"
220 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
221 298
222 $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;
223 300
224 LOG llevError, $msg; 301 LOG llevWarn, $msg;
225 }; 302};
226}
227 303
228$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
230 306
231 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 311 return;#d#
234 }#d# 312 }#d#
235 313
236 # kill coroutine otherwise 314 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 315 Coro::terminate
239}; 316};
240
241$SIG{__DIE__} = sub { }; #d#?
242 317
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 335)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 337}
263 338
264$EV::DIED = sub { 339$EV::DIED = sub {
265 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
266}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
267 347
268############################################################################# 348#############################################################################
269 349
270=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
271 351
292 $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;
293 $d 373 $d
294 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
295} 375}
296 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
297=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
298 392
299Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
300 394
301=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
307our $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
308 402
309sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
311 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
312=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
313 438
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
316 441
317The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 443is a reload or not.
319 444
320=cut 445=cut
321 446
322sub post_init(&) { 447sub post_init(&) {
323 push @POST_INIT, shift; 448 push @POST_INIT, shift;
324} 449}
325 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 }
466}
467
326=item cf::lock_wait $string 468=item cf::lock_wait $string
327 469
328Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
329 471
330=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
331 473
332Wait until the given lock is available and then acquires it and returns 474Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
335returned. 477returned.
336 478
337Locks are *not* recursive, locking from the same coro twice results in a 479Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 480deadlocked coro.
344 486
345Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
346 488
347=cut 489=cut
348 490
349our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 492
352sub lock_wait($) { 493sub lock_wait($) {
353 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 495}
367 496
368sub lock_acquire($) { 497sub lock_acquire($) {
369 my ($key) = @_; 498 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 499}
383 500
384sub lock_active($) { 501sub lock_active($) {
385 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 503}
389 504
390sub freeze_mainloop { 505sub freeze_mainloop {
391 tick_inhibit_inc; 506 tick_inhibit_inc;
392 507
393 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
394} 509}
395 510
396=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
397 512
398Like 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
399get spread over timer. 514get spread over time.
400 515
401=cut 516=cut
402 517
403sub periodic($$) { 518sub periodic($$) {
404 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
408 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
409} 524}
410 525
411=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
412 527
413Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
414This 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
415of 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.
416 535
417The 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
418used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
419 538
420Useful for short background jobs. 539Useful for short background jobs.
421 540
422=cut 541=cut
423 542
424our @SLOT_QUEUE; 543our @SLOT_QUEUE;
425our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
426 546
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
430 550
431 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
432 553
433 while () { 554 while () {
434 next_job: 555 next_job:
556
435 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 558
437 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 563 $job->[2]->send;
441 Coro::cede; 564 Coro::cede;
442 goto next_job; 565 goto next_job;
443 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 568 }
445 } 569 }
446 570
447 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
450 $signal->wait;
451 } else { 574 } else {
575 $busy = 0;
452 Coro::schedule; 576 Coro::schedule;
453 } 577 }
454 } 578 }
455}; 579};
456 580
457sub get_slot($;$$) { 581sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
459 583
460 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
461 585
462 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
463 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
464 589
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
493=cut 618=cut
494 619
495sub sync_job(&) { 620sub sync_job(&) {
496 my ($job) = @_; 621 my ($job) = @_;
497 622
498 if ($Coro::current == $Coro::main) { 623 if (in_main) {
499 my $time = EV::time; 624 my $time = AE::time;
500 625
501 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
503 628
504 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
505 630
506 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
507 632
508 my $busy = 1; 633 my $busy = 1;
509 my @res; 634 my @res;
510 635
511 (async { 636 (async {
512 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 638 @res = eval { $job->() };
514 warn $@ if $@; 639 error $@ if $@;
515 undef $busy; 640 undef $busy;
516 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
517 642
518 while ($busy) { 643 while ($busy) {
519 if (Coro::nready) { 644 if (Coro::nready) {
521 } else { 646 } else {
522 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
523 } 648 }
524 } 649 }
525 650
526 my $time = EV::time - $time; 651 my $time = AE::time - $time;
527 652
528 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
529 654
530 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
531 } else { 656 } else {
553 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
554 679
555 $coro 680 $coro
556} 681}
557 682
558=item fork_call { }, $args 683=item fork_call { }, @args
559 684
560Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 688never block itself or use any form of event handling.
564 689
565=cut 690=cut
566 691
692sub post_fork {
693 reset_signals;
694}
695
567sub fork_call(&@) { 696sub fork_call(&@) {
568 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
569 698
570 # 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,
571 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
573 702
574 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
575 reset_signals; 704 cf::post_fork;
576 &$cb 705 &$cb
577 }, @args; 706 } @args;
578 707
579 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 )
580} 720}
581 721
582=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
583 723
584=cut 724=cut
621within each server. 761within each server.
622 762
623=cut 763=cut
624 764
625sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
626 my ($name) = @_; 769 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
628 771
629 eval { 772 eval {
630 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
640} 783}
641 784
642our $DB; 785our $DB;
643 786
644sub db_init { 787sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
647 };
648} 789}
649 790
650sub db_get($$) { 791sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
652 793
653 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
654 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
655 798
656 $! ? () 799 $! ? ()
657 : $data 800 : $data
658 }
659} 801}
660 802
661sub db_put($$$) { 803sub db_put($$$) {
662 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 833
692 my @data; 834 my @data;
693 my $md5; 835 my $md5;
694 836
695 for (0 .. $#$src) { 837 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
697 or Carp::croak "$src->[$_]: $!";
698 } 839 }
699 840
700 # if processing is expensive, check 841 # if processing is expensive, check
701 # checksum first 842 # checksum first
702 if (1) { 843 if (1) {
719 860
720 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 862 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
723 864
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 866
726 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
729 870
739 880
740=cut 881=cut
741 882
742sub datalog($@) { 883sub datalog($@) {
743 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 886}
746 887
747=back 888=back
748 889
749=cut 890=cut
944 1085
945 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1088
948 } elsif (ref $type) { 1089 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
950 1091
951 } else { 1092 } else {
952 shift @arg; 1093 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
954 } 1095 }
955 } 1096 }
956} 1097}
957 1098
958sub _object_attach { 1099sub _object_attach {
968 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
969 } 1110 }
970 1111
971 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
972 } else { 1113 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1115 }
975 1116
976 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
977} 1118}
978 1119
1037 1178
1038 for (@$callbacks) { 1179 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1040 1181
1041 if ($@) { 1182 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1184 override;
1045 } 1185 }
1046 1186
1047 return 1 if $override; 1187 return 1 if $override;
1048 } 1188 }
1127 for (@$attach) { 1267 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1130 } 1270 }
1131 } else { 1271 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1273 }
1134 } 1274 }
1135} 1275}
1136 1276
1137cf::attachable->attach ( 1277cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1165 1305
1166 sync_job { 1306 sync_job {
1167 if (length $$rdata) { 1307 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1171 1312
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1320 aio_close $fh;
1177 1321
1178 if (@$objs) { 1322 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1331 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1333 }
1187 } else { 1334 } else {
1188 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1189 } 1336 }
1190 1337
1191 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1342 } else {
1193 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1194 } 1344 }
1195 } else { 1345 } else {
1196 aio_unlink $filename; 1346 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1198 } 1348 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1373 $av = $st->{objs};
1224 } 1374 }
1225 1375
1226 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1229 1380
1230 ($data, $av) 1381 ($data, $av)
1231} 1382}
1232 1383
1233=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1289 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1290 1441
1291 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1292} 1443}
1293 1444
1445use File::Glob ();
1446
1294cf::player->attach ( 1447cf::player->attach (
1295 on_command => sub { 1448 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1297 1450
1298 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1299 or return; 1452 or return;
1300 1453
1323 1476
1324 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1325 if $reply; 1478 if $reply;
1326 1479
1327 } else { 1480 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1482 }
1330 1483
1331 cf::override; 1484 cf::override;
1332 }, 1485 },
1333); 1486);
1334 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1335sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1336 cf::sync_job { 1504 cf::sync_job {
1337 my %todo; 1505 my %todo;
1338 1506
1339 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1508 next unless -r $path;
1358 1526
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1529
1362 $ext{source} = 1530 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1365 . $source 1533 . $source
1366 . "\n};\n1"; 1534 . "\n};\n1";
1367 1535
1368 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1369 } 1537 }
1370 1538
1539 my $pass = 0;
1371 my %done; 1540 my %done;
1372 while (%todo) { 1541 while (%todo) {
1373 my $progress; 1542 my $progress;
1374 1543
1544 ++$pass;
1545
1546 ext:
1375 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1549 next ext
1378 unless exists $done{$_}; 1550 unless exists $done{$_};
1379 } 1551 }
1380 1552
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1554
1383 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1559
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1561 if exists $v->{meta}{mandatory};
1391 1562
1392 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;
1393 } 1572 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1573 }
1399 1574
1400 skip: 1575 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1585 }
1404 }; 1586 };
1405} 1587}
1406 1588
1407############################################################################# 1589#############################################################################
1491 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1492 } 1674 }
1493 } 1675 }
1494} 1676}
1495 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
1496sub save($) { 1691sub save($) {
1497 my ($pl) = @_; 1692 my ($pl) = @_;
1498 1693
1499 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1500 1695
1505 1700
1506 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1508 1703
1509 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];
1510 1708
1511 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1710 cf::cede_to_tick;
1513} 1711}
1514 1712
1548 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1549 1747
1550 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1551 $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
1552 1750
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1554 $pl->deactivate; 1752 $pl->deactivate;
1753
1555 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;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1558 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1559 1759
1560 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1562 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1616 \@logins 1816 \@logins
1617} 1817}
1618 1818
1619=item $player->maps 1819=item $player->maps
1620 1820
1821=item cf::player::maps $login
1822
1621Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1622player. May block. 1824player. May block.
1623 1825
1624=cut 1826=cut
1625 1827
1687=cut 1889=cut
1688 1890
1689sub find_by_path($) { 1891sub find_by_path($) {
1690 my ($path) = @_; 1892 my ($path) = @_;
1691 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1692 my ($match, $specificity); 1896 my ($match, $specificity);
1693 1897
1694 for my $region (list) { 1898 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1724sub generate_random_map { 1928sub generate_random_map {
1725 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1726 1930
1727 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
1728 1932
1729 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1738 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1739 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1740 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1741 (cf::region::find $rmp->{region}), $rmp->{custom}
1742 )
1743} 1934}
1744 1935
1745=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1746 1937
1747Register 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
1752 1943
1753sub register { 1944sub register {
1754 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 1946 my $pkg = caller;
1756 1947
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 1949
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1951}
1762 1952
1763# also paths starting with '/' 1953# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1955
1766sub thawer_merge { 1956sub thawer_merge {
1767 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1768 1958
1769 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1774} 1964}
1775 1965
1776sub normalise { 1966sub normalise {
1777 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1778 1968
1779 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1780 1970
1781 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1782 1972
1783 # map plan: 1973 # map plan:
1784 # 1974 #
1799 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 1990 $path = "$base/$path";
1801 } 1991 }
1802 1992
1803 for ($path) { 1993 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1807 } 1996 }
1808 1997
1809 $path 1998 $path
1823 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1824 return $self; 2013 return $self;
1825 } 2014 }
1826 } 2015 }
1827 2016
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 2018 ()
1830} 2019}
1831 2020
2021# may re-bless or do other evil things
1832sub init { 2022sub init {
1833 my ($self) = @_; 2023 my ($self) = @_;
1834 2024
1835 $self 2025 $self
1836} 2026}
1867 2057
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1870} 2060}
1871 2061
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 2062sub decay_objects {
1882 my ($self) = @_; 2063 my ($self) = @_;
1883 2064
1884 return if $self->{deny_reset}; 2065 return if $self->{deny_reset};
1885 2066
1910 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1911 2092
1912 1 2093 1
1913} 2094}
1914 2095
2096# used to laod the header of an original map
1915sub load_header_orig { 2097sub load_header_orig {
1916 my ($self) = @_; 2098 my ($self) = @_;
1917 2099
1918 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1919} 2101}
1920 2102
2103# used to laod the header of an instantiated map
1921sub load_header_temp { 2104sub load_header_temp {
1922 my ($self) = @_; 2105 my ($self) = @_;
1923 2106
1924 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1925} 2108}
1926 2109
2110# called after loading the header from an instantiated map
1927sub prepare_temp { 2111sub prepare_temp {
1928 my ($self) = @_; 2112 my ($self) = @_;
1929 2113
1930 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1932 # safety 2116 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2119}
1936 2120
2121# called after loading the header from an original map
1937sub prepare_orig { 2122sub prepare_orig {
1938 my ($self) = @_; 2123 my ($self) = @_;
1939 2124
1940 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1965 2150
1966sub find; 2151sub find;
1967sub find { 2152sub find {
1968 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1969 2154
2155 cf::cede_to_tick;
2156
1970 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1971 2158
1972 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2161
1975 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1980 or return; 2164 or return;
1981 2165
1982 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1983 2167
1995 2179
1996 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1997 } 2181 }
1998} 2182}
1999 2183
2000sub pre_load { } 2184sub pre_load { }
2001sub post_load { } 2185#sub post_load { } # XS
2002 2186
2003sub load { 2187sub load {
2004 my ($self) = @_; 2188 my ($self) = @_;
2005 2189
2006 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2009 2193
2010 { 2194 {
2011 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2012 2196
2013 return unless $self->valid; 2197 return unless $self->valid;
2014 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2015
2016 $self->in_memory (cf::MAP_LOADING);
2017 2199
2018 $self->alloc; 2200 $self->alloc;
2019 2201
2020 $self->pre_load; 2202 $self->pre_load;
2021 cf::cede_to_tick; 2203 cf::cede_to_tick;
2022 2204
2205 if (exists $self->{load_path}) {
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2207 $f->skip_block;
2025 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2026 or return; 2209 or return;
2027 2210
2028 $self->post_load_original 2211 $self->post_load_original
2029 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2030 2213
2031 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2215 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2035 $self->clear_unique_items; 2218 $self->clear_unique_items;
2036 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2038 } 2222 }
2039 } 2223 }
2040 }
2041 2224
2042 $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);
2043 2232
2044 cf::cede_to_tick; 2233 cf::cede_to_tick;
2045 # now do the right thing for maps 2234 # now do the right thing for maps
2046 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2047 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2051 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2241 $self->decay_objects;
2053 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2054 $self->update_buttons; 2243 $self->update_buttons;
2055 cf::cede_to_tick; 2244 cf::cede_to_tick;
2056 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
2057 cf::cede_to_tick;
2058 $self->activate;
2059 } 2246 }
2060 2247
2061 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2063
2064 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2250 }
2066 2251
2067 $self->post_load; 2252 $self->post_load;
2068}
2069 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
2070sub customise_for { 2260sub customise_for {
2071 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2072 2262
2073 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2264 if $self->per_player;
2077# if $self->per_party; 2267# if $self->per_party;
2078 2268
2079 $self 2269 $self
2080} 2270}
2081 2271
2082# find and load all maps in the 3x3 area around a map
2083sub load_neighbours {
2084 my ($map) = @_;
2085
2086 my @neigh; # diagonal neighbours
2087
2088 for (0 .. 3) {
2089 my $neigh = $map->tile_path ($_)
2090 or next;
2091 $neigh = find $neigh, $map
2092 or next;
2093 $neigh->load;
2094
2095 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 }
2099
2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
2102 my $neigh = find $path, $origin
2103 or next;
2104 $neigh->load;
2105 }
2106}
2107
2108sub find_sync { 2272sub find_sync {
2109 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2110 2274
2111 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
2112} 2280}
2113 2281
2114sub do_load_sync { 2282sub do_load_sync {
2115 my ($map) = @_; 2283 my ($map) = @_;
2116 2284
2285 # it's a bug to call this from the main context
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2119 2288
2120 cf::sync_job { $map->load }; 2289 $map->load;
2121} 2290}
2122 2291
2123our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2125 2294
2126sub find_async { 2295sub find_async {
2127 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2128 2297
2129 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2130 2299
2131 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2133 } 2302 }
2134 2303
2135 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2136 2305
2137 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2151 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2152 2321
2153 () 2322 ()
2154} 2323}
2155 2324
2325# common code, used by both ->save and ->swapout
2156sub save { 2326sub _save {
2157 my ($self) = @_; 2327 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2328
2161 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2162 2330
2163 return unless $self->dirty; 2331 return unless $self->dirty;
2164 2332
2184 } else { 2352 } else {
2185 $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);
2186 } 2354 }
2187} 2355}
2188 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2189sub swap_out { 2365sub swap_out {
2190 my ($self) = @_; 2366 my ($self) = @_;
2191 2367
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2197 return if $self->players; 2372 return if $self->players;
2198 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
2199 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2200 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
2201 $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};
2202 2424
2203 $self->deactivate; 2425 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2427 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2428
2251 $self->unlink_save; 2429 $self->unlink_save;
2252 $self->destroy; 2430 $self->destroy;
2253} 2431}
2254 2432
2262 2440
2263 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2264 2442
2265 $self->unlink_save; 2443 $self->unlink_save;
2266 2444
2267 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2450
2329 : normalise $_ 2507 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2509 ]
2332} 2510}
2333 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
2334=back 2544=back
2335 2545
2336=head3 cf::object 2546=head3 cf::object
2337 2547
2338=cut 2548=cut
2403 2613
2404our $SAY_CHANNEL = { 2614our $SAY_CHANNEL = {
2405 id => "say", 2615 id => "say",
2406 title => "Map", 2616 title => "Map",
2407 reply => "say ", 2617 reply => "say ",
2408 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.",
2409}; 2619};
2410 2620
2411our $CHAT_CHANNEL = { 2621our $CHAT_CHANNEL = {
2412 id => "chat", 2622 id => "chat",
2413 title => "Chat", 2623 title => "Chat",
2470 2680
2471Freezes 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}>).
2472 2682
2473The 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.
2474for 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,
2475though, 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
2476map. 2686map.
2477 2687
2478Will never block. 2688Will never block.
2479 2689
2480=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2502 my ($self) = @_; 2712 my ($self) = @_;
2503 2713
2504 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2505 2715
2716 ++$self->{_link_recursion};
2717
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2719
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2510 2722
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2724}
2513 2725
2514sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2516 2728
2533 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2535 2747
2536 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2539 2751
2540 $map->load; 2752 $map->load;
2541 $map->load_neighbours;
2542 2753
2543 return unless $self->contr->active; 2754 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2755
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2549} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2550 2763
2764}
2765
2551=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)]])
2552 2767
2553Moves 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
2554her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2555that 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
2556the 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
2563 2778
2564our $GOTOGEN; 2779our $GOTOGEN;
2565 2780
2566sub cf::object::player::goto { 2781sub cf::object::player::goto {
2567 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 }
2568 2789
2569 # 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
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2792
2572 $self->enter_link; 2793 $self->enter_link;
2592 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2593 } 2814 }
2594 } 2815 }
2595 2816
2596 my $map = eval { 2817 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2598 2819
2599 if ($map) { 2820 if ($map) {
2600 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2823 } else {
2603 $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);
2604 } 2825 }
2605 2826
2606 $map 2827 $map
2614 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2617 } 2838 }
2618 2839
2619 $done->() if $done; 2840 $done->($self) if $done;
2620 })->prio (1); 2841 })->prio (1);
2621} 2842}
2622 2843
2623=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2624 2845
2692 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2693 2914
2694 unless (eval { 2915 unless (eval {
2695 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2696 2917
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2706 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2707 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 }
2708 2944
2709 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2710 2946
2711 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
2717 $self->message ("Something went wrong deep within the deliantra server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "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. "
2719 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2721 2957
2722 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 2959 $self->leave_link;
2724 } 2960 }
2725 })->prio (1); 2961 })->prio (1);
2726} 2962}
2727 2963
2739sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2741 2977
2742 utf8::encode $text; 2978 utf8::encode $text;
2743 $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);
2744} 3005}
2745 3006
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 3008
2748Send 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
2752 3013
2753=cut 3014=cut
2754 3015
2755# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2757 "c/identify" => { 3024 "c/identify" => {
2758 id => "infobox", 3025 id => "infobox",
2759 title => "Identify", 3026 title => "Identify",
2760 reply => undef, 3027 reply => undef,
2761 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2763 "c/examine" => { 3030 "c/examine" => {
2764 id => "infobox", 3031 id => "infobox",
2765 title => "Examine", 3032 title => "Examine",
2766 reply => undef, 3033 reply => undef,
2767 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",
2768 }, 3041 },
2769 "c/book" => { 3042 "c/book" => {
2770 id => "infobox", 3043 id => "infobox",
2771 title => "Book", 3044 title => "Book",
2772 reply => undef, 3045 reply => undef,
2788 id => "infobox", 3061 id => "infobox",
2789 title => "Body Parts", 3062 title => "Body Parts",
2790 reply => undef, 3063 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 3064 tooltip => "Shows which body parts you posess and are available",
2792 }, 3065 },
3066 "c/statistics" => {
3067 id => "infobox",
3068 title => "Statistics",
3069 reply => undef,
3070 tooltip => "Shows your primary statistics",
3071 },
2793 "c/skills" => { 3072 "c/skills" => {
2794 id => "infobox", 3073 id => "infobox",
2795 title => "Skills", 3074 title => "Skills",
2796 reply => undef, 3075 reply => undef,
2797 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",
2798 }, 3101 },
2799 "c/uptime" => { 3102 "c/uptime" => {
2800 id => "infobox", 3103 id => "infobox",
2801 title => "Uptime", 3104 title => "Uptime",
2802 reply => undef, 3105 reply => undef,
2812 id => "party", 3115 id => "party",
2813 title => "Party", 3116 title => "Party",
2814 reply => "gsay ", 3117 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3118 tooltip => "Messages and chat related to your party",
2816 }, 3119 },
3120 "c/death" => {
3121 id => "death",
3122 title => "Death",
3123 reply => undef,
3124 tooltip => "Reason for and more info about your most recent death",
3125 },
3126 "c/say" => $SAY_CHANNEL,
3127 "c/chat" => $CHAT_CHANNEL,
2817); 3128);
2818 3129
2819sub cf::client::send_msg { 3130sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3131 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3132
2826 3137
2827 # check predefined channels, for the benefit of C 3138 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3139 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3140 $channel = $CHANNEL{$channel};
2830 3141
2831 $self->ext_msg (channel_info => $channel) 3142 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3143 $channel = $channel->{id};
2835 3144
2836 } elsif (ref $channel) { 3145 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3146 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3147 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3148 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3149 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3150 }
2843 3151
2844 $channel = $channel->{id}; 3152 $channel = $channel->{id};
2845 } 3153 }
2846 3154
2847 return unless @extra || length $msg; 3155 return unless @extra || length $msg;
2848 3156
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3157 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3158 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3159 if $color & cf::NDI_DEF;
2853 3160
2854 my $pkt = "msg " 3161 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3162 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3164 );
2858 3165
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3166 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3167}
2896 3168
2897=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2898 3170
2899Sends an ext event to the client. 3171Sends an ext event to the client.
2902 3174
2903sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2905 3177
2906 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3183 }
2912} 3184}
2913 3185
2914=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2915 3187
2919 3191
2920sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2922 3194
2923 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3198 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3201 }
2930} 3202}
2931 3203
2932=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2933 3205
3004 3276
3005 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3278 if $reply;
3007 3279
3008 } else { 3280 } else {
3009 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";
3010 } 3282 }
3011 3283
3012 cf::override; 3284 cf::override;
3013 }, 3285 },
3014); 3286);
3034 3306
3035 $coro 3307 $coro
3036} 3308}
3037 3309
3038cf::client->attach ( 3310cf::client->attach (
3039 on_destroy => sub { 3311 on_client_destroy => sub {
3040 my ($ns) = @_; 3312 my ($ns) = @_;
3041 3313
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3315 },
3044); 3316);
3060our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3061 3333
3062$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3063 3335
3064$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3067 sort time 3339 sort time
3068)); 3340));
3069 3341
3070# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3346The following functions and methods are available within a safe environment:
3075 3347
3076 cf::object 3348 cf::object
3077 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
3078 insert remove name archname title slaying race decrease split 3350 insert remove name archname title slaying race decrease split
3351 value
3079 3352
3080 cf::object::player 3353 cf::object::player
3081 player 3354 player
3082 3355
3083 cf::player 3356 cf::player
3089=cut 3362=cut
3090 3363
3091for ( 3364for (
3092 ["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
3093 insert remove inv nrof name archname title slaying race 3366 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3369 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3098) { 3371) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3374 for @funs;
3103} 3375}
3104 3376
3119 3391
3120 my $qcode = $code; 3392 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3123 3395
3396 %vars = (_dummy => 0) unless %vars;
3397
3398 my @res;
3124 local $_; 3399 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3400
3127 my $eval = 3401 my $eval =
3128 "do {\n" 3402 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3405 . $code
3132 . "\n}" 3406 . "\n}"
3133 ; 3407 ;
3134 3408
3409 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 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 }
3138 3418
3139 if ($@) { 3419 if ($@) {
3140 warn "$@"; 3420 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3143 } 3423 }
3144 3424
3145 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3146} 3426}
3147 3427
3161=cut 3441=cut
3162 3442
3163sub register_script_function { 3443sub register_script_function {
3164 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3165 3445
3166 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3168} 3448}
3169 3449
3170=back 3450=back
3171 3451
3172=cut 3452=cut
3181 # for this (global event?) 3461 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3463
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3465
3186 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3187 3467
3188 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3189 0 < aio_load $path, $facedata
3190 or die "$path: $!";
3191
3192 $facedata = Coro::Storable::thaw $facedata;
3193 3469
3194 $facedata->{version} == 2 3470 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3472
3197 # 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]);
3198 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3476 type => FT_RSRC,
3200 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),
3201 }; 3479 };
3202 cf::cede_to_tick; 3480 cf::cede_to_tick;
3203 3481
3204 { 3482 {
3205 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3487
3210 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 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} ;
3214 3493
3215 cf::cede_to_tick; 3494 cf::cede_to_tick;
3216 } 3495 }
3217 3496
3218 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3223 3502
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3506 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3508 }
3230 3509
3231 cf::cede_to_tick; 3510 cf::cede_to_tick;
3232 } 3511 }
3233 } 3512 }
3242 3521
3243 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3244 } 3523 }
3245 3524
3246 { 3525 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3250 3527
3251 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3529 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3531
3256 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3271 } else { 3534 } else {
3272 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3273 } 3536 }
3274 3537
3275 cf::cede_to_tick; 3538 cf::cede_to_tick;
3276 } 3539 }
3277 } 3540 }
3278 3541
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3543
3281 1 3544 1
3282} 3545}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3546
3304register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3306 3549
3307 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3589sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3349} 3592}
3350 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
3351sub reload_resources { 3614sub reload_resources {
3352 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3353 3616
3617 reload_exp_table;
3618 reload_materials;
3354 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3355 reload_archetypes; 3621 reload_archetypes;
3356 reload_regions; 3622 reload_regions;
3357 reload_treasures; 3623 reload_treasures;
3358 3624
3359 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3360} 3626}
3361 3627
3362sub reload_config { 3628sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3364 or return;
3365 3630
3366 local $/; 3631 my $config = load_file "$CONFDIR/config";
3367 *CFG = YAML::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3368 3634
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3636
3371 $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};
3372 $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};
3373 3639
3374 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3397 3663
3398 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3399 print $fh $$; 3665 print $fh $$;
3400} 3666}
3401 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
3402sub main { 3677sub main {
3403 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3404 3679
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 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.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415 3684
3416 $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
3417 3686
3418 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3425 }; 3694 };
3426 3695
3427 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3428 3697
3429 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
3430 reload_resources; 3707 reload_resources;
3431 reload_config; 3708 reload_config;
3432 db_init; 3709 db_init;
3433 3710
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3711 cf::init_uuid;
3437 cf::init_signals; 3712 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3713 cf::init_skills;
3440 3714
3441 cf::init_beforeplay; 3715 cf::init_beforeplay;
3442 3716
3443 atomic; 3717 atomic;
3445 load_extensions; 3719 load_extensions;
3446 3720
3447 utime time, time, $RUNTIMEFILE; 3721 utime time, time, $RUNTIMEFILE;
3448 3722
3449 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3724 use POSIX ();
3450 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};
3451 3726
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3453 }; 3728 };
3454 3729
3455 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;
3456} 3739}
3457 3740
3458############################################################################# 3741#############################################################################
3459# initialisation and cleanup 3742# initialisation and cleanup
3460 3743
3461# install some emergency cleanup handlers 3744# install some emergency cleanup handlers
3462BEGIN { 3745BEGIN {
3463 our %SIGWATCHER = (); 3746 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3747 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3748 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3749 cf::cleanup "SIG$signal";
3467 }; 3750 };
3468 } 3751 }
3469} 3752}
3470 3753
3471sub write_runtime_sync { 3754sub write_runtime_sync {
3755 my $t0 = AE::time;
3756
3472 # first touch the runtime file to show we are still running: 3757 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3758 # the fsync below can take a very very long time.
3474 3759
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3760 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3761
3477 my $guard = cf::lock_acquire "write_runtime"; 3762 my $guard = cf::lock_acquire "write_runtime";
3478 3763
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3764 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3765 or return;
3481 3766
3482 my $value = $cf::RUNTIME + 90 + 10; 3767 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3768 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3769 # 60 allows for the watchdog to kill the server.
3497 or return; 3782 or return;
3498 3783
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3784 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3785 and return;
3501 3786
3502 warn "runtime file written.\n"; 3787 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3788
3504 1 3789 1
3505} 3790}
3506 3791
3507our $uuid_lock; 3792our $uuid_lock;
3516 my $uuid = "$LOCALDIR/uuid"; 3801 my $uuid = "$LOCALDIR/uuid";
3517 3802
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3803 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3804 or return;
3520 3805
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3806 my $value = uuid_seq uuid_cur;
3807
3808 unless ($value) {
3809 info "cowardly refusing to write zero uuid value!\n";
3810 return;
3811 }
3812
3813 my $value = uuid_str $value + $uuid_skip;
3522 $uuid_skip = 0; 3814 $uuid_skip = 0;
3523 3815
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3816 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3817 and return;
3526 3818
3532 or return; 3824 or return;
3533 3825
3534 aio_rename "$uuid~", $uuid 3826 aio_rename "$uuid~", $uuid
3535 and return; 3827 and return;
3536 3828
3537 warn "uuid file written ($value).\n"; 3829 trace "uuid file written ($value).\n";
3538 3830
3539 1 3831 1
3540 3832
3541} 3833}
3542 3834
3548} 3840}
3549 3841
3550sub emergency_save() { 3842sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3843 my $freeze_guard = cf::freeze_mainloop;
3552 3844
3553 warn "enter emergency perl save\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;
3554 3851
3555 cf::sync_job { 3852 cf::sync_job {
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
3556 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3858 info "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3860 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3861 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3863 $pl->save;
3565 } 3864 }
3566 warn "end emergency player save\n"; 3865 info "emergency_perl_save: end player save\n";
3567 3866
3568 warn "begin emergency map save\n"; 3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3869 info "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3872 $map->valid or next;
3572 $map->save; 3873 $map->save;
3573 } 3874 }
3574 warn "end emergency map save\n"; 3875 info "emergency_perl_save: end map save\n";
3575 3876
3576 warn "begin emergency database checkpoint\n"; 3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3879 info "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3579 3882
3580 warn "begin write uuid\n"; 3883 info "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3884 write_uuid_sync 1;
3582 warn "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
3583 }; 3905 };
3584 3906
3585 warn "leave emergency perl save\n"; 3907 info "emergency_perl_save: leave\n";
3586} 3908}
3587 3909
3588sub post_cleanup { 3910sub post_cleanup {
3589 my ($make_core) = @_; 3911 my ($make_core) = @_;
3590 3912
3913 IO::AIO::flush;
3914
3591 warn Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
3592 if $make_core; 3916 if $make_core;
3593 3917
3594 my $fh = pidfile; 3918 my $fh = pidfile;
3595 unlink $PIDFILE if <$fh> == $$; 3919 unlink $PIDFILE if <$fh> == $$;
3596} 3920}
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3940 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) { 3941 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"}; 3942 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3943# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 } 3944 }
3621 warn "cleared package $pkg\n";#d#
3622} 3945}
3623 3946
3624sub do_reload_perl() { 3947sub do_reload_perl() {
3625 # can/must only be called in main 3948 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3949 unless (in_main) {
3627 warn "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
3628 return; 3951 return;
3629 } 3952 }
3630 3953
3631 return if $RELOAD++; 3954 return if $RELOAD++;
3632 3955
3956 my $t1 = AE::time;
3957
3633 while ($RELOAD) { 3958 while ($RELOAD) {
3634 warn "reloading..."; 3959 cf::get_slot 0.1, -1, "reload_perl";
3960 info "perl_reload: reloading...";
3635 3961
3636 warn "entering sync_job"; 3962 trace "perl_reload: entering sync_job";
3637 3963
3638 cf::sync_job { 3964 cf::sync_job {
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 cf::emergency_save; 3965 #cf::emergency_save;
3641 cf::write_runtime_sync; # external watchdog should not bark
3642 3966
3643 warn "syncing database to disk";
3644 BDB::db_env_txn_checkpoint $DB_ENV;
3645
3646 # if anything goes wrong in here, we should simply crash as we already saved
3647
3648 warn "flushing outstanding aio requests";
3649 while (IO::AIO::nreqs || BDB::nreqs) {
3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3651 }
3652
3653 warn "cancelling all extension coros"; 3967 trace "perl_reload: cancelling all extension coros";
3654 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
3655 %EXT_CORO = (); 3969 %EXT_CORO = ();
3656 3970
3657 warn "removing commands"; 3971 trace "perl_reload: removing commands";
3658 %COMMAND = (); 3972 %COMMAND = ();
3659 3973
3660 warn "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
3661 %EXTCMD = (); 3975 %EXTCMD = ();
3662 %EXTICMD = (); 3976 %EXTICMD = ();
3663 3977
3664 warn "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
3665 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
3666 warn "... unloading $pkg"; 3980 trace "... unloading $pkg";
3667 3981
3668 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
3669 eval { 3983 eval {
3670 $cb->($pkg); 3984 $cb->($pkg);
3671 1 3985 1
3672 } or warn "$pkg unloaded, but with errors: $@"; 3986 } or error "$pkg unloaded, but with errors: $@";
3673 } 3987 }
3674 3988
3675 warn "... clearing $pkg"; 3989 trace "... clearing $pkg";
3676 clear_package $pkg; 3990 clear_package $pkg;
3677 } 3991 }
3678 3992
3679 warn "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682 3996
3683 warn "... unloading $k"; 3997 trace "... unloading $k";
3684 delete $INC{$k}; 3998 delete $INC{$k};
3685 3999
3686 $k =~ s/\.pm$//; 4000 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g; 4001 $k =~ s/\//::/g;
3688 4002
3691 } 4005 }
3692 4006
3693 clear_package $k; 4007 clear_package $k;
3694 } 4008 }
3695 4009
3696 warn "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
3697 clear_package "safe::$_" 4011 clear_package "safe::$_"
3698 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);
3699 4013
3700 warn "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 4017
3704 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
3705 # and global variables created in xs 4019 # and global variables created in xs
3706 #clear_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
3707 4021
3708 warn "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
3709 4023
3710 warn "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
3711 require cf; 4025 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4026 cf::_connect_to_perl_1;
3713 4027
3714 warn "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
3715 cf::reload_config; 4029 cf::reload_config;
3716 4030
3717 warn "loading extensions"; 4031 trace "perl_reload: loading extensions";
3718 cf::load_extensions; 4032 cf::load_extensions;
3719 4033
4034 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
3723 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
4041 }
3726 4042
3727 warn "running post_load"; 4043 cf::_post_init 1;
3728 (pop @POST_INIT)->(1) while @POST_INIT;
3729 4044
3730 warn "leaving sync_job"; 4045 trace "perl_reload: leaving sync_job";
3731 4046
3732 1 4047 1
3733 } or do { 4048 } or do {
3734 warn $@; 4049 error $@;
3735 cf::cleanup "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
3736 }; 4051 };
3737 4052
3738 warn "reloaded";
3739 --$RELOAD; 4053 --$RELOAD;
3740 } 4054 }
4055
4056 $t1 = AE::time - $t1;
4057 info "perl_reload: completed in ${t1}s\n";
3741}; 4058};
3742 4059
3743our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
3744 4061
3745sub reload_perl() { 4062sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 4063 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 4064 # coro crashes during coro_state_free->destroy here.
3748 4065
4066 $RELOAD_WATCHER ||= cf::async {
4067 Coro::AIO::aio_wait cache_extensions;
4068
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4069 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 4070 do_reload_perl;
3751 undef $RELOAD_WATCHER; 4071 undef $RELOAD_WATCHER;
4072 };
3752 }; 4073 };
3753} 4074}
3754 4075
3755register_command "reload" => sub { 4076register_command "reload" => sub {
3756 my ($who, $arg) = @_; 4077 my ($who, $arg) = @_;
3762 reload_perl; 4083 reload_perl;
3763 }; 4084 };
3764 } 4085 }
3765}; 4086};
3766 4087
3767unshift @INC, $LIBDIR; 4088#############################################################################
3768 4089
3769my $bug_warning = 0; 4090my $bug_warning = 0;
3770 4091
3771our @WAIT_FOR_TICK;
3772our @WAIT_FOR_TICK_BEGIN;
3773
3774sub wait_for_tick { 4092sub wait_for_tick() {
3775 return if tick_inhibit || $Coro::current == $Coro::main; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3776 4094
3777 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
3778 push @WAIT_FOR_TICK, $signal;
3779 $signal->wait;
3780} 4096}
3781 4097
3782sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
3783 return if tick_inhibit || $Coro::current == $Coro::main; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3784 4100
3785 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
3786 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
3787 $signal->wait; 4103 $signal->wait;
3788} 4104}
3792 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"
3793 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
3794 return; 4110 return;
3795 } 4111 }
3796 4112
3797 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#
3798 4116
3799 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3800 $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.;
3801 Coro::async_pool { 4119 Coro::async_pool {
3802 $Coro::current->{desc} = "runtime saver"; 4120 $Coro::current->{desc} = "runtime saver";
3803 write_runtime_sync 4121 write_runtime_sync
3804 or warn "ERROR: unable to write runtime file: $!"; 4122 or error "ERROR: unable to write runtime file: $!";
3805 }; 4123 };
3806 } 4124 }
3807 4125
3808 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3809 $sig->send; 4127 $sig->send;
3810 } 4128 }
3811 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
3812 $sig->send;
3813 }
3814 4130
3815 $LOAD = ($NOW - $TICK_START) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
3816 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3817 4133
3818 if (0) { 4134 if (0) {
3819 if ($NEXT_TICK) { 4135 if ($NEXT_TICK) {
3820 my $jitter = $TICK_START - $NEXT_TICK; 4136 my $jitter = $TICK_START - $NEXT_TICK;
3821 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4137 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3822 warn "jitter $JITTER\n";#d# 4138 debug "jitter $JITTER\n";#d#
3823 } 4139 }
3824 } 4140 }
3825} 4141}
3826 4142
3827{ 4143{
3828 # configure BDB 4144 # configure BDB
3829 4145
3830 BDB::min_parallel 8; 4146 BDB::min_parallel 16;
3831 BDB::max_poll_reqs $TICK * 0.1; 4147 BDB::max_poll_reqs $TICK * 0.1;
3832 $AnyEvent::BDB::WATCHER->priority (1); 4148 $AnyEvent::BDB::WATCHER->priority (1);
3833 4149
3834 unless ($DB_ENV) { 4150 unless ($DB_ENV) {
3835 $DB_ENV = BDB::db_env_create; 4151 $DB_ENV = BDB::db_env_create;
3872 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
3873 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
3874 undef $AnyEvent::AIO::WATCHER; 4190 undef $AnyEvent::AIO::WATCHER;
3875} 4191}
3876 4192
3877my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
3878 4195
3879sub _log_backtrace { 4196sub _log_backtrace {
3880 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
3881 4198
3882 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
3883 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3884 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
3885 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
3886 ++$_log_backtrace; 4207 ++$_log_backtrace;
3887 my $perl_bt = Carp::longmess $msg; 4208 my $perl_bt = Carp::longmess $msg;
3888 async { 4209 async {
3889 $Coro::current->{desc} = "abt $msg"; 4210 $Coro::current->{desc} = "abt $msg";
3890 4211
3910 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
3911 --$_log_backtrace; 4232 --$_log_backtrace;
3912 }; 4233 };
3913 } else { 4234 } else {
3914 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3916 } 4237 }
3917} 4238}
3918 4239
3919# load additional modules 4240# load additional modules
3920use cf::pod; 4241require "cf/$_.pm" for @EXTRA_MODULES;
4242cf::_connect_to_perl_2;
3921 4243
3922END { cf::emergency_save } 4244END { cf::emergency_save }
3923 4245
39241 42461
3925 4247

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines