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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.575 by root, Sat Aug 13 20:20:30 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;
1192 1339
1193 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1342 } else {
1196 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1197 } 1344 }
1198 } else { 1345 } else {
1199 aio_unlink $filename; 1346 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1201 } 1348 }
1225 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs}; 1373 $av = $st->{objs};
1227 } 1374 }
1228 1375
1229 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1230 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1231 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1232 1380
1233 ($data, $av) 1381 ($data, $av)
1234} 1382}
1235 1383
1236=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1292 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1293 1441
1294 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1295} 1443}
1296 1444
1445use File::Glob ();
1446
1297cf::player->attach ( 1447cf::player->attach (
1298 on_command => sub { 1448 on_unknown_command => sub {
1299 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1300 1450
1301 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1302 or return; 1452 or return;
1303 1453
1326 1476
1327 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1328 if $reply; 1478 if $reply;
1329 1479
1330 } else { 1480 } else {
1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1332 } 1482 }
1333 1483
1334 cf::override; 1484 cf::override;
1335 }, 1485 },
1336); 1486);
1337 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
1338sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1339 cf::sync_job { 1504 cf::sync_job {
1340 my %todo; 1505 my %todo;
1341 1506
1342 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1343 next unless -r $path; 1508 next unless -r $path;
1361 1526
1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1364 1529
1365 $ext{source} = 1530 $ext{source} =
1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1367 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1368 . $source 1533 . $source
1369 . "\n};\n1"; 1534 . "\n};\n1";
1370 1535
1371 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1372 } 1537 }
1373 1538
1539 my $pass = 0;
1374 my %done; 1540 my %done;
1375 while (%todo) { 1541 while (%todo) {
1376 my $progress; 1542 my $progress;
1377 1543
1544 ++$pass;
1545
1546 ext:
1378 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1549 next ext
1381 unless exists $done{$_}; 1550 unless exists $done{$_};
1382 } 1551 }
1383 1552
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1554
1386 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n";
1389 1559
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1561 if exists $v->{meta}{mandatory};
1394 1562
1395 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;
1396 } 1572 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1573 }
1402 1574
1403 skip: 1575 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 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 }
1406 } 1585 }
1407 }; 1586 };
1408} 1587}
1409 1588
1410############################################################################# 1589#############################################################################
1494 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1495 } 1674 }
1496 } 1675 }
1497} 1676}
1498 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
1499sub save($) { 1691sub save($) {
1500 my ($pl) = @_; 1692 my ($pl) = @_;
1501 1693
1502 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1503 1695
1508 1700
1509 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1510 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1511 1703
1512 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];
1513 1708
1514 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1515 cf::cede_to_tick; 1710 cf::cede_to_tick;
1516} 1711}
1517 1712
1551 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1552 1747
1553 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1554 $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
1555 1750
1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1557 $pl->deactivate; 1752 $pl->deactivate;
1753
1558 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;
1559 $pl->ob->check_score;
1560 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1561 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1562 1759
1563 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1564 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1565 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1619 \@logins 1816 \@logins
1620} 1817}
1621 1818
1622=item $player->maps 1819=item $player->maps
1623 1820
1821=item cf::player::maps $login
1822
1624Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1625player. May block. 1824player. May block.
1626 1825
1627=cut 1826=cut
1628 1827
1690=cut 1889=cut
1691 1890
1692sub find_by_path($) { 1891sub find_by_path($) {
1693 my ($path) = @_; 1892 my ($path) = @_;
1694 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1695 my ($match, $specificity); 1896 my ($match, $specificity);
1696 1897
1697 for my $region (list) { 1898 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1699 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1727sub generate_random_map { 1928sub generate_random_map {
1728 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1729 1930
1730 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
1731 1932
1732 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 1934}
1747 1935
1748=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1749 1937
1750Register 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
1755 1943
1756sub register { 1944sub register {
1757 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1946 my $pkg = caller;
1759 1947
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1949
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1951}
1765 1952
1766# also paths starting with '/' 1953# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1955
1769sub thawer_merge { 1956sub thawer_merge {
1770 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1771 1958
1772 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1777} 1964}
1778 1965
1779sub normalise { 1966sub normalise {
1780 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1781 1968
1782 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1783 1970
1784 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1785 1972
1786 # map plan: 1973 # map plan:
1787 # 1974 #
1802 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 1990 $path = "$base/$path";
1804 } 1991 }
1805 1992
1806 for ($path) { 1993 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1810 } 1996 }
1811 1997
1812 $path 1998 $path
1826 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1827 return $self; 2013 return $self;
1828 } 2014 }
1829 } 2015 }
1830 2016
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 2018 ()
1833} 2019}
1834 2020
2021# may re-bless or do other evil things
1835sub init { 2022sub init {
1836 my ($self) = @_; 2023 my ($self) = @_;
1837 2024
1838 $self 2025 $self
1839} 2026}
1870 2057
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1873} 2060}
1874 2061
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 2062sub decay_objects {
1885 my ($self) = @_; 2063 my ($self) = @_;
1886 2064
1887 return if $self->{deny_reset}; 2065 return if $self->{deny_reset};
1888 2066
1913 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1914 2092
1915 1 2093 1
1916} 2094}
1917 2095
2096# used to laod the header of an original map
1918sub load_header_orig { 2097sub load_header_orig {
1919 my ($self) = @_; 2098 my ($self) = @_;
1920 2099
1921 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1922} 2101}
1923 2102
2103# used to laod the header of an instantiated map
1924sub load_header_temp { 2104sub load_header_temp {
1925 my ($self) = @_; 2105 my ($self) = @_;
1926 2106
1927 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1928} 2108}
1929 2109
2110# called after loading the header from an instantiated map
1930sub prepare_temp { 2111sub prepare_temp {
1931 my ($self) = @_; 2112 my ($self) = @_;
1932 2113
1933 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1934 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1935 # safety 2116 # safety
1936 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1937 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1938} 2119}
1939 2120
2121# called after loading the header from an original map
1940sub prepare_orig { 2122sub prepare_orig {
1941 my ($self) = @_; 2123 my ($self) = @_;
1942 2124
1943 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1944 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1968 2150
1969sub find; 2151sub find;
1970sub find { 2152sub find {
1971 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1972 2154
2155 cf::cede_to_tick;
2156
1973 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1974 2158
1975 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2161
1978 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1983 or return; 2164 or return;
1984 2165
1985 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1986 2167
1998 2179
1999 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2000 } 2181 }
2001} 2182}
2002 2183
2003sub pre_load { } 2184sub pre_load { }
2004sub post_load { } 2185#sub post_load { } # XS
2005 2186
2006sub load { 2187sub load {
2007 my ($self) = @_; 2188 my ($self) = @_;
2008 2189
2009 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2012 2193
2013 { 2194 {
2014 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2015 2196
2016 return unless $self->valid; 2197 return unless $self->valid;
2017 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2018
2019 $self->in_memory (cf::MAP_LOADING);
2020 2199
2021 $self->alloc; 2200 $self->alloc;
2022 2201
2023 $self->pre_load; 2202 $self->pre_load;
2024 cf::cede_to_tick; 2203 cf::cede_to_tick;
2025 2204
2205 if (exists $self->{load_path}) {
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2207 $f->skip_block;
2028 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2029 or return; 2209 or return;
2030 2210
2031 $self->post_load_original 2211 $self->post_load_original
2032 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2033 2213
2034 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2215 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2038 $self->clear_unique_items; 2218 $self->clear_unique_items;
2039 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2041 } 2222 }
2042 } 2223 }
2043 }
2044 2224
2045 $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);
2046 2232
2047 cf::cede_to_tick; 2233 cf::cede_to_tick;
2048 # now do the right thing for maps 2234 # now do the right thing for maps
2049 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2050 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2054 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2241 $self->decay_objects;
2056 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2057 $self->update_buttons; 2243 $self->update_buttons;
2058 cf::cede_to_tick; 2244 cf::cede_to_tick;
2059 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
2060 cf::cede_to_tick;
2061 $self->activate;
2062 } 2246 }
2063 2247
2064 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2066
2067 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2250 }
2069 2251
2070 $self->post_load; 2252 $self->post_load;
2071}
2072 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
2073sub customise_for { 2260sub customise_for {
2074 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2075 2262
2076 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2264 if $self->per_player;
2080# if $self->per_party; 2267# if $self->per_party;
2081 2268
2082 $self 2269 $self
2083} 2270}
2084 2271
2085# find and load all maps in the 3x3 area around a map
2086sub load_neighbours {
2087 my ($map) = @_;
2088
2089 my @neigh; # diagonal neighbours
2090
2091 for (0 .. 3) {
2092 my $neigh = $map->tile_path ($_)
2093 or next;
2094 $neigh = find $neigh, $map
2095 or next;
2096 $neigh->load;
2097
2098 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 }
2102
2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
2105 my $neigh = find $path, $origin
2106 or next;
2107 $neigh->load;
2108 }
2109}
2110
2111sub find_sync { 2272sub find_sync {
2112 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2113 2274
2114 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
2115} 2280}
2116 2281
2117sub do_load_sync { 2282sub do_load_sync {
2118 my ($map) = @_; 2283 my ($map) = @_;
2119 2284
2285 # it's a bug to call this from the main context
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2122 2288
2123 cf::sync_job { $map->load }; 2289 $map->load;
2124} 2290}
2125 2291
2126our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2128 2294
2129sub find_async { 2295sub find_async {
2130 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2131 2297
2132 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2133 2299
2134 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2136 } 2302 }
2137 2303
2138 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2139 2305
2140 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2155 2321
2156 () 2322 ()
2157} 2323}
2158 2324
2325# common code, used by both ->save and ->swapout
2159sub save { 2326sub _save {
2160 my ($self) = @_; 2327 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2328
2164 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2165 2330
2166 return unless $self->dirty; 2331 return unless $self->dirty;
2167 2332
2187 } else { 2352 } else {
2188 $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);
2189 } 2354 }
2190} 2355}
2191 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2192sub swap_out { 2365sub swap_out {
2193 my ($self) = @_; 2366 my ($self) = @_;
2194 2367
2195 # save first because save cedes
2196 $self->save;
2197
2198 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2199 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2200 return if $self->players; 2372 return if $self->players;
2201 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
2202 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2203 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
2204 $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};
2205 2424
2206 $self->deactivate; 2425 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2208 $self->clear; 2427 $self->clear;
2209}
2210
2211sub reset_at {
2212 my ($self) = @_;
2213
2214 # TODO: safety, remove and allow resettable per-player maps
2215 return 1e99 if $self->{deny_reset};
2216
2217 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2218 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2219
2220 $time + $to
2221}
2222
2223sub should_reset {
2224 my ($self) = @_;
2225
2226 $self->reset_at <= $cf::RUNTIME
2227}
2228
2229sub reset {
2230 my ($self) = @_;
2231
2232 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233
2234 return if $self->players;
2235
2236 warn "resetting map ", $self->path;
2237
2238 $self->in_memory (cf::MAP_SWAPPED);
2239
2240 # need to save uniques path
2241 unless ($self->{deny_save}) {
2242 my $uniq = $self->uniq_path; utf8::encode $uniq;
2243
2244 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2245 if $uniq;
2246 }
2247
2248 delete $cf::MAP{$self->path};
2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear;
2253 2428
2254 $self->unlink_save; 2429 $self->unlink_save;
2255 $self->destroy; 2430 $self->destroy;
2256} 2431}
2257 2432
2265 2440
2266 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2267 2442
2268 $self->unlink_save; 2443 $self->unlink_save;
2269 2444
2270 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2271 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2272 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2273 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2275 2450
2332 : normalise $_ 2507 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2509 ]
2335} 2510}
2336 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
2337=back 2544=back
2338 2545
2339=head3 cf::object 2546=head3 cf::object
2340 2547
2341=cut 2548=cut
2406 2613
2407our $SAY_CHANNEL = { 2614our $SAY_CHANNEL = {
2408 id => "say", 2615 id => "say",
2409 title => "Map", 2616 title => "Map",
2410 reply => "say ", 2617 reply => "say ",
2411 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.",
2412}; 2619};
2413 2620
2414our $CHAT_CHANNEL = { 2621our $CHAT_CHANNEL = {
2415 id => "chat", 2622 id => "chat",
2416 title => "Chat", 2623 title => "Chat",
2473 2680
2474Freezes 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}>).
2475 2682
2476The 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.
2477for 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,
2478though, 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
2479map. 2686map.
2480 2687
2481Will never block. 2688Will never block.
2482 2689
2483=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2504sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2505 my ($self) = @_; 2712 my ($self) = @_;
2506 2713
2507 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2508 2715
2716 ++$self->{_link_recursion};
2717
2509 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2510 2719
2511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2512 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2513 2722
2514 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2515} 2724}
2516 2725
2517sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2518 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2519 2728
2536 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2538 2747
2539 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2542 2751
2543 $map->load; 2752 $map->load;
2544 $map->load_neighbours;
2545 2753
2546 return unless $self->contr->active; 2754 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2755
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2552} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2553 2763
2764}
2765
2554=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)]])
2555 2767
2556Moves 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
2557her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2558that 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
2559the 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
2566 2778
2567our $GOTOGEN; 2779our $GOTOGEN;
2568 2780
2569sub cf::object::player::goto { 2781sub cf::object::player::goto {
2570 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 }
2571 2789
2572 # 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
2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2574 2792
2575 $self->enter_link; 2793 $self->enter_link;
2595 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2596 } 2814 }
2597 } 2815 }
2598 2816
2599 my $map = eval { 2817 my $map = eval {
2600 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2601 2819
2602 if ($map) { 2820 if ($map) {
2603 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2604 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2605 } else { 2823 } else {
2606 $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);
2607 } 2825 }
2608 2826
2609 $map 2827 $map
2617 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2618 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2619 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2620 } 2838 }
2621 2839
2622 $done->() if $done; 2840 $done->($self) if $done;
2623 })->prio (1); 2841 })->prio (1);
2624} 2842}
2625 2843
2626=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2627 2845
2695 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2696 2914
2697 unless (eval { 2915 unless (eval {
2698 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2699 2917
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2709 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2710 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 }
2711 2944
2712 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2713 2946
2714 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
2720 $self->message ("Something went wrong deep within the deliantra server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2721 . "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. "
2722 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2723 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2724 2957
2725 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2726 $self->leave_link; 2959 $self->leave_link;
2727 } 2960 }
2728 })->prio (1); 2961 })->prio (1);
2729} 2962}
2730 2963
2742sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2743 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2744 2977
2745 utf8::encode $text; 2978 utf8::encode $text;
2746 $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);
2747} 3005}
2748 3006
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 3008
2751Send 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
2755 3013
2756=cut 3014=cut
2757 3015
2758# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2760 "c/identify" => { 3024 "c/identify" => {
2761 id => "infobox", 3025 id => "infobox",
2762 title => "Identify", 3026 title => "Identify",
2763 reply => undef, 3027 reply => undef,
2764 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2766 "c/examine" => { 3030 "c/examine" => {
2767 id => "infobox", 3031 id => "infobox",
2768 title => "Examine", 3032 title => "Examine",
2769 reply => undef, 3033 reply => undef,
2770 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",
2771 }, 3041 },
2772 "c/book" => { 3042 "c/book" => {
2773 id => "infobox", 3043 id => "infobox",
2774 title => "Book", 3044 title => "Book",
2775 reply => undef, 3045 reply => undef,
2791 id => "infobox", 3061 id => "infobox",
2792 title => "Body Parts", 3062 title => "Body Parts",
2793 reply => undef, 3063 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 3064 tooltip => "Shows which body parts you posess and are available",
2795 }, 3065 },
3066 "c/statistics" => {
3067 id => "infobox",
3068 title => "Statistics",
3069 reply => undef,
3070 tooltip => "Shows your primary statistics",
3071 },
2796 "c/skills" => { 3072 "c/skills" => {
2797 id => "infobox", 3073 id => "infobox",
2798 title => "Skills", 3074 title => "Skills",
2799 reply => undef, 3075 reply => undef,
2800 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",
2801 }, 3101 },
2802 "c/uptime" => { 3102 "c/uptime" => {
2803 id => "infobox", 3103 id => "infobox",
2804 title => "Uptime", 3104 title => "Uptime",
2805 reply => undef, 3105 reply => undef,
2815 id => "party", 3115 id => "party",
2816 title => "Party", 3116 title => "Party",
2817 reply => "gsay ", 3117 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 3118 tooltip => "Messages and chat related to your party",
2819 }, 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,
2820); 3128);
2821 3129
2822sub cf::client::send_msg { 3130sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 3131 my ($self, $channel, $msg, $color, @extra) = @_;
2824 3132
2829 3137
2830 # check predefined channels, for the benefit of C 3138 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 3139 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 3140 $channel = $CHANNEL{$channel};
2833 3141
2834 $self->ext_msg (channel_info => $channel) 3142 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 3143 $channel = $channel->{id};
2838 3144
2839 } elsif (ref $channel) { 3145 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 3146 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 3147 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 3148 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 3149 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 3150 }
2846 3151
2847 $channel = $channel->{id}; 3152 $channel = $channel->{id};
2848 } 3153 }
2849 3154
2850 return unless @extra || length $msg; 3155 return unless @extra || length $msg;
2851 3156
2852 if ($self->can_msg) {
2853 # default colour, mask it out 3157 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3158 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 3159 if $color & cf::NDI_DEF;
2856 3160
2857 my $pkt = "msg " 3161 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3162 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3164 );
2861 3165
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3166 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 3167}
2899 3168
2900=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2901 3170
2902Sends an ext event to the client. 3171Sends an ext event to the client.
2905 3174
2906sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2908 3177
2909 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 3183 }
2915} 3184}
2916 3185
2917=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2918 3187
2922 3191
2923sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2925 3194
2926 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove 3198 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3201 }
2933} 3202}
2934 3203
2935=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2936 3205
3007 3276
3008 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
3009 if $reply; 3278 if $reply;
3010 3279
3011 } else { 3280 } else {
3012 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";
3013 } 3282 }
3014 3283
3015 cf::override; 3284 cf::override;
3016 }, 3285 },
3017); 3286);
3037 3306
3038 $coro 3307 $coro
3039} 3308}
3040 3309
3041cf::client->attach ( 3310cf::client->attach (
3042 on_destroy => sub { 3311 on_client_destroy => sub {
3043 my ($ns) = @_; 3312 my ($ns) = @_;
3044 3313
3045 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3046 }, 3315 },
3047); 3316);
3063our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3064 3333
3065$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3066 3335
3067$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3070 sort time 3339 sort time
3071)); 3340));
3072 3341
3073# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3077The following functions and methods are available within a safe environment: 3346The following functions and methods are available within a safe environment:
3078 3347
3079 cf::object 3348 cf::object
3080 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
3081 insert remove name archname title slaying race decrease split 3350 insert remove name archname title slaying race decrease split
3351 value
3082 3352
3083 cf::object::player 3353 cf::object::player
3084 player 3354 player
3085 3355
3086 cf::player 3356 cf::player
3092=cut 3362=cut
3093 3363
3094for ( 3364for (
3095 ["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
3096 insert remove inv nrof name archname title slaying race 3366 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3369 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3101) { 3371) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3374 for @funs;
3106} 3375}
3107 3376
3122 3391
3123 my $qcode = $code; 3392 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3126 3395
3396 %vars = (_dummy => 0) unless %vars;
3397
3398 my @res;
3127 local $_; 3399 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3400
3130 my $eval = 3401 my $eval =
3131 "do {\n" 3402 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3405 . $code
3135 . "\n}" 3406 . "\n}"
3136 ; 3407 ;
3137 3408
3409 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 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 }
3141 3418
3142 if ($@) { 3419 if ($@) {
3143 warn "$@"; 3420 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3146 } 3423 }
3147 3424
3148 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3149} 3426}
3150 3427
3164=cut 3441=cut
3165 3442
3166sub register_script_function { 3443sub register_script_function {
3167 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3168 3445
3169 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3171} 3448}
3172 3449
3173=back 3450=back
3174 3451
3175=cut 3452=cut
3184 # for this (global event?) 3461 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3463
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3465
3189 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3190 3467
3191 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3192 0 < aio_load $path, $facedata
3193 or die "$path: $!";
3194
3195 $facedata = Coro::Storable::thaw $facedata;
3196 3469
3197 $facedata->{version} == 2 3470 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3472
3200 # 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]);
3201 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3476 type => FT_RSRC,
3203 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),
3204 }; 3479 };
3205 cf::cede_to_tick; 3480 cf::cede_to_tick;
3206 3481
3207 { 3482 {
3208 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3210 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3487
3213 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 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} ;
3217 3493
3218 cf::cede_to_tick; 3494 cf::cede_to_tick;
3219 } 3495 }
3220 3496
3221 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3226 3502
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3506 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3508 }
3233 3509
3234 cf::cede_to_tick; 3510 cf::cede_to_tick;
3235 } 3511 }
3236 } 3512 }
3245 3521
3246 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3247 } 3523 }
3248 3524
3249 { 3525 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3253 3527
3254 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3529 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3531
3259 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3274 } else { 3534 } else {
3275 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3276 } 3536 }
3277 3537
3278 cf::cede_to_tick; 3538 cf::cede_to_tick;
3279 } 3539 }
3280 } 3540 }
3281 3541
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3543
3284 1 3544 1
3285} 3545}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3546
3307register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3309 3549
3310 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3589sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3352} 3592}
3353 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
3354sub reload_resources { 3614sub reload_resources {
3355 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3356 3616
3617 reload_exp_table;
3618 reload_materials;
3357 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3358 reload_archetypes; 3621 reload_archetypes;
3359 reload_regions; 3622 reload_regions;
3360 reload_treasures; 3623 reload_treasures;
3361 3624
3362 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3363} 3626}
3364 3627
3365sub reload_config { 3628sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3367 or return;
3368 3630
3369 local $/; 3631 my $config = load_file "$CONFDIR/config";
3370 *CFG = YAML::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3371 3634
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3636
3374 $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};
3375 $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};
3376 3639
3377 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3400 3663
3401 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3402 print $fh $$; 3665 print $fh $$;
3403} 3666}
3404 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
3405sub main { 3677sub main {
3406 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3407 3679
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 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.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418 3684
3419 $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
3420 3686
3421 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3428 }; 3694 };
3429 3695
3430 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3431 3697
3432 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
3433 reload_resources; 3707 reload_resources;
3434 reload_config; 3708 reload_config;
3435 db_init; 3709 db_init;
3436 3710
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3711 cf::init_uuid;
3440 cf::init_signals; 3712 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills; 3713 cf::init_skills;
3443 3714
3444 cf::init_beforeplay; 3715 cf::init_beforeplay;
3445 3716
3446 atomic; 3717 atomic;
3448 load_extensions; 3719 load_extensions;
3449 3720
3450 utime time, time, $RUNTIMEFILE; 3721 utime time, time, $RUNTIMEFILE;
3451 3722
3452 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3724 use POSIX ();
3453 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};
3454 3726
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3456 }; 3728 };
3457 3729
3458 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 AE::postpone {
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3459} 3738}
3460 3739
3461############################################################################# 3740#############################################################################
3462# initialisation and cleanup 3741# initialisation and cleanup
3463 3742
3464# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3465BEGIN { 3744BEGIN {
3466 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3467 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3468 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3469 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3470 }; 3749 };
3471 } 3750 }
3472} 3751}
3473 3752
3474sub write_runtime_sync { 3753sub write_runtime_sync {
3754 my $t0 = AE::time;
3755
3475 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3477 3758
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3760
3480 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3481 3762
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3764 or return;
3484 3765
3485 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3500 or return; 3781 or return;
3501 3782
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3784 and return;
3504 3785
3505 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3506 3787
3507 1 3788 1
3508} 3789}
3509 3790
3510our $uuid_lock; 3791our $uuid_lock;
3522 or return; 3803 or return;
3523 3804
3524 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3525 3806
3526 unless ($value) { 3807 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3528 return; 3809 return;
3529 } 3810 }
3530 3811
3531 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0; 3813 $uuid_skip = 0;
3542 or return; 3823 or return;
3543 3824
3544 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3545 and return; 3826 and return;
3546 3827
3547 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3548 3829
3549 1 3830 1
3550 3831
3551} 3832}
3552 3833
3558} 3839}
3559 3840
3560sub emergency_save() { 3841sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3562 3843
3563 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3564 3850
3565 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3566 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3860 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3862 $pl->save;
3575 } 3863 }
3576 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3577 3865
3578 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3871 $map->valid or next;
3582 $map->save; 3872 $map->save;
3583 } 3873 }
3584 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3585 3875
3586 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3589 3881
3590 warn "begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3883 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3593 }; 3904 };
3594 3905
3595 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3596} 3907}
3597 3908
3598sub post_cleanup { 3909sub post_cleanup {
3599 my ($make_core) = @_; 3910 my ($make_core) = @_;
3600 3911
3912 IO::AIO::flush;
3913
3601 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3602 if $make_core; 3915 if $make_core;
3603 3916
3604 my $fh = pidfile; 3917 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3606} 3919}
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) { 3940 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"}; 3941 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 } 3943 }
3631 warn "cleared package $pkg\n";#d#
3632} 3944}
3633 3945
3634sub do_reload_perl() { 3946sub do_reload_perl() {
3635 # can/must only be called in main 3947 # can/must only be called in main
3636 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3637 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3638 return; 3950 return;
3639 } 3951 }
3640 3952
3641 return if $RELOAD++; 3953 return if $RELOAD++;
3642 3954
3955 my $t1 = AE::time;
3956
3643 while ($RELOAD) { 3957 while ($RELOAD) {
3644 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3645 3960
3646 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3647 3962
3648 cf::sync_job { 3963 cf::sync_job {
3649 cf::write_runtime_sync; # external watchdog should not bark
3650 cf::emergency_save; 3964 #cf::emergency_save;
3651 cf::write_runtime_sync; # external watchdog should not bark
3652 3965
3653 warn "syncing database to disk";
3654 BDB::db_env_txn_checkpoint $DB_ENV;
3655
3656 # if anything goes wrong in here, we should simply crash as we already saved
3657
3658 warn "flushing outstanding aio requests";
3659 while (IO::AIO::nreqs || BDB::nreqs) {
3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3661 }
3662
3663 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3664 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3665 %EXT_CORO = (); 3968 %EXT_CORO = ();
3666 3969
3667 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3668 %COMMAND = (); 3971 %COMMAND = ();
3669 3972
3670 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3671 %EXTCMD = (); 3974 %EXTCMD = ();
3672 %EXTICMD = (); 3975 %EXTICMD = ();
3673 3976
3674 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3675 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3676 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3677 3980
3678 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3679 eval { 3982 eval {
3680 $cb->($pkg); 3983 $cb->($pkg);
3681 1 3984 1
3682 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3683 } 3986 }
3684 3987
3685 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3686 clear_package $pkg; 3989 clear_package $pkg;
3687 } 3990 }
3688 3991
3689 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692 3995
3693 warn "... unloading $k"; 3996 trace "... unloading $k";
3694 delete $INC{$k}; 3997 delete $INC{$k};
3695 3998
3696 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3698 4001
3701 } 4004 }
3702 4005
3703 clear_package $k; 4006 clear_package $k;
3704 } 4007 }
3705 4008
3706 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3707 clear_package "safe::$_" 4010 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 4012
3710 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 4016
3714 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3715 # and global variables created in xs 4018 # and global variables created in xs
3716 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3717 4020
3718 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3719 4022
3720 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3721 require cf; 4024 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3723 4026
3724 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3725 cf::reload_config; 4028 cf::reload_config;
3726 4029
3727 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3728 cf::load_extensions; 4031 cf::load_extensions;
3729 4032
4033 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3733 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3736 4041
3737 warn "running post_load"; 4042 cf::_post_init 1;
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739 4043
3740 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3741 4045
3742 1 4046 1
3743 } or do { 4047 } or do {
3744 warn $@; 4048 error $@;
3745 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3746 }; 4050 };
3747 4051
3748 warn "reloaded";
3749 --$RELOAD; 4052 --$RELOAD;
3750 } 4053 }
4054
4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3751}; 4057};
3752 4058
3753our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3754 4060
3755sub reload_perl() { 4061sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3758 4064
4065 $RELOAD_WATCHER ||= cf::async {
4066 Coro::AIO::aio_wait cache_extensions;
4067
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 4069 do_reload_perl;
3761 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
4071 };
3762 }; 4072 };
3763} 4073}
3764 4074
3765register_command "reload" => sub { 4075register_command "reload" => sub {
3766 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3772 reload_perl; 4082 reload_perl;
3773 }; 4083 };
3774 } 4084 }
3775}; 4085};
3776 4086
3777unshift @INC, $LIBDIR; 4087#############################################################################
3778 4088
3779my $bug_warning = 0; 4089my $bug_warning = 0;
3780 4090
3781our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN;
3783
3784sub wait_for_tick { 4091sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4092 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3786 4093
3787 my $signal = new Coro::Signal; 4094 $WAIT_FOR_TICK->wait;
3788 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait;
3790} 4095}
3791 4096
3792sub wait_for_tick_begin { 4097sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4098 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794 4099
3795 my $signal = new Coro::Signal; 4100 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4101 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4102 $signal->wait;
3798} 4103}
3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4107 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3803 unless ++$bug_warning > 10; 4108 unless ++$bug_warning > 10;
3804 return; 4109 return;
3805 } 4110 }
3806 4111
3807 cf::server_tick; # one server iteration 4112 cf::one_tick; # one server iteration
4113
4114 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 4115
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4117 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4118 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4119 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4120 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4121 or error "ERROR: unable to write runtime file: $!";
3815 }; 4122 };
3816 } 4123 }
3817 4124
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4125 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4126 $sig->send;
3820 } 4127 }
3821 while (my $sig = shift @WAIT_FOR_TICK) { 4128 $WAIT_FOR_TICK->broadcast;
3822 $sig->send;
3823 }
3824 4129
3825 $LOAD = ($NOW - $TICK_START) / $TICK; 4130 $LOAD = ($NOW - $TICK_START) / $TICK;
3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4131 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3827 4132
3828 if (0) { 4133 if (0) {
3829 if ($NEXT_TICK) { 4134 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4135 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4136 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4137 debug "jitter $JITTER\n";#d#
3833 } 4138 }
3834 } 4139 }
3835} 4140}
3836 4141
3837{ 4142{
3838 # configure BDB 4143 # configure BDB
3839 4144
3840 BDB::min_parallel 8; 4145 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4146 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4147 #$AnyEvent::BDB::WATCHER->priority (1);
3843 4148
3844 unless ($DB_ENV) { 4149 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4150 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4151 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4152 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 IO::AIO::min_parallel 8; 4187 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4188 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4189 undef $AnyEvent::AIO::WATCHER;
3885} 4190}
3886 4191
3887my $_log_backtrace; 4192our $_log_backtrace;
4193our $_log_backtrace_last;
3888 4194
3889sub _log_backtrace { 4195sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4196 my ($msg, @addr) = @_;
3891 4197
3892 $msg =~ s/\n//; 4198 $msg =~ s/\n$//;
3893 4199
4200 if ($_log_backtrace_last eq $msg) {
4201 LOG llevInfo, "[ABT] $msg\n";
4202 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4203 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4204 } elsif ($_log_backtrace < 2) {
4205 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4206 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4207 my $perl_bt = Carp::longmess $msg;
3898 async { 4208 async {
3899 $Coro::current->{desc} = "abt $msg"; 4209 $Coro::current->{desc} = "abt $msg";
3900 4210
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4230 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4231 --$_log_backtrace;
3922 }; 4232 };
3923 } else { 4233 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4234 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4235 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4236 }
3927} 4237}
3928 4238
3929# load additional modules 4239# load additional modules
3930use cf::pod; 4240require "cf/$_.pm" for @EXTRA_MODULES;
4241cf::_connect_to_perl_2;
3931 4242
3932END { cf::emergency_save } 4243END { cf::emergency_save }
3933 4244
39341 42451
3935 4246

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines