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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines