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.446 by root, Tue Sep 16 16:03:02 2008 UTC vs.
Revision 1.575 by root, Sat Aug 13 20:20:30 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
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
730 891
731############################################################################# 892#############################################################################
732 893
733=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
734 895
735Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
738 899
739In the following description, CLASS can be any of C<global>, C<object> 900In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 901C<player>, C<client> or C<map> (i.e. the attachable objects in
790=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
791 952
792Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
794 955
795Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
797 958
798These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
799 960
800=over 4 961=over 4
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
1303 1476
1304 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1305 if $reply; 1478 if $reply;
1306 1479
1307 } else { 1480 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1482 }
1310 1483
1311 cf::override; 1484 cf::override;
1312 }, 1485 },
1313); 1486);
1314 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1315sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1316 cf::sync_job { 1504 cf::sync_job {
1317 my %todo; 1505 my %todo;
1318 1506
1319 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1508 next unless -r $path;
1338 1526
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1529
1342 $ext{source} = 1530 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1345 . $source 1533 . $source
1346 . "\n};\n1"; 1534 . "\n};\n1";
1347 1535
1348 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1349 } 1537 }
1350 1538
1539 my $pass = 0;
1351 my %done; 1540 my %done;
1352 while (%todo) { 1541 while (%todo) {
1353 my $progress; 1542 my $progress;
1354 1543
1544 ++$pass;
1545
1546 ext:
1355 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1549 next ext
1358 unless exists $done{$_}; 1550 unless exists $done{$_};
1359 } 1551 }
1360 1552
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1554
1363 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1559
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1561 if exists $v->{meta}{mandatory};
1371 1562
1372 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1373 } 1572 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1573 }
1379 1574
1380 skip: 1575 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1383 } 1585 }
1384 }; 1586 };
1385} 1587}
1386 1588
1387############################################################################# 1589#############################################################################
1388 1590
1389=back 1591=back
1390 1592
1391=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1392 1594
1393Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1394 1596
1395=cut 1597=cut
1396 1598
1397package cf::player; 1599package cf::player;
1398 1600
1441 1643
1442sub exists($) { 1644sub exists($) {
1443 my ($login) = @_; 1645 my ($login) = @_;
1444 1646
1445 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1447} 1649}
1448 1650
1449sub find($) { 1651sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1653 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1472 } 1674 }
1473 } 1675 }
1474} 1676}
1475 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1476sub save($) { 1691sub save($) {
1477 my ($pl) = @_; 1692 my ($pl) = @_;
1478 1693
1479 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1480 1695
1485 1700
1486 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1488 1703
1489 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1708
1491 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1710 cf::cede_to_tick;
1493} 1711}
1494 1712
1528 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1529 1747
1530 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1750
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1534 $pl->deactivate; 1752 $pl->deactivate;
1753
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1538 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1539 1759
1540 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1542 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1596 \@logins 1816 \@logins
1597} 1817}
1598 1818
1599=item $player->maps 1819=item $player->maps
1600 1820
1821=item cf::player::maps $login
1822
1601Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1602player. May block. 1824player. May block.
1603 1825
1604=cut 1826=cut
1605 1827
1622 } 1844 }
1623 1845
1624 \@paths 1846 \@paths
1625} 1847}
1626 1848
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1850
1629Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1630 1852
1631=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1632 1854
1633Sends an ext reply to the player. 1855Sends an ext reply to the player.
1634 1856
1666 1888
1667=cut 1889=cut
1668 1890
1669sub find_by_path($) { 1891sub find_by_path($) {
1670 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1671 1895
1672 my ($match, $specificity); 1896 my ($match, $specificity);
1673 1897
1674 for my $region (list) { 1898 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1704sub generate_random_map { 1928sub generate_random_map {
1705 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1706 1930
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1932
1709 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1933 $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} 1934}
1724 1935
1725=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1726 1937
1727Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1732 1943
1733sub register { 1944sub register {
1734 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 1946 my $pkg = caller;
1736 1947
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 1949
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1951}
1742 1952
1743# also paths starting with '/' 1953# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1955
1746sub thawer_merge { 1956sub thawer_merge {
1747 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1748 1958
1749 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1754} 1964}
1755 1965
1756sub normalise { 1966sub normalise {
1757 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1758 1968
1759 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1760 1970
1761 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1762 1972
1763 # map plan: 1973 # map plan:
1764 # 1974 #
1779 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1780 $path = "$base/$path"; 1990 $path = "$base/$path";
1781 } 1991 }
1782 1992
1783 for ($path) { 1993 for ($path) {
1784 redo if s{//}{/};
1785 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1786 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1787 } 1996 }
1788 1997
1789 $path 1998 $path
1803 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1804 return $self; 2013 return $self;
1805 } 2014 }
1806 } 2015 }
1807 2016
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 2018 ()
1810} 2019}
1811 2020
2021# may re-bless or do other evil things
1812sub init { 2022sub init {
1813 my ($self) = @_; 2023 my ($self) = @_;
1814 2024
1815 $self 2025 $self
1816} 2026}
1847 2057
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1850} 2060}
1851 2061
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 { 2062sub decay_objects {
1862 my ($self) = @_; 2063 my ($self) = @_;
1863 2064
1864 return if $self->{deny_reset}; 2065 return if $self->{deny_reset};
1865 2066
1890 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1891 2092
1892 1 2093 1
1893} 2094}
1894 2095
2096# used to laod the header of an original map
1895sub load_header_orig { 2097sub load_header_orig {
1896 my ($self) = @_; 2098 my ($self) = @_;
1897 2099
1898 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1899} 2101}
1900 2102
2103# used to laod the header of an instantiated map
1901sub load_header_temp { 2104sub load_header_temp {
1902 my ($self) = @_; 2105 my ($self) = @_;
1903 2106
1904 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1905} 2108}
1906 2109
2110# called after loading the header from an instantiated map
1907sub prepare_temp { 2111sub prepare_temp {
1908 my ($self) = @_; 2112 my ($self) = @_;
1909 2113
1910 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1911 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1912 # safety 2116 # safety
1913 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1914 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1915} 2119}
1916 2120
2121# called after loading the header from an original map
1917sub prepare_orig { 2122sub prepare_orig {
1918 my ($self) = @_; 2123 my ($self) = @_;
1919 2124
1920 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1921 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1945 2150
1946sub find; 2151sub find;
1947sub find { 2152sub find {
1948 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1949 2154
2155 cf::cede_to_tick;
2156
1950 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1951 2158
1952 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2161
1955 $cf::MAP{$path} || do { 2162 $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 2163 my $map = new_from_path cf::map $path
1960 or return; 2164 or return;
1961 2165
1962 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1963 2167
1975 2179
1976 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1977 } 2181 }
1978} 2182}
1979 2183
1980sub pre_load { } 2184sub pre_load { }
1981sub post_load { } 2185#sub post_load { } # XS
1982 2186
1983sub load { 2187sub load {
1984 my ($self) = @_; 2188 my ($self) = @_;
1985 2189
1986 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
1989 2193
1990 { 2194 {
1991 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
1992 2196
1993 return unless $self->valid; 2197 return unless $self->valid;
1994 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
1995
1996 $self->in_memory (cf::MAP_LOADING);
1997 2199
1998 $self->alloc; 2200 $self->alloc;
1999 2201
2000 $self->pre_load; 2202 $self->pre_load;
2001 cf::cede_to_tick; 2203 cf::cede_to_tick;
2002 2204
2205 if (exists $self->{load_path}) {
2003 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2004 $f->skip_block; 2207 $f->skip_block;
2005 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2006 or return; 2209 or return;
2007 2210
2008 $self->post_load_original 2211 $self->post_load_original
2009 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2010 2213
2011 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2012 utf8::encode $uniq; 2215 utf8::encode $uniq;
2013 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2014 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2015 $self->clear_unique_items; 2218 $self->clear_unique_items;
2016 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2017 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2018 } 2222 }
2019 } 2223 }
2020 }
2021 2224
2022 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2023 2232
2024 cf::cede_to_tick; 2233 cf::cede_to_tick;
2025 # now do the right thing for maps 2234 # now do the right thing for maps
2026 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2027 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2031 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2241 $self->decay_objects;
2033 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2034 $self->update_buttons; 2243 $self->update_buttons;
2035 cf::cede_to_tick; 2244 cf::cede_to_tick;
2036 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
2037 cf::cede_to_tick;
2038 $self->activate;
2039 } 2246 }
2040 2247
2041 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2043
2044 $self->in_memory (cf::MAP_ACTIVE);
2045 } 2250 }
2046 2251
2047 $self->post_load; 2252 $self->post_load;
2048}
2049 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2050sub customise_for { 2260sub customise_for {
2051 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2052 2262
2053 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2264 if $self->per_player;
2057# if $self->per_party; 2267# if $self->per_party;
2058 2268
2059 $self 2269 $self
2060} 2270}
2061 2271
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 { 2272sub find_sync {
2089 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2090 2274
2091 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2092} 2280}
2093 2281
2094sub do_load_sync { 2282sub do_load_sync {
2095 my ($map) = @_; 2283 my ($map) = @_;
2096 2284
2285 # it's a bug to call this from the main context
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2099 2288
2100 cf::sync_job { $map->load }; 2289 $map->load;
2101} 2290}
2102 2291
2103our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2105 2294
2106sub find_async { 2295sub find_async {
2107 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2108 2297
2109 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2110 2299
2111 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2113 } 2302 }
2114 2303
2115 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2116 2305
2117 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2131 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2132 2321
2133 () 2322 ()
2134} 2323}
2135 2324
2325# common code, used by both ->save and ->swapout
2136sub save { 2326sub _save {
2137 my ($self) = @_; 2327 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2328
2141 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2142 2330
2143 return unless $self->dirty; 2331 return unless $self->dirty;
2144 2332
2164 } else { 2352 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2354 }
2167} 2355}
2168 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2169sub swap_out { 2365sub swap_out {
2170 my ($self) = @_; 2366 my ($self) = @_;
2171 2367
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2177 return if $self->players; 2372 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
2383 $self->clear;
2384}
2385
2386sub reset_at {
2387 my ($self) = @_;
2388
2389 # TODO: safety, remove and allow resettable per-player maps
2179 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2180 2391
2392 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2393 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2394
2395 $time + $to
2396}
2397
2398sub should_reset {
2399 my ($self) = @_;
2400
2401 $self->reset_at <= $cf::RUNTIME
2402}
2403
2404sub reset {
2405 my ($self) = @_;
2406
2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2408
2409 return if $self->players;
2410
2411 cf::trace "resetting map ", $self->path, "\n";
2412
2181 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2414
2415 # need to save uniques path
2416 unless ($self->{deny_save}) {
2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2418
2419 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2420 if $uniq;
2421 }
2422
2423 delete $cf::MAP{$self->path};
2182 2424
2183 $self->deactivate; 2425 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2427 $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 2428
2231 $self->unlink_save; 2429 $self->unlink_save;
2232 $self->destroy; 2430 $self->destroy;
2233} 2431}
2234 2432
2242 2440
2243 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2244 2442
2245 $self->unlink_save; 2443 $self->unlink_save;
2246 2444
2247 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2450
2309 : normalise $_ 2507 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2509 ]
2312} 2510}
2313 2511
2512=item cf::map::static_maps
2513
2514Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2515file in the shared directory excluding F</styles> and F</editor>). May
2516block.
2517
2518=cut
2519
2520sub static_maps() {
2521 my @dirs = "";
2522 my @maps;
2523
2524 while (@dirs) {
2525 my $dir = shift @dirs;
2526
2527 next if $dir eq "/styles" || $dir eq "/editor";
2528
2529 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2530 or return;
2531
2532 for (@$files) {
2533 s/\.map$// or next;
2534 utf8::decode $_;
2535 push @maps, "$dir/$_";
2536 }
2537
2538 push @dirs, map "$dir/$_", @$dirs;
2539 }
2540
2541 \@maps
2542}
2543
2314=back 2544=back
2315 2545
2316=head3 cf::object 2546=head3 cf::object
2317 2547
2318=cut 2548=cut
2383 2613
2384our $SAY_CHANNEL = { 2614our $SAY_CHANNEL = {
2385 id => "say", 2615 id => "say",
2386 title => "Map", 2616 title => "Map",
2387 reply => "say ", 2617 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2618 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2619};
2390 2620
2391our $CHAT_CHANNEL = { 2621our $CHAT_CHANNEL = {
2392 id => "chat", 2622 id => "chat",
2393 title => "Chat", 2623 title => "Chat",
2450 2680
2451Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2452 2682
2453The player should be reasonably safe there for short amounts of time (e.g. 2683The player should be reasonably safe there for short amounts of time (e.g.
2454for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link 2685though, as the player cannot control the character while it is on the link
2456map. 2686map.
2457 2687
2458Will never block. 2688Will never block.
2459 2689
2460=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2481sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2482 my ($self) = @_; 2712 my ($self) = @_;
2483 2713
2484 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2485 2715
2716 ++$self->{_link_recursion};
2717
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2719
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2490 2722
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2724}
2493 2725
2494sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2496 2728
2513 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2515 2747
2516 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2519 2751
2520 $map->load; 2752 $map->load;
2521 $map->load_neighbours;
2522 2753
2523 return unless $self->contr->active; 2754 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2755
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2529} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2530 2763
2764}
2765
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2767
2533Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2771the new (success) or old (failed) map position. In either case, $done will
2543 2778
2544our $GOTOGEN; 2779our $GOTOGEN;
2545 2780
2546sub cf::object::player::goto { 2781sub cf::object::player::goto {
2547 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2548 2789
2549 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2792
2552 $self->enter_link; 2793 $self->enter_link;
2572 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2573 } 2814 }
2574 } 2815 }
2575 2816
2576 my $map = eval { 2817 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2578 2819
2579 if ($map) { 2820 if ($map) {
2580 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2823 } else {
2583 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2584 } 2825 }
2585 2826
2586 $map 2827 $map
2594 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2597 } 2838 }
2598 2839
2599 $done->() if $done; 2840 $done->($self) if $done;
2600 })->prio (1); 2841 })->prio (1);
2601} 2842}
2602 2843
2603=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2604 2845
2672 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2673 2914
2674 unless (eval { 2915 unless (eval {
2675 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2676 2917
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; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2686 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2687 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2688 2944
2689 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2690 2946
2691 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED); 2949 if $exit->flag (cf::FLAG_DAMNED);
2694 2950
2695 1 2951 1
2696 }) { 2952 }) {
2697 $self->message ("Something went wrong deep within the crossfire server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2699 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2701 2957
2702 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2703 $self->leave_link; 2959 $self->leave_link;
2704 } 2960 }
2705 })->prio (1); 2961 })->prio (1);
2706} 2962}
2707 2963
2719sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2720 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2721 2977
2722 utf8::encode $text; 2978 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2980}
2981
2982=item $client->send_big_packet ($pkt)
2983
2984Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required.
2986
2987=cut
2988
2989our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2990
2991sub cf::client::send_big_packet {
2992 my ($self, $pkt) = @_;
2993
2994 # try lzf for large packets
2995 $pkt = "lzf " . Compress::LZF::compress $pkt
2996 if 1024 <= length $pkt and $self->{can_lzf};
2997
2998 # split very large packets
2999 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3000 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3001 $pkt = "frag";
3002 }
3003
3004 $self->send_packet ($pkt);
2724} 3005}
2725 3006
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 3008
2728Send a drawinfo or msg packet to the client, formatting the msg for the 3009Send a drawinfo or msg packet to the client, formatting the msg for the
2732 3013
2733=cut 3014=cut
2734 3015
2735# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2737 "c/identify" => { 3024 "c/identify" => {
2738 id => "infobox", 3025 id => "infobox",
2739 title => "Identify", 3026 title => "Identify",
2740 reply => undef, 3027 reply => undef,
2741 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2743 "c/examine" => { 3030 "c/examine" => {
2744 id => "infobox", 3031 id => "infobox",
2745 title => "Examine", 3032 title => "Examine",
2746 reply => undef, 3033 reply => undef,
2747 tooltip => "Signs and other items you examined", 3034 tooltip => "Signs and other items you examined",
3035 },
3036 "c/shopinfo" => {
3037 id => "infobox",
3038 title => "Shop Info",
3039 reply => undef,
3040 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 3041 },
2749 "c/book" => { 3042 "c/book" => {
2750 id => "infobox", 3043 id => "infobox",
2751 title => "Book", 3044 title => "Book",
2752 reply => undef, 3045 reply => undef,
2768 id => "infobox", 3061 id => "infobox",
2769 title => "Body Parts", 3062 title => "Body Parts",
2770 reply => undef, 3063 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 3064 tooltip => "Shows which body parts you posess and are available",
2772 }, 3065 },
3066 "c/statistics" => {
3067 id => "infobox",
3068 title => "Statistics",
3069 reply => undef,
3070 tooltip => "Shows your primary statistics",
3071 },
3072 "c/skills" => {
3073 id => "infobox",
3074 title => "Skills",
3075 reply => undef,
3076 tooltip => "Shows your experience per skill and item power",
3077 },
3078 "c/shopitems" => {
3079 id => "infobox",
3080 title => "Shop Items",
3081 reply => undef,
3082 tooltip => "Shows the items currently for sale in this shop",
3083 },
3084 "c/resistances" => {
3085 id => "infobox",
3086 title => "Resistances",
3087 reply => undef,
3088 tooltip => "Shows your resistances",
3089 },
3090 "c/pets" => {
3091 id => "infobox",
3092 title => "Pets",
3093 reply => undef,
3094 tooltip => "Shows information abotu your pets/a specific pet",
3095 },
3096 "c/perceiveself" => {
3097 id => "infobox",
3098 title => "Perceive Self",
3099 reply => undef,
3100 tooltip => "You gained detailed knowledge about yourself",
3101 },
2773 "c/uptime" => { 3102 "c/uptime" => {
2774 id => "infobox", 3103 id => "infobox",
2775 title => "Uptime", 3104 title => "Uptime",
2776 reply => undef, 3105 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3106 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3115 id => "party",
2787 title => "Party", 3116 title => "Party",
2788 reply => "gsay ", 3117 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3118 tooltip => "Messages and chat related to your party",
2790 }, 3119 },
3120 "c/death" => {
3121 id => "death",
3122 title => "Death",
3123 reply => undef,
3124 tooltip => "Reason for and more info about your most recent death",
3125 },
3126 "c/say" => $SAY_CHANNEL,
3127 "c/chat" => $CHAT_CHANNEL,
2791); 3128);
2792 3129
2793sub cf::client::send_msg { 3130sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3131 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3132
2796 $msg = $self->pl->expand_cfpod ($msg); 3133 $msg = $self->pl->expand_cfpod ($msg)
3134 unless $color & cf::NDI_VERBATIM;
2797 3135
2798 $color &= cf::NDI_CLIENT_MASK; # just in case... 3136 $color &= cf::NDI_CLIENT_MASK; # just in case...
2799 3137
2800 # check predefined channels, for the benefit of C 3138 # check predefined channels, for the benefit of C
2801 if ($CHANNEL{$channel}) { 3139 if ($CHANNEL{$channel}) {
2802 $channel = $CHANNEL{$channel}; 3140 $channel = $CHANNEL{$channel};
2803 3141
2804 $self->ext_msg (channel_info => $channel) 3142 $self->ext_msg (channel_info => $channel);
2805 if $self->can_msg;
2806
2807 $channel = $channel->{id}; 3143 $channel = $channel->{id};
2808 3144
2809 } elsif (ref $channel) { 3145 } elsif (ref $channel) {
2810 # send meta info to client, if not yet sent 3146 # send meta info to client, if not yet sent
2811 unless (exists $self->{channel}{$channel->{id}}) { 3147 unless (exists $self->{channel}{$channel->{id}}) {
2812 $self->{channel}{$channel->{id}} = $channel; 3148 $self->{channel}{$channel->{id}} = $channel;
2813 $self->ext_msg (channel_info => $channel) 3149 $self->ext_msg (channel_info => $channel);
2814 if $self->can_msg;
2815 } 3150 }
2816 3151
2817 $channel = $channel->{id}; 3152 $channel = $channel->{id};
2818 } 3153 }
2819 3154
2820 return unless @extra || length $msg; 3155 return unless @extra || length $msg;
2821 3156
2822 if ($self->can_msg) {
2823 # default colour, mask it out 3157 # default colour, mask it out
2824 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3158 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2825 if $color & cf::NDI_DEF; 3159 if $color & cf::NDI_DEF;
2826 3160
2827 my $pkt = "msg " 3161 my $pkt = "msg "
2828 . $self->{json_coder}->encode ( 3162 . $self->{json_coder}->encode (
2829 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830 ); 3164 );
2831 3165
2832 # try lzf for large packets
2833 $pkt = "lzf " . Compress::LZF::compress $pkt
2834 if 1024 <= length $pkt and $self->{can_lzf};
2835
2836 # split very large packets
2837 if (8192 < length $pkt and $self->{can_lzf}) {
2838 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839 $pkt = "frag";
2840 }
2841
2842 $self->send_packet ($pkt); 3166 $self->send_big_packet ($pkt);
2843 } else {
2844 if ($color >= 0) {
2845 # replace some tags by gcfclient-compatible ones
2846 for ($msg) {
2847 1 while
2848 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2849 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2850 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2851 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2852 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2853 }
2854
2855 $color &= cf::NDI_COLOR_MASK;
2856
2857 utf8::encode $msg;
2858
2859 if (0 && $msg =~ /\[/) {
2860 # COMMAND/INFO
2861 $self->send_packet ("drawextinfo $color 10 8 $msg")
2862 } else {
2863 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2864 $self->send_packet ("drawinfo $color $msg")
2865 }
2866 }
2867 }
2868} 3167}
2869 3168
2870=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2871 3170
2872Sends an ext event to the client. 3171Sends an ext event to the client.
2875 3174
2876sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2877 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2878 3177
2879 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2881 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2882 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2883 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2884 } 3183 }
2885} 3184}
2886 3185
2887=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2888 3187
2892 3191
2893sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2894 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2895 3194
2896 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2898 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2899 #TODO: version 1, remove 3198 #TODO: version 1, remove
2900 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2902 } 3201 }
2903} 3202}
2904 3203
2905=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2906 3205
2977 3276
2978 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
2979 if $reply; 3278 if $reply;
2980 3279
2981 } else { 3280 } else {
2982 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2983 } 3282 }
2984 3283
2985 cf::override; 3284 cf::override;
2986 }, 3285 },
2987); 3286);
3007 3306
3008 $coro 3307 $coro
3009} 3308}
3010 3309
3011cf::client->attach ( 3310cf::client->attach (
3012 on_destroy => sub { 3311 on_client_destroy => sub {
3013 my ($ns) = @_; 3312 my ($ns) = @_;
3014 3313
3015 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3016 }, 3315 },
3017); 3316);
3033our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3034 3333
3035$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3036 3335
3037$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3038 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3039 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3040 sort time 3339 sort time
3041)); 3340));
3042 3341
3043# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3047The following functions and methods are available within a safe environment: 3346The following functions and methods are available within a safe environment:
3048 3347
3049 cf::object 3348 cf::object
3050 contr pay_amount pay_player map x y force_find force_add destroy 3349 contr pay_amount pay_player map x y force_find force_add destroy
3051 insert remove name archname title slaying race decrease split 3350 insert remove name archname title slaying race decrease split
3351 value
3052 3352
3053 cf::object::player 3353 cf::object::player
3054 player 3354 player
3055 3355
3056 cf::player 3356 cf::player
3062=cut 3362=cut
3063 3363
3064for ( 3364for (
3065 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3365 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3066 insert remove inv nrof name archname title slaying race 3366 insert remove inv nrof name archname title slaying race
3067 decrease split destroy change_exp)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3068 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3069 ["cf::player" => qw(peaceful)], 3369 ["cf::player" => qw(peaceful send_msg)],
3070 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3071) { 3371) {
3072 no strict 'refs';
3073 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3074 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3075 for @funs; 3374 for @funs;
3076} 3375}
3077 3376
3092 3391
3093 my $qcode = $code; 3392 my $qcode = $code;
3094 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3095 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3096 3395
3396 %vars = (_dummy => 0) unless %vars;
3397
3398 my @res;
3097 local $_; 3399 local $_;
3098 local @safe::cf::_safe_eval_args = values %vars;
3099 3400
3100 my $eval = 3401 my $eval =
3101 "do {\n" 3402 "do {\n"
3102 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3103 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3104 . $code 3405 . $code
3105 . "\n}" 3406 . "\n}"
3106 ; 3407 ;
3107 3408
3409 if ($CFG{safe_eval}) {
3108 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3109 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3110 sub_generation_inc; 3413 sub_generation_inc;
3414 } else {
3415 local @cf::_safe_eval_args = values %vars;
3416 @res = wantarray ? eval eval : scalar eval $eval;
3417 }
3111 3418
3112 if ($@) { 3419 if ($@) {
3113 warn "$@"; 3420 warn "$@",
3114 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3115 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3116 } 3423 }
3117 3424
3118 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3119} 3426}
3120 3427
3134=cut 3441=cut
3135 3442
3136sub register_script_function { 3443sub register_script_function {
3137 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3138 3445
3139 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3140 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3141} 3448}
3142 3449
3143=back 3450=back
3144 3451
3145=cut 3452=cut
3154 # for this (global event?) 3461 # for this (global event?)
3155 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3156 3463
3157 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3158 3465
3159 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3160 3467
3161 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3162 0 < aio_load $path, $facedata
3163 or die "$path: $!";
3164
3165 $facedata = Coro::Storable::thaw $facedata;
3166 3469
3167 $facedata->{version} == 2 3470 $facedata->{version} == 2
3168 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3169 3472
3170 # patch in the exptable 3473 # patch in the exptable
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3171 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3172 type => FT_RSRC, 3476 type => FT_RSRC,
3173 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3477 data => $exp_table,
3478 hash => (Digest::MD5::md5 $exp_table),
3174 }; 3479 };
3175 cf::cede_to_tick; 3480 cf::cede_to_tick;
3176 3481
3177 { 3482 {
3178 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3180 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3181 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3182 3487
3183 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3184 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3185 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3186 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3187 3493
3188 cf::cede_to_tick; 3494 cf::cede_to_tick;
3189 } 3495 }
3190 3496
3191 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3196 3502
3197 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3198 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3199 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3200 } else { 3506 } else {
3201 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3202 } 3508 }
3203 3509
3204 cf::cede_to_tick; 3510 cf::cede_to_tick;
3205 } 3511 }
3206 } 3512 }
3215 3521
3216 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3217 } 3523 }
3218 3524
3219 { 3525 {
3220 # TODO: for gcfclient pleasure, we should give resources
3221 # that gcfclient doesn't grok a >10000 face index.
3222 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3223 3527
3224 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3225 if (defined $info->{type}) { 3529 if (defined $info->{type}) {
3226 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3227 my $data;
3228 3531
3229 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3230 # prepend meta info
3231
3232 my $meta = $enc->encode ({
3233 name => $name,
3234 %{ $info->{meta} || {} },
3235 });
3236
3237 $data = pack "(w/a*)*", $meta, $info->{data};
3238 } else {
3239 $data = $info->{data};
3240 }
3241
3242 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3243 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3244 } else { 3534 } else {
3245 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3246 } 3536 }
3247 3537
3248 cf::cede_to_tick; 3538 cf::cede_to_tick;
3249 } 3539 }
3250 } 3540 }
3251 3541
3252 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3253 3543
3254 1 3544 1
3255} 3545}
3256
3257cf::global->attach (on_resource_update => sub {
3258 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3259 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3260
3261 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3262 my $sound = $soundconf->{compat}[$_]
3263 or next;
3264
3265 my $face = cf::face::find "sound/$sound->[1]";
3266 cf::sound::set $sound->[0] => $face;
3267 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3268 }
3269
3270 while (my ($k, $v) = each %{$soundconf->{event}}) {
3271 my $face = cf::face::find "sound/$v";
3272 cf::sound::set $k => $face;
3273 }
3274 }
3275});
3276 3546
3277register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3278 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3279 3549
3280 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3319sub reload_treasures { 3589sub reload_treasures {
3320 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3321 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3322} 3592}
3323 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3324sub reload_resources { 3614sub reload_resources {
3325 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3326 3616
3617 reload_exp_table;
3618 reload_materials;
3327 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3328 reload_archetypes; 3621 reload_archetypes;
3329 reload_regions; 3622 reload_regions;
3330 reload_treasures; 3623 reload_treasures;
3331 3624
3332 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3333}
3334
3335sub init {
3336 my $guard = freeze_mainloop;
3337
3338 evthread_start IO::AIO::poll_fileno;
3339
3340 reload_resources;
3341} 3626}
3342 3627
3343sub reload_config { 3628sub reload_config {
3344 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3345 or return;
3346 3630
3347 local $/; 3631 my $config = load_file "$CONFDIR/config";
3348 *CFG = YAML::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3349 3634
3350 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3351 3636
3352 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3353 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3354 3639
3355 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3378 3663
3379 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3380 print $fh $$; 3665 print $fh $$;
3381} 3666}
3382 3667
3668sub main_loop {
3669 trace "EV::loop starting\n";
3670 if (1) {
3671 EV::loop;
3672 }
3673 trace "EV::loop returned\n";
3674 goto &main_loop unless $REALLY_UNLOOP;
3675}
3676
3383sub main { 3677sub main {
3384 atomic; 3678 cf::init_globals; # initialise logging
3679
3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3684
3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3385 3686
3386 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3387 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3388 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3689 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3389 (async { 3690 (async {
3390 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3691 $Coro::current->{desc} = "IDLE BUG HANDLER";
3391 EV::loop EV::LOOP_ONESHOT; 3692 EV::loop EV::LOOP_ONESHOT;
3392 })->prio (Coro::PRIO_MAX); 3693 })->prio (Coro::PRIO_MAX);
3393 }; 3694 };
3394 3695
3395 { 3696 evthread_start IO::AIO::poll_fileno;
3396 my $guard = freeze_mainloop; 3697
3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3705 cf::load_settings;
3706
3707 reload_resources;
3397 reload_config; 3708 reload_config;
3398 db_init; 3709 db_init;
3710
3711 cf::init_uuid;
3712 cf::init_signals;
3713 cf::init_skills;
3714
3715 cf::init_beforeplay;
3716
3717 atomic;
3718
3399 load_extensions; 3719 load_extensions;
3400 3720
3401 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 }
3403
3404 utime time, time, $RUNTIMEFILE; 3721 utime time, time, $RUNTIMEFILE;
3405 3722
3406 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3724 use POSIX ();
3407 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3408 3726
3409 EV::loop; 3727 cf::_post_init 0;
3728 };
3729
3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 AE::postpone {
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3410} 3738}
3411 3739
3412############################################################################# 3740#############################################################################
3413# initialisation and cleanup 3741# initialisation and cleanup
3414 3742
3415# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3416BEGIN { 3744BEGIN {
3417 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3418 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3419 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3420 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3421 }; 3749 };
3422 } 3750 }
3423} 3751}
3424 3752
3425sub write_runtime_sync { 3753sub write_runtime_sync {
3754 my $t0 = AE::time;
3755
3426 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3427 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3428 3758
3429 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3430 3760
3431 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3432 3762
3433 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3434 or return; 3764 or return;
3435 3765
3436 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3437 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3438 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3451 or return; 3781 or return;
3452 3782
3453 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3454 and return; 3784 and return;
3455 3785
3456 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3457 3787
3458 1 3788 1
3459} 3789}
3460 3790
3461our $uuid_lock; 3791our $uuid_lock;
3470 my $uuid = "$LOCALDIR/uuid"; 3800 my $uuid = "$LOCALDIR/uuid";
3471 3801
3472 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3802 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3473 or return; 3803 or return;
3474 3804
3475 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3806
3807 unless ($value) {
3808 info "cowardly refusing to write zero uuid value!\n";
3809 return;
3810 }
3811
3812 my $value = uuid_str $value + $uuid_skip;
3476 $uuid_skip = 0; 3813 $uuid_skip = 0;
3477 3814
3478 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3815 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3479 and return; 3816 and return;
3480 3817
3486 or return; 3823 or return;
3487 3824
3488 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3489 and return; 3826 and return;
3490 3827
3491 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3492 3829
3493 1 3830 1
3494 3831
3495} 3832}
3496 3833
3502} 3839}
3503 3840
3504sub emergency_save() { 3841sub emergency_save() {
3505 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3506 3843
3507 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3508 3850
3509 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3510 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3511 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3512 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3513 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3514 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3515 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3516 $pl->valid or next; 3860 $pl->valid or next;
3517 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3518 $pl->save; 3862 $pl->save;
3519 } 3863 }
3520 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3521 3865
3522 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
3523 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3524 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3525 $map->valid or next; 3871 $map->valid or next;
3526 $map->save; 3872 $map->save;
3527 } 3873 }
3528 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3529 3875
3530 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
3531 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3532 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3533 3881
3534 warn "begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3535 write_uuid_sync 1; 3883 write_uuid_sync 1;
3536 warn "end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3537 }; 3904 };
3538 3905
3539 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3540} 3907}
3541 3908
3542sub post_cleanup { 3909sub post_cleanup {
3543 my ($make_core) = @_; 3910 my ($make_core) = @_;
3544 3911
3912 IO::AIO::flush;
3913
3545 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3546 if $make_core; 3915 if $make_core;
3547 3916
3548 my $fh = pidfile; 3917 my $fh = pidfile;
3549 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3550} 3919}
3570 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571 for my $name (keys %$leaf_symtab) { 3940 for my $name (keys %$leaf_symtab) {
3572 _gv_clear *{"$pkg$name"}; 3941 _gv_clear *{"$pkg$name"};
3573# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574 } 3943 }
3575 warn "cleared package #$pkg\n";#d#
3576} 3944}
3577
3578our $RELOAD; # how many times to reload
3579 3945
3580sub do_reload_perl() { 3946sub do_reload_perl() {
3581 # can/must only be called in main 3947 # can/must only be called in main
3582 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3583 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3584 return; 3950 return;
3585 } 3951 }
3586 3952
3587 return if $RELOAD++; 3953 return if $RELOAD++;
3588 3954
3955 my $t1 = AE::time;
3956
3589 while ($RELOAD) { 3957 while ($RELOAD) {
3590 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3591 3960
3592 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3593 3962
3594 cf::sync_job { 3963 cf::sync_job {
3595 cf::write_runtime_sync; # external watchdog should not bark
3596 cf::emergency_save; 3964 #cf::emergency_save;
3597 cf::write_runtime_sync; # external watchdog should not bark
3598 3965
3599 warn "syncing database to disk";
3600 BDB::db_env_txn_checkpoint $DB_ENV;
3601
3602 # if anything goes wrong in here, we should simply crash as we already saved
3603
3604 warn "flushing outstanding aio requests";
3605 while (IO::AIO::nreqs || BDB::nreqs) {
3606 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3607 }
3608
3609 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3610 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3611 %EXT_CORO = (); 3968 %EXT_CORO = ();
3612 3969
3613 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3614 %COMMAND = (); 3971 %COMMAND = ();
3615 3972
3616 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3617 %EXTCMD = (); 3974 %EXTCMD = ();
3618 %EXTICMD = (); 3975 %EXTICMD = ();
3619 3976
3620 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3621 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3622 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3623 3980
3624 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3625 eval { 3982 eval {
3626 $cb->($pkg); 3983 $cb->($pkg);
3627 1 3984 1
3628 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3629 } 3986 }
3630 3987
3631 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3632 clear_package $pkg; 3989 clear_package $pkg;
3633 } 3990 }
3634 3991
3635 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3636 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3637 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3638 3995
3639 warn "... unloading $k"; 3996 trace "... unloading $k";
3640 delete $INC{$k}; 3997 delete $INC{$k};
3641 3998
3642 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3643 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3644 4001
3647 } 4004 }
3648 4005
3649 clear_package $k; 4006 clear_package $k;
3650 } 4007 }
3651 4008
3652 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3653 clear_package "safe::$_" 4010 clear_package "safe::$_"
3654 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3655 4012
3656 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3657 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3658 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3659 4016
3660 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3661 # and global variables created in xs 4018 # and global variables created in xs
3662 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3663 4020
3664 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3665 4022
3666 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3667 require cf; 4024 require cf;
3668 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3669 4026
3670 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3671 cf::reload_config; 4028 cf::reload_config;
3672 4029
3673 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3674 cf::load_extensions; 4031 cf::load_extensions;
3675 4032
4033 if ($REATTACH_ON_RELOAD) {
3676 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3677 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3678 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3679 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3680 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3681 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3682 4041
3683 warn "leaving sync_job"; 4042 cf::_post_init 1;
4043
4044 trace "perl_reload: leaving sync_job";
3684 4045
3685 1 4046 1
3686 } or do { 4047 } or do {
3687 warn $@; 4048 error $@;
3688 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3689 }; 4050 };
3690 4051
3691 warn "reloaded";
3692 --$RELOAD; 4052 --$RELOAD;
3693 } 4053 }
4054
4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3694}; 4057};
3695 4058
3696our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3697 4060
3698sub reload_perl() { 4061sub reload_perl() {
3699 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3700 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3701 4064
4065 $RELOAD_WATCHER ||= cf::async {
4066 Coro::AIO::aio_wait cache_extensions;
4067
3702 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3703 do_reload_perl; 4069 do_reload_perl;
3704 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
4071 };
3705 }; 4072 };
3706} 4073}
3707 4074
3708register_command "reload" => sub { 4075register_command "reload" => sub {
3709 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3715 reload_perl; 4082 reload_perl;
3716 }; 4083 };
3717 } 4084 }
3718}; 4085};
3719 4086
3720unshift @INC, $LIBDIR; 4087#############################################################################
3721 4088
3722my $bug_warning = 0; 4089my $bug_warning = 0;
3723 4090
3724our @WAIT_FOR_TICK;
3725our @WAIT_FOR_TICK_BEGIN;
3726
3727sub wait_for_tick { 4091sub wait_for_tick() {
3728 return if tick_inhibit || $Coro::current == $Coro::main; 4092 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3729 4093
3730 my $signal = new Coro::Signal; 4094 $WAIT_FOR_TICK->wait;
3731 push @WAIT_FOR_TICK, $signal;
3732 $signal->wait;
3733} 4095}
3734 4096
3735sub wait_for_tick_begin { 4097sub wait_for_tick_begin() {
3736 return if tick_inhibit || $Coro::current == $Coro::main; 4098 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3737 4099
3738 my $signal = new Coro::Signal; 4100 my $signal = new Coro::Signal;
3739 push @WAIT_FOR_TICK_BEGIN, $signal; 4101 push @WAIT_FOR_TICK_BEGIN, $signal;
3740 $signal->wait; 4102 $signal->wait;
3741} 4103}
3745 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4107 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3746 unless ++$bug_warning > 10; 4108 unless ++$bug_warning > 10;
3747 return; 4109 return;
3748 } 4110 }
3749 4111
3750 cf::server_tick; # one server iteration 4112 cf::one_tick; # one server iteration
4113
4114 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3751 4115
3752 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3753 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4117 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3754 Coro::async_pool { 4118 Coro::async_pool {
3755 $Coro::current->{desc} = "runtime saver"; 4119 $Coro::current->{desc} = "runtime saver";
3756 write_runtime_sync 4120 write_runtime_sync
3757 or warn "ERROR: unable to write runtime file: $!"; 4121 or error "ERROR: unable to write runtime file: $!";
3758 }; 4122 };
3759 } 4123 }
3760 4124
3761 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4125 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3762 $sig->send; 4126 $sig->send;
3763 } 4127 }
3764 while (my $sig = shift @WAIT_FOR_TICK) { 4128 $WAIT_FOR_TICK->broadcast;
3765 $sig->send;
3766 }
3767 4129
3768 $LOAD = ($NOW - $TICK_START) / $TICK; 4130 $LOAD = ($NOW - $TICK_START) / $TICK;
3769 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4131 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3770 4132
3771 if (0) { 4133 if (0) {
3772 if ($NEXT_TICK) { 4134 if ($NEXT_TICK) {
3773 my $jitter = $TICK_START - $NEXT_TICK; 4135 my $jitter = $TICK_START - $NEXT_TICK;
3774 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4136 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3775 warn "jitter $JITTER\n";#d# 4137 debug "jitter $JITTER\n";#d#
3776 } 4138 }
3777 } 4139 }
3778} 4140}
3779 4141
3780{ 4142{
3781 # configure BDB 4143 # configure BDB
3782 4144
3783 BDB::min_parallel 8; 4145 BDB::min_parallel 16;
3784 BDB::max_poll_reqs $TICK * 0.1; 4146 BDB::max_poll_reqs $TICK * 0.1;
3785 $AnyEvent::BDB::WATCHER->priority (1); 4147 #$AnyEvent::BDB::WATCHER->priority (1);
3786 4148
3787 unless ($DB_ENV) { 4149 unless ($DB_ENV) {
3788 $DB_ENV = BDB::db_env_create; 4150 $DB_ENV = BDB::db_env_create;
3789 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4151 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3790 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4152 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3825 IO::AIO::min_parallel 8; 4187 IO::AIO::min_parallel 8;
3826 IO::AIO::max_poll_time $TICK * 0.1; 4188 IO::AIO::max_poll_time $TICK * 0.1;
3827 undef $AnyEvent::AIO::WATCHER; 4189 undef $AnyEvent::AIO::WATCHER;
3828} 4190}
3829 4191
3830my $_log_backtrace; 4192our $_log_backtrace;
4193our $_log_backtrace_last;
3831 4194
3832sub _log_backtrace { 4195sub _log_backtrace {
3833 my ($msg, @addr) = @_; 4196 my ($msg, @addr) = @_;
3834 4197
3835 $msg =~ s/\n//; 4198 $msg =~ s/\n$//;
3836 4199
4200 if ($_log_backtrace_last eq $msg) {
4201 LOG llevInfo, "[ABT] $msg\n";
4202 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3837 # limit the # of concurrent backtraces 4203 # limit the # of concurrent backtraces
3838 if ($_log_backtrace < 2) { 4204 } elsif ($_log_backtrace < 2) {
4205 $_log_backtrace_last = $msg;
3839 ++$_log_backtrace; 4206 ++$_log_backtrace;
3840 my $perl_bt = Carp::longmess $msg; 4207 my $perl_bt = Carp::longmess $msg;
3841 async { 4208 async {
3842 $Coro::current->{desc} = "abt $msg"; 4209 $Coro::current->{desc} = "abt $msg";
3843 4210
3863 LOG llevInfo, "[ABT] $_\n" for @bt; 4230 LOG llevInfo, "[ABT] $_\n" for @bt;
3864 --$_log_backtrace; 4231 --$_log_backtrace;
3865 }; 4232 };
3866 } else { 4233 } else {
3867 LOG llevInfo, "[ABT] $msg\n"; 4234 LOG llevInfo, "[ABT] $msg\n";
3868 LOG llevInfo, "[ABT] [suppressed]\n"; 4235 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3869 } 4236 }
3870} 4237}
3871 4238
3872# load additional modules 4239# load additional modules
3873use cf::pod; 4240require "cf/$_.pm" for @EXTRA_MODULES;
4241cf::_connect_to_perl_2;
3874 4242
3875END { cf::emergency_save } 4243END { cf::emergency_save }
3876 4244
38771 42451
3878 4246

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines