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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 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
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::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
69 75
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
87our $DATADIR = datadir; 99our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
91our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 112
100our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
101 120
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 123our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
106 125
107our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 129our $DB_ENV;
111 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
112our %CFG; 133our %CFG;
113 134
114our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
116our $NOW; 138our $NOW;
117 139
118our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
119our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
120our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
124 146
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 149our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
151
152our @POST_INIT;
153
154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
129 159
130binmode STDOUT; 160binmode STDOUT;
131binmode STDERR; 161binmode STDERR;
132 162
133# read virtual server time, if available 163# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 165 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
138} 168}
139 169
170eval "sub TICK() { $TICK } 1" or die;
171
140mkdir $_ 172mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 174
143our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
144 176
145sub cf::map::normalise; 177sub cf::map::normalise;
146 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
147############################################################################# 183#############################################################################
148 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
149=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
150 197
151=over 4 198=over 4
152 199
153=item $cf::UPTIME 200=item $cf::UPTIME
154 201
155The 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.
156 218
157=item $cf::RUNTIME 219=item $cf::RUNTIME
158 220
159The 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
160every server tick. 222every server tick.
166Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
167directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
168unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
169database environment. 231database environment.
170 232
171=item $cf::NOW
172
173The time of the last (current) server tick.
174
175=item $cf::TICK
176
177The interval between server ticks, in seconds.
178
179=item $cf::LOADAVG 233=item $cf::LOADAVG
180 234
181The 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
182(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
183objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
192from wherever your confdir points to. 246from wherever your confdir points to.
193 247
194=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
195 249
196These 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
197returns 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
198per 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.
199 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
200=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
201 272
202This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
203C<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
204that call. 275that call.
205 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
206=back 283=back
207 284
208=cut 285=cut
209 286
210BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
211 *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 {
212 my $msg = join "", @_; 294 my $msg = join "", @_;
213 295
214 $msg .= "\n" 296 $msg .= "\n"
215 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
216 298
217 $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;
218 300
219 LOG llevError, $msg; 301 LOG llevWarn, $msg;
220 }; 302};
221}
222 303
223$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
225 306
226 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 311 return;#d#
229 }#d# 312 }#d#
230 313
231 # kill coroutine otherwise 314 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 315 Coro::terminate
234}; 316};
235
236$SIG{__DIE__} = sub { }; #d#?
237 317
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 335)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 337}
258 338
259$EV::DIED = sub { 339$EV::DIED = sub {
260 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
261}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
262 347
263############################################################################# 348#############################################################################
264 349
265=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
266 351
287 $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;
288 $d 373 $d
289 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
290} 375}
291 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
292=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
293 392
294Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
295 394
296=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
302our $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
303 402
304sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
306 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
467
307=item cf::lock_wait $string 468=item cf::lock_wait $string
308 469
309Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
310 471
311=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
312 473
313Wait 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
314a 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,
315for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
316returned. 477returned.
317 478
318Locks 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
319deadlocked coro. 480deadlocked coro.
325 486
326Return 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.
327 488
328=cut 489=cut
329 490
330our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 492
333sub lock_wait($) { 493sub lock_wait($) {
334 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 495}
347 496
348sub lock_acquire($) { 497sub lock_acquire($) {
349 my ($key) = @_; 498 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 499}
363 500
364sub lock_active($) { 501sub lock_active($) {
365 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 503}
369 504
370sub freeze_mainloop { 505sub freeze_mainloop {
371 tick_inhibit_inc; 506 tick_inhibit_inc;
372 507
373 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
374} 509}
375 510
376=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
377 512
378Like 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
379get spread over timer. 514get spread over time.
380 515
381=cut 516=cut
382 517
383sub periodic($$) { 518sub periodic($$) {
384 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
388 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
389} 524}
390 525
391=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
392 527
393Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
394This 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
395of 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.
396 535
397The 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
398used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
399 538
400Useful for short background jobs. 539Useful for short background jobs.
401 540
402=cut 541=cut
403 542
404our @SLOT_QUEUE; 543our @SLOT_QUEUE;
405our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
406 546
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
410 550
411 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
412 553
413 while () { 554 while () {
414 next_job: 555 next_job:
556
415 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 558
417 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 563 $job->[2]->send;
421 Coro::cede; 564 Coro::cede;
422 goto next_job; 565 goto next_job;
423 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 568 }
425 } 569 }
426 570
427 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
428 # 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
429 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
430 $signal->wait;
431 } else { 574 } else {
575 $busy = 0;
432 Coro::schedule; 576 Coro::schedule;
433 } 577 }
434 } 578 }
435}; 579};
436 580
437sub get_slot($;$$) { 581sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
439 583
440 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
441 585
442 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
443 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
444 589
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
473=cut 618=cut
474 619
475sub sync_job(&) { 620sub sync_job(&) {
476 my ($job) = @_; 621 my ($job) = @_;
477 622
478 if ($Coro::current == $Coro::main) { 623 if (in_main) {
479 my $time = EV::time; 624 my $time = AE::time;
480 625
481 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
483 628
484 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
485 630
486 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
487 632
488 my $busy = 1; 633 my $busy = 1;
489 my @res; 634 my @res;
490 635
491 (async { 636 (async {
492 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 638 @res = eval { $job->() };
494 warn $@ if $@; 639 error $@ if $@;
495 undef $busy; 640 undef $busy;
496 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
497 642
498 while ($busy) { 643 while ($busy) {
499 if (Coro::nready) { 644 if (Coro::nready) {
501 } else { 646 } else {
502 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
503 } 648 }
504 } 649 }
505 650
506 my $time = EV::time - $time; 651 my $time = AE::time - $time;
507 652
508 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
509 654
510 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
511 } else { 656 } else {
533 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
534 679
535 $coro 680 $coro
536} 681}
537 682
538=item fork_call { }, $args 683=item fork_call { }, @args
539 684
540Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
541process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
542Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
543never block itself or use any form of event handling. 688never block itself or use any form of event handling.
544 689
545=cut 690=cut
546 691
692sub post_fork {
693 reset_signals;
694}
695
547sub fork_call(&@) { 696sub fork_call(&@) {
548 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
549 698
550 # 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,
551 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
552 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
553 702
554 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
555 reset_signals; 704 cf::post_fork;
556 &$cb 705 &$cb
557 }, @args; 706 } @args;
558 707
559 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 )
560} 720}
561 721
562=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
563 723
564=cut 724=cut
601within each server. 761within each server.
602 762
603=cut 763=cut
604 764
605sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
606 my ($name) = @_; 769 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
608 771
609 eval { 772 eval {
610 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
620} 783}
621 784
622our $DB; 785our $DB;
623 786
624sub db_init { 787sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
627 };
628} 789}
629 790
630sub db_get($$) { 791sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
632 793
633 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
634 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
635 798
636 $! ? () 799 $! ? ()
637 : $data 800 : $data
638 }
639} 801}
640 802
641sub db_put($$$) { 803sub db_put($$$) {
642 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
671 833
672 my @data; 834 my @data;
673 my $md5; 835 my $md5;
674 836
675 for (0 .. $#$src) { 837 for (0 .. $#$src) {
676 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
677 or Carp::croak "$src->[$_]: $!";
678 } 839 }
679 840
680 # if processing is expensive, check 841 # if processing is expensive, check
681 # checksum first 842 # checksum first
682 if (1) { 843 if (1) {
699 860
700 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
701 my $data = $process->(\@data); 862 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
703 864
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 866
706 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
709 870
719 880
720=cut 881=cut
721 882
722sub datalog($@) { 883sub datalog($@) {
723 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 886}
726 887
727=back 888=back
728 889
729=cut 890=cut
924 1085
925 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 1088
928 } elsif (ref $type) { 1089 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
930 1091
931 } else { 1092 } else {
932 shift @arg; 1093 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
934 } 1095 }
935 } 1096 }
936} 1097}
937 1098
938sub _object_attach { 1099sub _object_attach {
948 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
949 } 1110 }
950 1111
951 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
952 } else { 1113 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1115 }
955 1116
956 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
957} 1118}
958 1119
1017 1178
1018 for (@$callbacks) { 1179 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1020 1181
1021 if ($@) { 1182 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1184 override;
1025 } 1185 }
1026 1186
1027 return 1 if $override; 1187 return 1 if $override;
1028 } 1188 }
1107 for (@$attach) { 1267 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1110 } 1270 }
1111 } else { 1271 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1273 }
1114 } 1274 }
1115} 1275}
1116 1276
1117cf::attachable->attach ( 1277cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1145 1305
1146 sync_job { 1306 sync_job {
1147 if (length $$rdata) { 1307 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1151 1312
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 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 }
1156 aio_close $fh; 1320 aio_close $fh;
1157 1321
1158 if (@$objs) { 1322 if (@$objs) {
1159 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) {
1160 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1163 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 }
1164 aio_close $fh; 1331 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1333 }
1167 } else { 1334 } else {
1168 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1169 } 1336 }
1170 1337
1171 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1342 } else {
1173 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1174 } 1344 }
1175 } else { 1345 } else {
1176 aio_unlink $filename; 1346 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1178 } 1348 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1373 $av = $st->{objs};
1204 } 1374 }
1205 1375
1206 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1209 1380
1210 ($data, $av) 1381 ($data, $av)
1211} 1382}
1212 1383
1213=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1270 1441
1271 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1272} 1443}
1273 1444
1445use File::Glob ();
1446
1274cf::player->attach ( 1447cf::player->attach (
1275 on_command => sub { 1448 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1277 1450
1278 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1279 or return; 1452 or return;
1280 1453
1288 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1289 1462
1290 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1291 1464
1292 if (ref $msg) { 1465 if (ref $msg) {
1293 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1294 "ARRAY" eq ref $msg
1295 ? @$msg
1296 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1297 1467
1298 my @reply; 1468 my @reply;
1299 1469
1300 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1301 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1303 1473
1304 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1305 if $reply; 1475 if $reply;
1306 1476
1307 } else { 1477 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1479 }
1310 1480
1311 cf::override; 1481 cf::override;
1312 }, 1482 },
1313); 1483);
1314 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
1315sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1316 cf::sync_job { 1501 cf::sync_job {
1317 my %todo; 1502 my %todo;
1318 1503
1319 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1505 next unless -r $path;
1338 1523
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1526
1342 $ext{source} = 1527 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1345 . $source 1530 . $source
1346 . "\n};\n1"; 1531 . "\n};\n1";
1347 1532
1348 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1349 } 1534 }
1350 1535
1536 my $pass = 0;
1351 my %done; 1537 my %done;
1352 while (%todo) { 1538 while (%todo) {
1353 my $progress; 1539 my $progress;
1354 1540
1541 ++$pass;
1542
1543 ext:
1355 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1546 next ext
1358 unless exists $done{$_}; 1547 unless exists $done{$_};
1359 } 1548 }
1360 1549
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1551
1363 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1556
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1558 if exists $v->{meta}{mandatory};
1371 1559
1372 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;
1373 } 1569 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1570 }
1379 1571
1380 skip: 1572 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 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 }
1383 } 1582 }
1384 }; 1583 };
1385} 1584}
1386 1585
1387############################################################################# 1586#############################################################################
1441 1640
1442sub exists($) { 1641sub exists($) {
1443 my ($login) = @_; 1642 my ($login) = @_;
1444 1643
1445 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1447} 1646}
1448 1647
1449sub find($) { 1648sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1650 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1472 } 1671 }
1473 } 1672 }
1474} 1673}
1475 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
1476sub save($) { 1688sub save($) {
1477 my ($pl) = @_; 1689 my ($pl) = @_;
1478 1690
1479 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1480 1692
1485 1697
1486 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1488 1700
1489 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];
1490 1705
1491 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1707 cf::cede_to_tick;
1493} 1708}
1494 1709
1528 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1529 1744
1530 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1531 $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
1532 1747
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1534 $pl->deactivate; 1749 $pl->deactivate;
1750
1535 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;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1538 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1539 1756
1540 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1542 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1596 \@logins 1813 \@logins
1597} 1814}
1598 1815
1599=item $player->maps 1816=item $player->maps
1600 1817
1818=item cf::player::maps $login
1819
1601Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1602player. May block. 1821player. May block.
1603 1822
1604=cut 1823=cut
1605 1824
1667=cut 1886=cut
1668 1887
1669sub find_by_path($) { 1888sub find_by_path($) {
1670 my ($path) = @_; 1889 my ($path) = @_;
1671 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1672 my ($match, $specificity); 1893 my ($match, $specificity);
1673 1894
1674 for my $region (list) { 1895 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1676 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1704sub generate_random_map { 1925sub generate_random_map {
1705 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1706 1927
1707 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
1708 1929
1709 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1718 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1719 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1720 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1721 (cf::region::find $rmp->{region}), $rmp->{custom}
1722 )
1723} 1931}
1724 1932
1725=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1726 1934
1727Register 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
1732 1940
1733sub register { 1941sub register {
1734 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 1943 my $pkg = caller;
1736 1944
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 1946
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1948}
1742 1949
1743# also paths starting with '/' 1950# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1952
1746sub thawer_merge { 1953sub thawer_merge {
1747 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1748 1955
1749 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1754} 1961}
1755 1962
1756sub normalise { 1963sub normalise {
1757 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1758 1965
1759 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1760 1967
1761 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1762 1969
1763 # map plan: 1970 # map plan:
1764 # 1971 #
1779 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1780 $path = "$base/$path"; 1987 $path = "$base/$path";
1781 } 1988 }
1782 1989
1783 for ($path) { 1990 for ($path) {
1784 redo if s{//}{/};
1785 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1786 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1787 } 1993 }
1788 1994
1789 $path 1995 $path
1803 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1804 return $self; 2010 return $self;
1805 } 2011 }
1806 } 2012 }
1807 2013
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 2015 ()
1810} 2016}
1811 2017
2018# may re-bless or do other evil things
1812sub init { 2019sub init {
1813 my ($self) = @_; 2020 my ($self) = @_;
1814 2021
1815 $self 2022 $self
1816} 2023}
1847 2054
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1850} 2057}
1851 2058
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 2059sub decay_objects {
1862 my ($self) = @_; 2060 my ($self) = @_;
1863 2061
1864 return if $self->{deny_reset}; 2062 return if $self->{deny_reset};
1865 2063
1890 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1891 2089
1892 1 2090 1
1893} 2091}
1894 2092
2093# used to laod the header of an original map
1895sub load_header_orig { 2094sub load_header_orig {
1896 my ($self) = @_; 2095 my ($self) = @_;
1897 2096
1898 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1899} 2098}
1900 2099
2100# used to laod the header of an instantiated map
1901sub load_header_temp { 2101sub load_header_temp {
1902 my ($self) = @_; 2102 my ($self) = @_;
1903 2103
1904 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1905} 2105}
1906 2106
2107# called after loading the header from an instantiated map
1907sub prepare_temp { 2108sub prepare_temp {
1908 my ($self) = @_; 2109 my ($self) = @_;
1909 2110
1910 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1911 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1912 # safety 2113 # safety
1913 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1914 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1915} 2116}
1916 2117
2118# called after loading the header from an original map
1917sub prepare_orig { 2119sub prepare_orig {
1918 my ($self) = @_; 2120 my ($self) = @_;
1919 2121
1920 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1921 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1945 2147
1946sub find; 2148sub find;
1947sub find { 2149sub find {
1948 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1949 2151
2152 cf::cede_to_tick;
2153
1950 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1951 2155
1952 cf::lock_wait "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2158
1955 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1960 or return; 2161 or return;
1961 2162
1962 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1963 2164
1975 2176
1976 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1977 } 2178 }
1978} 2179}
1979 2180
1980sub pre_load { } 2181sub pre_load { }
1981sub post_load { } 2182#sub post_load { } # XS
1982 2183
1983sub load { 2184sub load {
1984 my ($self) = @_; 2185 my ($self) = @_;
1985 2186
1986 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1989 2190
1990 { 2191 {
1991 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1992 2193
1993 return unless $self->valid; 2194 return unless $self->valid;
1994 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
1995
1996 $self->in_memory (cf::MAP_LOADING);
1997 2196
1998 $self->alloc; 2197 $self->alloc;
1999 2198
2000 $self->pre_load; 2199 $self->pre_load;
2001 cf::cede_to_tick; 2200 cf::cede_to_tick;
2002 2201
2202 if (exists $self->{load_path}) {
2003 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2004 $f->skip_block; 2204 $f->skip_block;
2005 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2006 or return; 2206 or return;
2007 2207
2008 $self->post_load_original 2208 $self->post_load_original
2009 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2010 2210
2011 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2012 utf8::encode $uniq; 2212 utf8::encode $uniq;
2013 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2014 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2015 $self->clear_unique_items; 2215 $self->clear_unique_items;
2016 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2017 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2018 } 2219 }
2019 } 2220 }
2020 }
2021 2221
2022 $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);
2023 2229
2024 cf::cede_to_tick; 2230 cf::cede_to_tick;
2025 # now do the right thing for maps 2231 # now do the right thing for maps
2026 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2027 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2031 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2238 $self->decay_objects;
2033 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2034 $self->update_buttons; 2240 $self->update_buttons;
2035 cf::cede_to_tick; 2241 cf::cede_to_tick;
2036 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
2037 cf::cede_to_tick;
2038 $self->activate;
2039 } 2243 }
2040 2244
2041 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2043
2044 $self->in_memory (cf::MAP_ACTIVE);
2045 } 2247 }
2046 2248
2047 $self->post_load; 2249 $self->post_load;
2048}
2049 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
2050sub customise_for { 2257sub customise_for {
2051 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2052 2259
2053 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2261 if $self->per_player;
2057# if $self->per_party; 2264# if $self->per_party;
2058 2265
2059 $self 2266 $self
2060} 2267}
2061 2268
2062# find and load all maps in the 3x3 area around a map
2063sub load_neighbours {
2064 my ($map) = @_;
2065
2066 my @neigh; # diagonal neighbours
2067
2068 for (0 .. 3) {
2069 my $neigh = $map->tile_path ($_)
2070 or next;
2071 $neigh = find $neigh, $map
2072 or next;
2073 $neigh->load;
2074
2075 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 }
2079
2080 for (grep defined $_->[0], @neigh) {
2081 my ($path, $origin) = @$_;
2082 my $neigh = find $path, $origin
2083 or next;
2084 $neigh->load;
2085 }
2086}
2087
2088sub find_sync { 2269sub find_sync {
2089 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2090 2271
2091 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
2092} 2277}
2093 2278
2094sub do_load_sync { 2279sub do_load_sync {
2095 my ($map) = @_; 2280 my ($map) = @_;
2096 2281
2282 # it's a bug to call this from the main context
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2099 2285
2100 cf::sync_job { $map->load }; 2286 $map->load;
2101} 2287}
2102 2288
2103our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2105 2291
2106sub find_async { 2292sub find_async {
2107 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2108 2294
2109 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2110 2296
2111 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2113 } 2299 }
2114 2300
2115 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2116 2302
2117 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2131 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2132 2318
2133 () 2319 ()
2134} 2320}
2135 2321
2322# common code, used by both ->save and ->swapout
2136sub save { 2323sub _save {
2137 my ($self) = @_; 2324 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2325
2141 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2142 2327
2143 return unless $self->dirty; 2328 return unless $self->dirty;
2144 2329
2164 } else { 2349 } else {
2165 $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);
2166 } 2351 }
2167} 2352}
2168 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2169sub swap_out { 2362sub swap_out {
2170 my ($self) = @_; 2363 my ($self) = @_;
2171 2364
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2177 return if $self->players; 2369 return if $self->players;
2178 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
2179 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2180 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
2181 $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};
2182 2421
2183 $self->deactivate; 2422 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2424 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2425
2231 $self->unlink_save; 2426 $self->unlink_save;
2232 $self->destroy; 2427 $self->destroy;
2233} 2428}
2234 2429
2242 2437
2243 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2244 2439
2245 $self->unlink_save; 2440 $self->unlink_save;
2246 2441
2247 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2447
2309 : normalise $_ 2504 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2506 ]
2312} 2507}
2313 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
2314=back 2541=back
2315 2542
2316=head3 cf::object 2543=head3 cf::object
2317 2544
2318=cut 2545=cut
2383 2610
2384our $SAY_CHANNEL = { 2611our $SAY_CHANNEL = {
2385 id => "say", 2612 id => "say",
2386 title => "Map", 2613 title => "Map",
2387 reply => "say ", 2614 reply => "say ",
2388 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.",
2389}; 2616};
2390 2617
2391our $CHAT_CHANNEL = { 2618our $CHAT_CHANNEL = {
2392 id => "chat", 2619 id => "chat",
2393 title => "Chat", 2620 title => "Chat",
2450 2677
2451Freezes 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}>).
2452 2679
2453The 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.
2454for 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,
2455though, 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
2456map. 2683map.
2457 2684
2458Will never block. 2685Will never block.
2459 2686
2460=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2481sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2482 my ($self) = @_; 2709 my ($self) = @_;
2483 2710
2484 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2485 2712
2713 ++$self->{_link_recursion};
2714
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2716
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2490 2719
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2721}
2493 2722
2494sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2496 2725
2513 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2515 2744
2516 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2519 2748
2520 $map->load; 2749 $map->load;
2521 $map->load_neighbours;
2522 2750
2523 return unless $self->contr->active; 2751 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2752
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2529} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2530 2760
2761}
2762
2531=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)]])
2532 2764
2533Moves 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
2534her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2535that 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
2536the 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
2543 2775
2544our $GOTOGEN; 2776our $GOTOGEN;
2545 2777
2546sub cf::object::player::goto { 2778sub cf::object::player::goto {
2547 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 }
2548 2786
2549 # 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
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2789
2552 $self->enter_link; 2790 $self->enter_link;
2572 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2573 } 2811 }
2574 } 2812 }
2575 2813
2576 my $map = eval { 2814 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2578 2816
2579 if ($map) { 2817 if ($map) {
2580 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2820 } else {
2583 $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);
2584 } 2822 }
2585 2823
2586 $map 2824 $map
2594 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2597 } 2835 }
2598 2836
2599 $done->() if $done; 2837 $done->($self) if $done;
2600 })->prio (1); 2838 })->prio (1);
2601} 2839}
2602 2840
2603=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2604 2842
2672 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2673 2911
2674 unless (eval { 2912 unless (eval {
2675 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2676 2914
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2686 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2687 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 }
2688 2941
2689 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2690 2943
2691 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2697 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "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. "
2699 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2701 2954
2702 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2703 $self->leave_link; 2956 $self->leave_link;
2704 } 2957 }
2705 })->prio (1); 2958 })->prio (1);
2706} 2959}
2707 2960
2719sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2720 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2721 2974
2722 utf8::encode $text; 2975 utf8::encode $text;
2723 $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);
2724} 3002}
2725 3003
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 3005
2728Send 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
2732 3010
2733=cut 3011=cut
2734 3012
2735# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2737 "c/identify" => { 3021 "c/identify" => {
2738 id => "infobox", 3022 id => "infobox",
2739 title => "Identify", 3023 title => "Identify",
2740 reply => undef, 3024 reply => undef,
2741 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2743 "c/examine" => { 3027 "c/examine" => {
2744 id => "infobox", 3028 id => "infobox",
2745 title => "Examine", 3029 title => "Examine",
2746 reply => undef, 3030 reply => undef,
2747 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",
2748 }, 3038 },
2749 "c/book" => { 3039 "c/book" => {
2750 id => "infobox", 3040 id => "infobox",
2751 title => "Book", 3041 title => "Book",
2752 reply => undef, 3042 reply => undef,
2768 id => "infobox", 3058 id => "infobox",
2769 title => "Body Parts", 3059 title => "Body Parts",
2770 reply => undef, 3060 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 3061 tooltip => "Shows which body parts you posess and are available",
2772 }, 3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
3069 "c/skills" => {
3070 id => "infobox",
3071 title => "Skills",
3072 reply => undef,
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",
3098 },
2773 "c/uptime" => { 3099 "c/uptime" => {
2774 id => "infobox", 3100 id => "infobox",
2775 title => "Uptime", 3101 title => "Uptime",
2776 reply => undef, 3102 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3103 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3112 id => "party",
2787 title => "Party", 3113 title => "Party",
2788 reply => "gsay ", 3114 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3115 tooltip => "Messages and chat related to your party",
2790 }, 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,
2791); 3125);
2792 3126
2793sub cf::client::send_msg { 3127sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3129
2800 3134
2801 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3136 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3137 $channel = $CHANNEL{$channel};
2804 3138
2805 $self->ext_msg (channel_info => $channel) 3139 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3140 $channel = $channel->{id};
2809 3141
2810 } elsif (ref $channel) { 3142 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3147 }
2817 3148
2818 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2819 } 3150 }
2820 3151
2821 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2822 3153
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3154 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2827 3157
2828 my $pkt = "msg " 3158 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3161 );
2832 3162
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt); 3163 $self->send_big_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 3164}
2870 3165
2871=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2872 3167
2873Sends an ext event to the client. 3168Sends an ext event to the client.
2876 3171
2877sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2879 3174
2880 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 } 3180 }
2886} 3181}
2887 3182
2888=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2889 3184
2892=cut 3187=cut
2893 3188
2894sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2896 3191
2897 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 }
2904} 3195}
2905 3196
2906=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2907 3198
2908Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2963 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2964 3255
2965 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2966 3257
2967 if (ref $msg) { 3258 if (ref $msg) {
2968 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2969 "ARRAY" eq ref $msg
2970 ? @$msg
2971 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2972 3260
2973 my @reply; 3261 my @reply;
2974 3262
2975 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2976 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2978 3266
2979 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2980 if $reply; 3268 if $reply;
2981 3269
2982 } else { 3270 } else {
2983 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";
2984 } 3272 }
2985 3273
2986 cf::override; 3274 cf::override;
2987 }, 3275 },
2988); 3276);
3008 3296
3009 $coro 3297 $coro
3010} 3298}
3011 3299
3012cf::client->attach ( 3300cf::client->attach (
3013 on_destroy => sub { 3301 on_client_destroy => sub {
3014 my ($ns) = @_; 3302 my ($ns) = @_;
3015 3303
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3305 },
3018); 3306);
3034our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3035 3323
3036$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3037 3325
3038$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3041 sort time 3329 sort time
3042)); 3330));
3043 3331
3044# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
3049 3337
3050 cf::object 3338 cf::object
3051 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
3052 insert remove name archname title slaying race decrease split 3340 insert remove name archname title slaying race decrease split
3341 value
3053 3342
3054 cf::object::player 3343 cf::object::player
3055 player 3344 player
3056 3345
3057 cf::player 3346 cf::player
3063=cut 3352=cut
3064 3353
3065for ( 3354for (
3066 ["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
3067 insert remove inv nrof name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3072) { 3361) {
3073 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 for @funs; 3364 for @funs;
3077} 3365}
3078 3366
3093 3381
3094 my $qcode = $code; 3382 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3097 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
3098 local $_; 3389 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3390
3101 my $eval = 3391 my $eval =
3102 "do {\n" 3392 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3395 . $code
3106 . "\n}" 3396 . "\n}"
3107 ; 3397 ;
3108 3398
3399 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 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 }
3112 3408
3113 if ($@) { 3409 if ($@) {
3114 warn "$@"; 3410 warn "$@",
3115 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3117 } 3413 }
3118 3414
3119 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3120} 3416}
3121 3417
3135=cut 3431=cut
3136 3432
3137sub register_script_function { 3433sub register_script_function {
3138 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3139 3435
3140 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3142} 3438}
3143 3439
3144=back 3440=back
3145 3441
3146=cut 3442=cut
3155 # for this (global event?) 3451 # for this (global event?)
3156 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3157 3453
3158 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3159 3455
3160 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3161 3457
3162 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3163 0 < aio_load $path, $facedata
3164 or die "$path: $!";
3165
3166 $facedata = Coro::Storable::thaw $facedata;
3167 3459
3168 $facedata->{version} == 2 3460 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3170 3462
3171 # 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]);
3172 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC, 3466 type => FT_RSRC,
3174 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),
3175 }; 3469 };
3176 cf::cede_to_tick; 3470 cf::cede_to_tick;
3177 3471
3178 { 3472 {
3179 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3181 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3477
3184 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187 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} ;
3188 3483
3189 cf::cede_to_tick; 3484 cf::cede_to_tick;
3190 } 3485 }
3191 3486
3192 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3197 3492
3198 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3199 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3201 } else { 3496 } else {
3202 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3203 } 3498 }
3204 3499
3205 cf::cede_to_tick; 3500 cf::cede_to_tick;
3206 } 3501 }
3207 } 3502 }
3216 3511
3217 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3218 } 3513 }
3219 3514
3220 { 3515 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3224 3517
3225 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3519 if (defined $info->{type}) {
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3521
3230 if ($info->{type} & 1) { 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3231 # prepend meta info
3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type}; 3523 cf::face::set_type $idx, $info->{type};
3245 } else { 3524 } else {
3246 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3247 } 3526 }
3248 3527
3249 cf::cede_to_tick; 3528 cf::cede_to_tick;
3250 } 3529 }
3251 } 3530 }
3252 3531
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3254 3533
3255 1 3534 1
3256} 3535}
3257
3258cf::global->attach (on_resource_update => sub {
3259 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263 my $sound = $soundconf->{compat}[$_]
3264 or next;
3265
3266 my $face = cf::face::find "sound/$sound->[1]";
3267 cf::sound::set $sound->[0] => $face;
3268 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269 }
3270
3271 while (my ($k, $v) = each %{$soundconf->{event}}) {
3272 my $face = cf::face::find "sound/$v";
3273 cf::sound::set $k => $face;
3274 }
3275 }
3276});
3277 3536
3278register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3279 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3280 3539
3281 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
3320sub reload_treasures { 3579sub reload_treasures {
3321 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3322 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3323} 3582}
3324 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3325sub reload_resources { 3604sub reload_resources {
3326 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3327 3606
3607 reload_exp_table;
3608 reload_materials;
3328 reload_facedata; 3609 reload_facedata;
3610 reload_sound;
3329 reload_archetypes; 3611 reload_archetypes;
3330 reload_regions; 3612 reload_regions;
3331 reload_treasures; 3613 reload_treasures;
3332 3614
3333 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3334}
3335
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342} 3616}
3343 3617
3344sub reload_config { 3618sub reload_config {
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3619 trace "reloading config file...\n";
3346 or return;
3347 3620
3348 local $/; 3621 my $config = load_file "$CONFDIR/config";
3349 *CFG = YAML::Load <$fh>; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3350 3624
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3352 3626
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3355 3629
3356 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
3379 3653
3380 seek $fh, 0, 0; 3654 seek $fh, 0, 0;
3381 print $fh $$; 3655 print $fh $$;
3382} 3656}
3383 3657
3658sub main_loop {
3659 trace "EV::loop starting\n";
3660 if (1) {
3661 EV::loop;
3662 }
3663 trace "EV::loop returned\n";
3664 goto &main_loop unless $REALLY_UNLOOP;
3665}
3666
3384sub main { 3667sub main {
3385 atomic; 3668 cf::init_globals; # initialise logging
3669
3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3671 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3674
3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3676
3387 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3679 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3680 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3681 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3682 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3683 })->prio (Coro::PRIO_MAX);
3394 }; 3684 };
3395 3685
3396 { 3686 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3687
3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3695 cf::load_settings;
3696
3697 reload_resources;
3398 reload_config; 3698 reload_config;
3399 db_init; 3699 db_init;
3700
3701 cf::init_uuid;
3702 cf::init_signals;
3703 cf::init_skills;
3704
3705 cf::init_beforeplay;
3706
3707 atomic;
3708
3400 load_extensions; 3709 load_extensions;
3401 3710
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3711 utime time, time, $RUNTIMEFILE;
3406 3712
3407 # no (long-running) fork's whatsoever before this point(!) 3713 # no (long-running) fork's whatsoever before this point(!)
3714 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3716
3410 EV::loop; 3717 cf::_post_init 0;
3718 };
3719
3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3727 goto &main_loop;
3411} 3728}
3412 3729
3413############################################################################# 3730#############################################################################
3414# initialisation and cleanup 3731# initialisation and cleanup
3415 3732
3416# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3417BEGIN { 3734BEGIN {
3418 our %SIGWATCHER = (); 3735 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3422 }; 3739 };
3423 } 3740 }
3424} 3741}
3425 3742
3426sub write_runtime_sync { 3743sub write_runtime_sync {
3744 my $t0 = AE::time;
3745
3427 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3429 3748
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3750
3432 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
3433 3752
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3754 or return;
3436 3755
3437 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
3452 or return; 3771 or return;
3453 3772
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3774 and return;
3456 3775
3457 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3777
3459 1 3778 1
3460} 3779}
3461 3780
3462our $uuid_lock; 3781our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3790 my $uuid = "$LOCALDIR/uuid";
3472 3791
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3792 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3793 or return;
3475 3794
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3795 my $value = uuid_seq uuid_cur;
3796
3797 unless ($value) {
3798 info "cowardly refusing to write zero uuid value!\n";
3799 return;
3800 }
3801
3802 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3803 $uuid_skip = 0;
3478 3804
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3805 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3806 and return;
3481 3807
3487 or return; 3813 or return;
3488 3814
3489 aio_rename "$uuid~", $uuid 3815 aio_rename "$uuid~", $uuid
3490 and return; 3816 and return;
3491 3817
3492 warn "uuid file written ($value).\n"; 3818 trace "uuid file written ($value).\n";
3493 3819
3494 1 3820 1
3495 3821
3496} 3822}
3497 3823
3503} 3829}
3504 3830
3505sub emergency_save() { 3831sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3507 3833
3508 warn "enter emergency perl save\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3509 3840
3510 cf::sync_job { 3841 cf::sync_job {
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3511 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3850 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3852 $pl->save;
3520 } 3853 }
3521 warn "end emergency player save\n"; 3854 info "emergency_perl_save: end player save\n";
3522 3855
3523 warn "begin emergency map save\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3861 $map->valid or next;
3527 $map->save; 3862 $map->save;
3528 } 3863 }
3529 warn "end emergency map save\n"; 3864 info "emergency_perl_save: end map save\n";
3530 3865
3531 warn "begin emergency database checkpoint\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3534 3871
3535 warn "begin write uuid\n"; 3872 info "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3873 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3538 }; 3894 };
3539 3895
3540 warn "leave emergency perl save\n"; 3896 info "emergency_perl_save: leave\n";
3541} 3897}
3542 3898
3543sub post_cleanup { 3899sub post_cleanup {
3544 my ($make_core) = @_; 3900 my ($make_core) = @_;
3545 3901
3902 IO::AIO::flush;
3903
3546 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3547 if $make_core; 3905 if $make_core;
3548 3906
3549 my $fh = pidfile; 3907 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$; 3908 unlink $PIDFILE if <$fh> == $$;
3551} 3909}
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3930 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3931 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3933 }
3576 warn "cleared package #$pkg\n";#d#
3577} 3934}
3578
3579our $RELOAD; # how many times to reload
3580 3935
3581sub do_reload_perl() { 3936sub do_reload_perl() {
3582 # can/must only be called in main 3937 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3584 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3585 return; 3940 return;
3586 } 3941 }
3587 3942
3588 return if $RELOAD++; 3943 return if $RELOAD++;
3589 3944
3945 my $t1 = AE::time;
3946
3590 while ($RELOAD) { 3947 while ($RELOAD) {
3591 warn "reloading..."; 3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3592 3950
3593 warn "entering sync_job"; 3951 trace "perl_reload: entering sync_job";
3594 3952
3595 cf::sync_job { 3953 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3954 #cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 3955
3600 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV;
3602
3603 # if anything goes wrong in here, we should simply crash as we already saved
3604
3605 warn "flushing outstanding aio requests";
3606 while (IO::AIO::nreqs || BDB::nreqs) {
3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3608 }
3609
3610 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = (); 3958 %EXT_CORO = ();
3613 3959
3614 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3615 %COMMAND = (); 3961 %COMMAND = ();
3616 3962
3617 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3618 %EXTCMD = (); 3964 %EXTCMD = ();
3619 %EXTICMD = (); 3965 %EXTICMD = ();
3620 3966
3621 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3622 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3624 3970
3625 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3626 eval { 3972 eval {
3627 $cb->($pkg); 3973 $cb->($pkg);
3628 1 3974 1
3629 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3630 } 3976 }
3631 3977
3632 warn "... clearing $pkg"; 3978 trace "... clearing $pkg";
3633 clear_package $pkg; 3979 clear_package $pkg;
3634 } 3980 }
3635 3981
3636 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 3985
3640 warn "... unloading $k"; 3986 trace "... unloading $k";
3641 delete $INC{$k}; 3987 delete $INC{$k};
3642 3988
3643 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3645 3991
3648 } 3994 }
3649 3995
3650 clear_package $k; 3996 clear_package $k;
3651 } 3997 }
3652 3998
3653 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3654 clear_package "safe::$_" 4000 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 4002
3657 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 4006
3661 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3662 # and global variables created in xs 4008 # and global variables created in xs
3663 #clear_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3664 4010
3665 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3666 4012
3667 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3668 require cf; 4014 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3670 4016
3671 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3672 cf::reload_config; 4018 cf::reload_config;
3673 4019
3674 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3675 cf::load_extensions; 4021 cf::load_extensions;
3676 4022
4023 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3680 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
4030 }
3683 4031
3684 warn "leaving sync_job"; 4032 cf::_post_init 1;
4033
4034 trace "perl_reload: leaving sync_job";
3685 4035
3686 1 4036 1
3687 } or do { 4037 } or do {
3688 warn $@; 4038 error $@;
3689 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3690 }; 4040 };
3691 4041
3692 warn "reloaded";
3693 --$RELOAD; 4042 --$RELOAD;
3694 } 4043 }
4044
4045 $t1 = AE::time - $t1;
4046 info "perl_reload: completed in ${t1}s\n";
3695}; 4047};
3696 4048
3697our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3698 4050
3699sub reload_perl() { 4051sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 4052 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3702 4054
4055 $RELOAD_WATCHER ||= cf::async {
4056 Coro::AIO::aio_wait cache_extensions;
4057
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 4059 do_reload_perl;
3705 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
4061 };
3706 }; 4062 };
3707} 4063}
3708 4064
3709register_command "reload" => sub { 4065register_command "reload" => sub {
3710 my ($who, $arg) = @_; 4066 my ($who, $arg) = @_;
3716 reload_perl; 4072 reload_perl;
3717 }; 4073 };
3718 } 4074 }
3719}; 4075};
3720 4076
3721unshift @INC, $LIBDIR; 4077#############################################################################
3722 4078
3723my $bug_warning = 0; 4079my $bug_warning = 0;
3724 4080
3725our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN;
3727
3728sub wait_for_tick { 4081sub wait_for_tick() {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3730 4083
3731 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3732 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait;
3734} 4085}
3735 4086
3736sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738 4089
3739 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 4092 $signal->wait;
3742} 4093}
3746 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3747 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3748 return; 4099 return;
3749 } 4100 }
3750 4101
3751 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3752 4105
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 4108 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3757 write_runtime_sync 4110 write_runtime_sync
3758 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3759 }; 4112 };
3760 } 4113 }
3761 4114
3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3763 $sig->send; 4116 $sig->send;
3764 } 4117 }
3765 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3766 $sig->send;
3767 }
3768 4119
3769 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3770 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3771 4122
3772 if (0) { 4123 if (0) {
3773 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3774 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3777 } 4128 }
3778 } 4129 }
3779} 4130}
3780 4131
3781{ 4132{
3782 # configure BDB 4133 # configure BDB
3783 4134
3784 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3787 4138
3788 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3790 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3791 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3826 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3827 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3828 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3829} 4180}
3830 4181
3831my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3832 4184
3833sub _log_backtrace { 4185sub _log_backtrace {
3834 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3835 4187
3836 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3837 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3838 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3839 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3840 ++$_log_backtrace; 4196 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
3842 async { 4198 async {
3843 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3844 4200
3864 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3865 --$_log_backtrace; 4221 --$_log_backtrace;
3866 }; 4222 };
3867 } else { 4223 } else {
3868 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3870 } 4226 }
3871} 4227}
3872 4228
3873# load additional modules 4229# load additional modules
3874use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3875 4232
3876END { cf::emergency_save } 4233END { cf::emergency_save }
3877 4234
38781 42351
3879 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines