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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines