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.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines