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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 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)
2030 2239
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;
2244 $self->post_load_physics;
2035 cf::cede_to_tick; 2245 cf::cede_to_tick;
2036 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2037 cf::cede_to_tick;
2038 $self->activate;
2039 } 2247 }
2040 2248
2041 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2043
2044 $self->in_memory (cf::MAP_ACTIVE);
2045 } 2251 }
2046 2252
2047 $self->post_load; 2253 $self->post_load;
2048}
2049 2254
2255 1
2256}
2257
2258# customize the map for a given player, i.e.
2259# return the _real_ map. used by e.g. per-player
2260# maps to change the path to ~playername/mappath
2050sub customise_for { 2261sub customise_for {
2051 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2052 2263
2053 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2265 if $self->per_player;
2070 or next; 2281 or next;
2071 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2072 or next; 2283 or next;
2073 $neigh->load; 2284 $neigh->load;
2074 2285
2286 # now find the diagonal neighbours
2075 push @neigh, 2287 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2290 }
2079 2291
2086} 2298}
2087 2299
2088sub find_sync { 2300sub find_sync {
2089 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2090 2302
2091 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2092} 2308}
2093 2309
2094sub do_load_sync { 2310sub do_load_sync {
2095 my ($map) = @_; 2311 my ($map) = @_;
2096 2312
2313 # it's a bug to call this from the main context
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2099 2316
2100 cf::sync_job { $map->load }; 2317 $map->load;
2101} 2318}
2102 2319
2103our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2105 2322
2106sub find_async { 2323sub find_async {
2107 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2108 2325
2109 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2110 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2111 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2113 } 2332 }
2114 2333
2115 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2116 2335
2117 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2131 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2132 2351
2133 () 2352 ()
2134} 2353}
2135 2354
2355# common code, used by both ->save and ->swapout
2136sub save { 2356sub _save {
2137 my ($self) = @_; 2357 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2358
2141 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2142 2360
2143 return unless $self->dirty; 2361 return unless $self->dirty;
2144 2362
2164 } else { 2382 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2384 }
2167} 2385}
2168 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2169sub swap_out { 2395sub swap_out {
2170 my ($self) = @_; 2396 my ($self) = @_;
2171 2397
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2177 return if $self->players; 2402 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2179 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2180 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2181 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2182 2454
2183 $self->deactivate; 2455 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2457 $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 2458
2231 $self->unlink_save; 2459 $self->unlink_save;
2232 $self->destroy; 2460 $self->destroy;
2233} 2461}
2234 2462
2242 2470
2243 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2244 2472
2245 $self->unlink_save; 2473 $self->unlink_save;
2246 2474
2247 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2480
2309 : normalise $_ 2537 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2539 ]
2312} 2540}
2313 2541
2542=item cf::map::static_maps
2543
2544Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2545file in the shared directory excluding F</styles> and F</editor>). May
2546block.
2547
2548=cut
2549
2550sub static_maps() {
2551 my @dirs = "";
2552 my @maps;
2553
2554 while (@dirs) {
2555 my $dir = shift @dirs;
2556
2557 next if $dir eq "/styles" || $dir eq "/editor";
2558
2559 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2560 or return;
2561
2562 for (@$files) {
2563 s/\.map$// or next;
2564 utf8::decode $_;
2565 push @maps, "$dir/$_";
2566 }
2567
2568 push @dirs, map "$dir/$_", @$dirs;
2569 }
2570
2571 \@maps
2572}
2573
2314=back 2574=back
2315 2575
2316=head3 cf::object 2576=head3 cf::object
2317 2577
2318=cut 2578=cut
2383 2643
2384our $SAY_CHANNEL = { 2644our $SAY_CHANNEL = {
2385 id => "say", 2645 id => "say",
2386 title => "Map", 2646 title => "Map",
2387 reply => "say ", 2647 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2649};
2390 2650
2391our $CHAT_CHANNEL = { 2651our $CHAT_CHANNEL = {
2392 id => "chat", 2652 id => "chat",
2393 title => "Chat", 2653 title => "Chat",
2448 2708
2449=item $player_object->enter_link 2709=item $player_object->enter_link
2450 2710
2451Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2452 2712
2453The player should be reasonably safe there for short amounts of time. You 2713The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2715though, as the player cannot control the character while it is on the link
2716map.
2455 2717
2456Will never block. 2718Will never block.
2457 2719
2458=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2459 2721
2479sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2480 my ($self) = @_; 2742 my ($self) = @_;
2481 2743
2482 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2483 2745
2746 ++$self->{_link_recursion};
2747
2484 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2485 2749
2486 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2487 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2488 2752
2489 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2490} 2754}
2491 2755
2492sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2493 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2494 2758
2511 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2512 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2513 2777
2514 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2515 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2516 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2517 2781
2518 $map->load; 2782 $map->load;
2519 $map->load_neighbours; 2783 $map->load_neighbours;
2520 2784
2521 return unless $self->contr->active; 2785 return unless $self->contr->active;
2522 $self->activate_recursive;
2523 2786
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2526} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2527 2794
2795}
2796
2528=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2529 2798
2530Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2531her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2532that has to return the map if sucecssful, and then unfreezes the player on 2801that has to return the map if sucecssful, and then unfreezes the player on
2533the new (success) or old (failed) map position. In either case, $done will 2802the new (success) or old (failed) map position. In either case, $done will
2540 2809
2541our $GOTOGEN; 2810our $GOTOGEN;
2542 2811
2543sub cf::object::player::goto { 2812sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2545 2820
2546 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2823
2549 $self->enter_link; 2824 $self->enter_link;
2569 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2570 } 2845 }
2571 } 2846 }
2572 2847
2573 my $map = eval { 2848 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2575 2850
2576 if ($map) { 2851 if ($map) {
2577 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2854 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2856 }
2582 2857
2583 $map 2858 $map
2591 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2594 } 2869 }
2595 2870
2596 $done->() if $done; 2871 $done->($self) if $done;
2597 })->prio (1); 2872 })->prio (1);
2598} 2873}
2599 2874
2600=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2601 2876
2669 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2670 2945
2671 unless (eval { 2946 unless (eval {
2672 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2673 2948
2674 # random map handling
2675 {
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 prepare_random_map $exit
2679 if $exit->slaying eq "/!";
2680 }
2681
2682 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2683 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2684 my $y = $exit->stats->sp; 2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2685 2975
2686 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2687 2977
2688 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2980 if $exit->flag (cf::FLAG_DAMNED);
2691 2981
2692 1 2982 1
2693 }) { 2983 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2988
2699 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2700 $self->leave_link; 2990 $self->leave_link;
2701 } 2991 }
2702 })->prio (1); 2992 })->prio (1);
2703} 2993}
2704 2994
2716sub cf::client::send_drawinfo { 3006sub cf::client::send_drawinfo {
2717 my ($self, $text, $flags) = @_; 3007 my ($self, $text, $flags) = @_;
2718 3008
2719 utf8::encode $text; 3009 utf8::encode $text;
2720 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3010 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3011}
3012
3013=item $client->send_big_packet ($pkt)
3014
3015Like C<send_packet>, but tries to compress large packets, and fragments
3016them as required.
3017
3018=cut
3019
3020our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3021
3022sub cf::client::send_big_packet {
3023 my ($self, $pkt) = @_;
3024
3025 # try lzf for large packets
3026 $pkt = "lzf " . Compress::LZF::compress $pkt
3027 if 1024 <= length $pkt and $self->{can_lzf};
3028
3029 # split very large packets
3030 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3031 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3032 $pkt = "frag";
3033 }
3034
3035 $self->send_packet ($pkt);
2721} 3036}
2722 3037
2723=item $client->send_msg ($channel, $msg, $color, [extra...]) 3038=item $client->send_msg ($channel, $msg, $color, [extra...])
2724 3039
2725Send a drawinfo or msg packet to the client, formatting the msg for the 3040Send a drawinfo or msg packet to the client, formatting the msg for the
2729 3044
2730=cut 3045=cut
2731 3046
2732# non-persistent channels (usually the info channel) 3047# non-persistent channels (usually the info channel)
2733our %CHANNEL = ( 3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
2734 "c/identify" => { 3055 "c/identify" => {
2735 id => "infobox", 3056 id => "infobox",
2736 title => "Identify", 3057 title => "Identify",
2737 reply => undef, 3058 reply => undef,
2738 tooltip => "Items recently identified", 3059 tooltip => "Items recently identified",
2740 "c/examine" => { 3061 "c/examine" => {
2741 id => "infobox", 3062 id => "infobox",
2742 title => "Examine", 3063 title => "Examine",
2743 reply => undef, 3064 reply => undef,
2744 tooltip => "Signs and other items you examined", 3065 tooltip => "Signs and other items you examined",
3066 },
3067 "c/shopinfo" => {
3068 id => "infobox",
3069 title => "Shop Info",
3070 reply => undef,
3071 tooltip => "What your bargaining skill tells you about the shop",
2745 }, 3072 },
2746 "c/book" => { 3073 "c/book" => {
2747 id => "infobox", 3074 id => "infobox",
2748 title => "Book", 3075 title => "Book",
2749 reply => undef, 3076 reply => undef,
2765 id => "infobox", 3092 id => "infobox",
2766 title => "Body Parts", 3093 title => "Body Parts",
2767 reply => undef, 3094 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 3095 tooltip => "Shows which body parts you posess and are available",
2769 }, 3096 },
3097 "c/statistics" => {
3098 id => "infobox",
3099 title => "Statistics",
3100 reply => undef,
3101 tooltip => "Shows your primary statistics",
3102 },
3103 "c/skills" => {
3104 id => "infobox",
3105 title => "Skills",
3106 reply => undef,
3107 tooltip => "Shows your experience per skill and item power",
3108 },
3109 "c/shopitems" => {
3110 id => "infobox",
3111 title => "Shop Items",
3112 reply => undef,
3113 tooltip => "Shows the items currently for sale in this shop",
3114 },
3115 "c/resistances" => {
3116 id => "infobox",
3117 title => "Resistances",
3118 reply => undef,
3119 tooltip => "Shows your resistances",
3120 },
3121 "c/pets" => {
3122 id => "infobox",
3123 title => "Pets",
3124 reply => undef,
3125 tooltip => "Shows information abotu your pets/a specific pet",
3126 },
3127 "c/perceiveself" => {
3128 id => "infobox",
3129 title => "Perceive Self",
3130 reply => undef,
3131 tooltip => "You gained detailed knowledge about yourself",
3132 },
2770 "c/uptime" => { 3133 "c/uptime" => {
2771 id => "infobox", 3134 id => "infobox",
2772 title => "Uptime", 3135 title => "Uptime",
2773 reply => undef, 3136 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 3137 tooltip => "How long the server has been running since last restart",
2783 id => "party", 3146 id => "party",
2784 title => "Party", 3147 title => "Party",
2785 reply => "gsay ", 3148 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 3149 tooltip => "Messages and chat related to your party",
2787 }, 3150 },
3151 "c/death" => {
3152 id => "death",
3153 title => "Death",
3154 reply => undef,
3155 tooltip => "Reason for and more info about your most recent death",
3156 },
3157 "c/say" => $SAY_CHANNEL,
3158 "c/chat" => $CHAT_CHANNEL,
2788); 3159);
2789 3160
2790sub cf::client::send_msg { 3161sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 3162 my ($self, $channel, $msg, $color, @extra) = @_;
2792 3163
2793 $msg = $self->pl->expand_cfpod ($msg); 3164 $msg = $self->pl->expand_cfpod ($msg)
3165 unless $color & cf::NDI_VERBATIM;
2794 3166
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 3167 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 3168
2797 # check predefined channels, for the benefit of C 3169 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 3170 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 3171 $channel = $CHANNEL{$channel};
2800 3172
2801 $self->ext_msg (channel_info => $channel) 3173 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 3174 $channel = $channel->{id};
2805 3175
2806 } elsif (ref $channel) { 3176 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 3177 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 3178 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 3179 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 3180 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 3181 }
2813 3182
2814 $channel = $channel->{id}; 3183 $channel = $channel->{id};
2815 } 3184 }
2816 3185
2817 return unless @extra || length $msg; 3186 return unless @extra || length $msg;
2818 3187
2819 if ($self->can_msg) {
2820 # default colour, mask it out 3188 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 3190 if $color & cf::NDI_DEF;
2823 3191
2824 my $pkt = "msg " 3192 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 3193 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 3195 );
2828 3196
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt); 3197 $self->send_big_packet ($pkt);
2840 } else {
2841 if ($color >= 0) {
2842 # replace some tags by gcfclient-compatible ones
2843 for ($msg) {
2844 1 while
2845 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2846 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2847 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2848 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2849 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2850 }
2851
2852 $color &= cf::NDI_COLOR_MASK;
2853
2854 utf8::encode $msg;
2855
2856 if (0 && $msg =~ /\[/) {
2857 # COMMAND/INFO
2858 $self->send_packet ("drawextinfo $color 10 8 $msg")
2859 } else {
2860 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2861 $self->send_packet ("drawinfo $color $msg")
2862 }
2863 }
2864 }
2865} 3198}
2866 3199
2867=item $client->ext_msg ($type, @msg) 3200=item $client->ext_msg ($type, @msg)
2868 3201
2869Sends an ext event to the client. 3202Sends an ext event to the client.
2872 3205
2873sub cf::client::ext_msg($$@) { 3206sub cf::client::ext_msg($$@) {
2874 my ($self, $type, @msg) = @_; 3207 my ($self, $type, @msg) = @_;
2875 3208
2876 if ($self->extcmd == 2) { 3209 if ($self->extcmd == 2) {
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2878 } elsif ($self->extcmd == 1) { # TODO: remove 3211 } elsif ($self->extcmd == 1) { # TODO: remove
2879 push @msg, msgtype => "event_$type"; 3212 push @msg, msgtype => "event_$type";
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2881 } 3214 }
2882} 3215}
2883 3216
2884=item $client->ext_reply ($msgid, @msg) 3217=item $client->ext_reply ($msgid, @msg)
2885 3218
2889 3222
2890sub cf::client::ext_reply($$@) { 3223sub cf::client::ext_reply($$@) {
2891 my ($self, $id, @msg) = @_; 3224 my ($self, $id, @msg) = @_;
2892 3225
2893 if ($self->extcmd == 2) { 3226 if ($self->extcmd == 2) {
2894 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2895 } elsif ($self->extcmd == 1) { 3228 } elsif ($self->extcmd == 1) {
2896 #TODO: version 1, remove 3229 #TODO: version 1, remove
2897 unshift @msg, msgtype => "reply", msgid => $id; 3230 unshift @msg, msgtype => "reply", msgid => $id;
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3232 }
2900} 3233}
2901 3234
2902=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2903 3236
2974 3307
2975 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
2976 if $reply; 3309 if $reply;
2977 3310
2978 } else { 3311 } else {
2979 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2980 } 3313 }
2981 3314
2982 cf::override; 3315 cf::override;
2983 }, 3316 },
2984); 3317);
3004 3337
3005 $coro 3338 $coro
3006} 3339}
3007 3340
3008cf::client->attach ( 3341cf::client->attach (
3009 on_destroy => sub { 3342 on_client_destroy => sub {
3010 my ($ns) = @_; 3343 my ($ns) = @_;
3011 3344
3012 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3013 }, 3346 },
3014); 3347);
3030our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
3031 3364
3032$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
3033 3366
3034$safe->permit_only (Opcode::opset qw( 3367$safe->permit_only (Opcode::opset qw(
3035 :base_core :base_mem :base_orig :base_math 3368 :base_core :base_mem :base_orig :base_math :base_loop
3036 grepstart grepwhile mapstart mapwhile 3369 grepstart grepwhile mapstart mapwhile
3037 sort time 3370 sort time
3038)); 3371));
3039 3372
3040# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
3044The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
3045 3378
3046 cf::object 3379 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3380 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3381 insert remove name archname title slaying race decrease split
3382 value
3049 3383
3050 cf::object::player 3384 cf::object::player
3051 player 3385 player
3052 3386
3053 cf::player 3387 cf::player
3059=cut 3393=cut
3060 3394
3061for ( 3395for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3396 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3063 insert remove inv nrof name archname title slaying race 3397 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3068) { 3402) {
3069 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3072 for @funs; 3405 for @funs;
3073} 3406}
3074 3407
3089 3422
3090 my $qcode = $code; 3423 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
3093 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
3094 local $_; 3430 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars;
3096 3431
3097 my $eval = 3432 my $eval =
3098 "do {\n" 3433 "do {\n"
3099 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3100 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
3101 . $code 3436 . $code
3102 . "\n}" 3437 . "\n}"
3103 ; 3438 ;
3104 3439
3440 if ($CFG{safe_eval}) {
3105 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
3106 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3107 sub_generation_inc; 3444 sub_generation_inc;
3445 } else {
3446 local @cf::_safe_eval_args = values %vars;
3447 @res = wantarray ? eval eval : scalar eval $eval;
3448 }
3108 3449
3109 if ($@) { 3450 if ($@) {
3110 warn "$@"; 3451 warn "$@",
3111 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3112 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3113 } 3454 }
3114 3455
3115 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3116} 3457}
3117 3458
3131=cut 3472=cut
3132 3473
3133sub register_script_function { 3474sub register_script_function {
3134 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
3135 3476
3136 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
3137 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
3138} 3479}
3139 3480
3140=back 3481=back
3141 3482
3142=cut 3483=cut
3151 # for this (global event?) 3492 # for this (global event?)
3152 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3153 3494
3154 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3155 3496
3156 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3157 3498
3158 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3159 0 < aio_load $path, $facedata
3160 or die "$path: $!";
3161
3162 $facedata = Coro::Storable::thaw $facedata;
3163 3500
3164 $facedata->{version} == 2 3501 $facedata->{version} == 2
3165 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3166 3503
3167 # patch in the exptable 3504 # patch in the exptable
3505 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3168 $facedata->{resource}{"res/exp_table"} = { 3506 $facedata->{resource}{"res/exp_table"} = {
3169 type => FT_RSRC, 3507 type => FT_RSRC,
3170 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3508 data => $exp_table,
3509 hash => (Digest::MD5::md5 $exp_table),
3171 }; 3510 };
3172 cf::cede_to_tick; 3511 cf::cede_to_tick;
3173 3512
3174 { 3513 {
3175 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
3177 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
3178 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179 3518
3180 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3181 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3184 3524
3185 cf::cede_to_tick; 3525 cf::cede_to_tick;
3186 } 3526 }
3187 3527
3188 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
3193 3533
3194 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3195 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3196 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3197 } else { 3537 } else {
3198 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3199 } 3539 }
3200 3540
3201 cf::cede_to_tick; 3541 cf::cede_to_tick;
3202 } 3542 }
3203 } 3543 }
3212 3552
3213 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
3214 } 3554 }
3215 3555
3216 { 3556 {
3217 # TODO: for gcfclient pleasure, we should give resources
3218 # that gcfclient doesn't grok a >10000 face index.
3219 my $res = $facedata->{resource}; 3557 my $res = $facedata->{resource};
3220 3558
3221 while (my ($name, $info) = each %$res) { 3559 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) { 3560 if (defined $info->{type}) {
3223 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3224 my $data;
3225 3562
3226 if ($info->{type} & 1) { 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3227 # prepend meta info
3228
3229 my $meta = $enc->encode ({
3230 name => $name,
3231 %{ $info->{meta} || {} },
3232 });
3233
3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type}; 3564 cf::face::set_type $idx, $info->{type};
3241 } else { 3565 } else {
3242 $RESOURCE{$name} = $info; 3566 $RESOURCE{$name} = $info; # unused
3243 } 3567 }
3244 3568
3245 cf::cede_to_tick; 3569 cf::cede_to_tick;
3246 } 3570 }
3247 } 3571 }
3248 3572
3249 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3250 3574
3251 1 3575 1
3252} 3576}
3253
3254cf::global->attach (on_resource_update => sub {
3255 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3256 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3257
3258 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3259 my $sound = $soundconf->{compat}[$_]
3260 or next;
3261
3262 my $face = cf::face::find "sound/$sound->[1]";
3263 cf::sound::set $sound->[0] => $face;
3264 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3265 }
3266
3267 while (my ($k, $v) = each %{$soundconf->{event}}) {
3268 my $face = cf::face::find "sound/$v";
3269 cf::sound::set $k => $face;
3270 }
3271 }
3272});
3273 3577
3274register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3275 my ($ns, $want) = @_; 3579 my ($ns, $want) = @_;
3276 3580
3277 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
3316sub reload_treasures { 3620sub reload_treasures {
3317 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3318 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3319} 3623}
3320 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3321sub reload_resources { 3645sub reload_resources {
3322 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3323 3647
3648 reload_exp_table;
3649 reload_materials;
3324 reload_facedata; 3650 reload_facedata;
3651 reload_sound;
3325 reload_archetypes; 3652 reload_archetypes;
3326 reload_regions; 3653 reload_regions;
3327 reload_treasures; 3654 reload_treasures;
3328 3655
3329 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3330}
3331
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338} 3657}
3339 3658
3340sub reload_config { 3659sub reload_config {
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3660 trace "reloading config file...\n";
3342 or return;
3343 3661
3344 local $/; 3662 my $config = load_file "$CONFDIR/config";
3345 *CFG = YAML::Load <$fh>; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3346 3665
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3348 3667
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3351 3670
3352 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
3375 3694
3376 seek $fh, 0, 0; 3695 seek $fh, 0, 0;
3377 print $fh $$; 3696 print $fh $$;
3378} 3697}
3379 3698
3699sub main_loop {
3700 trace "EV::loop starting\n";
3701 if (1) {
3702 EV::loop;
3703 }
3704 trace "EV::loop returned\n";
3705 goto &main_loop unless $REALLY_UNLOOP;
3706}
3707
3380sub main { 3708sub main {
3381 atomic; 3709 cf::init_globals; # initialise logging
3710
3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3715
3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3717
3383 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3720 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3721 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3723 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
3390 }; 3725 };
3391 3726
3392 { 3727 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3728
3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3736 cf::load_settings;
3737
3738 reload_resources;
3394 reload_config; 3739 reload_config;
3395 db_init; 3740 db_init;
3741
3742 cf::init_uuid;
3743 cf::init_signals;
3744 cf::init_skills;
3745
3746 cf::init_beforeplay;
3747
3748 atomic;
3749
3396 load_extensions; 3750 load_extensions;
3397 3751
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3752 utime time, time, $RUNTIMEFILE;
3402 3753
3403 # no (long-running) fork's whatsoever before this point(!) 3754 # no (long-running) fork's whatsoever before this point(!)
3755 use POSIX ();
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405 3757
3406 EV::loop; 3758 cf::_post_init 0;
3759 };
3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3769 goto &main_loop;
3407} 3770}
3408 3771
3409############################################################################# 3772#############################################################################
3410# initialisation and cleanup 3773# initialisation and cleanup
3411 3774
3412# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3413BEGIN { 3776BEGIN {
3414 our %SIGWATCHER = (); 3777 our %SIGWATCHER = ();
3415 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3416 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3417 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3418 }; 3781 };
3419 } 3782 }
3420} 3783}
3421 3784
3422sub write_runtime_sync { 3785sub write_runtime_sync {
3786 my $t0 = AE::time;
3787
3423 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3425 3790
3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3792
3428 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3429 3794
3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3796 or return;
3432 3797
3433 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
3448 or return; 3813 or return;
3449 3814
3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3816 and return;
3452 3817
3453 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3819
3455 1 3820 1
3456} 3821}
3457 3822
3458our $uuid_lock; 3823our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3832 my $uuid = "$LOCALDIR/uuid";
3468 3833
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3835 or return;
3471 3836
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3837 my $value = uuid_seq uuid_cur;
3838
3839 unless ($value) {
3840 info "cowardly refusing to write zero uuid value!\n";
3841 return;
3842 }
3843
3844 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3845 $uuid_skip = 0;
3474 3846
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3848 and return;
3477 3849
3483 or return; 3855 or return;
3484 3856
3485 aio_rename "$uuid~", $uuid 3857 aio_rename "$uuid~", $uuid
3486 and return; 3858 and return;
3487 3859
3488 warn "uuid file written ($value).\n"; 3860 trace "uuid file written ($value).\n";
3489 3861
3490 1 3862 1
3491 3863
3492} 3864}
3493 3865
3499} 3871}
3500 3872
3501sub emergency_save() { 3873sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3503 3875
3504 warn "enter emergency perl save\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3505 3882
3506 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
3507 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3892 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3894 $pl->save;
3516 } 3895 }
3517 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
3518 3897
3519 warn "begin emergency map save\n"; 3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3900 info "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3903 $map->valid or next;
3523 $map->save; 3904 $map->save;
3524 } 3905 }
3525 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
3526 3907
3527 warn "begin emergency database checkpoint\n"; 3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3910 info "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3530 3913
3531 warn "begin write uuid\n"; 3914 info "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3915 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3534 }; 3936 };
3535 3937
3536 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
3537} 3939}
3538 3940
3539sub post_cleanup { 3941sub post_cleanup {
3540 my ($make_core) = @_; 3942 my ($make_core) = @_;
3541 3943
3944 IO::AIO::flush;
3945
3542 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3947 if $make_core;
3544 3948
3545 my $fh = pidfile; 3949 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$; 3950 unlink $PIDFILE if <$fh> == $$;
3547} 3951}
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3972 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3973 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3975 }
3572 warn "cleared package #$pkg\n";#d#
3573} 3976}
3574
3575our $RELOAD; # how many times to reload
3576 3977
3577sub do_reload_perl() { 3978sub do_reload_perl() {
3578 # can/must only be called in main 3979 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3580 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3581 return; 3982 return;
3582 } 3983 }
3583 3984
3584 return if $RELOAD++; 3985 return if $RELOAD++;
3585 3986
3987 my $t1 = AE::time;
3988
3586 while ($RELOAD) { 3989 while ($RELOAD) {
3587 warn "reloading..."; 3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3588 3992
3589 warn "entering sync_job"; 3993 trace "perl_reload: entering sync_job";
3590 3994
3591 cf::sync_job { 3995 cf::sync_job {
3592 cf::write_runtime_sync; # external watchdog should not bark
3593 cf::emergency_save; 3996 #cf::emergency_save;
3594 cf::write_runtime_sync; # external watchdog should not bark
3595 3997
3596 warn "syncing database to disk";
3597 BDB::db_env_txn_checkpoint $DB_ENV;
3598
3599 # if anything goes wrong in here, we should simply crash as we already saved
3600
3601 warn "flushing outstanding aio requests";
3602 while (IO::AIO::nreqs || BDB::nreqs) {
3603 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3604 }
3605
3606 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3607 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3608 %EXT_CORO = (); 4000 %EXT_CORO = ();
3609 4001
3610 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3611 %COMMAND = (); 4003 %COMMAND = ();
3612 4004
3613 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3614 %EXTCMD = (); 4006 %EXTCMD = ();
3615 %EXTICMD = (); 4007 %EXTICMD = ();
3616 4008
3617 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3618 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3619 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3620 4012
3621 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3622 eval { 4014 eval {
3623 $cb->($pkg); 4015 $cb->($pkg);
3624 1 4016 1
3625 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
3626 } 4018 }
3627 4019
3628 warn "... clearing $pkg"; 4020 trace "... clearing $pkg";
3629 clear_package $pkg; 4021 clear_package $pkg;
3630 } 4022 }
3631 4023
3632 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635 4027
3636 warn "... unloading $k"; 4028 trace "... unloading $k";
3637 delete $INC{$k}; 4029 delete $INC{$k};
3638 4030
3639 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3641 4033
3644 } 4036 }
3645 4037
3646 clear_package $k; 4038 clear_package $k;
3647 } 4039 }
3648 4040
3649 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3650 clear_package "safe::$_" 4042 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 4044
3653 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 4048
3657 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3658 # and global variables created in xs 4050 # and global variables created in xs
3659 #clear_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3660 4052
3661 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3662 4054
3663 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3664 require cf; 4056 require cf;
3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
3666 4058
3667 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3668 cf::reload_config; 4060 cf::reload_config;
3669 4061
3670 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3671 cf::load_extensions; 4063 cf::load_extensions;
3672 4064
4065 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3676 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
3679 4073
3680 warn "leaving sync_job"; 4074 cf::_post_init 1;
4075
4076 trace "perl_reload: leaving sync_job";
3681 4077
3682 1 4078 1
3683 } or do { 4079 } or do {
3684 warn $@; 4080 error $@;
3685 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3686 }; 4082 };
3687 4083
3688 warn "reloaded";
3689 --$RELOAD; 4084 --$RELOAD;
3690 } 4085 }
4086
4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
3691}; 4089};
3692 4090
3693our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3694 4092
3695sub reload_perl() { 4093sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3698 4096
4097 $RELOAD_WATCHER ||= cf::async {
4098 Coro::AIO::aio_wait cache_extensions;
4099
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 4101 do_reload_perl;
3701 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
4103 };
3702 }; 4104 };
3703} 4105}
3704 4106
3705register_command "reload" => sub { 4107register_command "reload" => sub {
3706 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
3712 reload_perl; 4114 reload_perl;
3713 }; 4115 };
3714 } 4116 }
3715}; 4117};
3716 4118
3717unshift @INC, $LIBDIR; 4119#############################################################################
3718 4120
3719my $bug_warning = 0; 4121my $bug_warning = 0;
3720 4122
3721our @WAIT_FOR_TICK;
3722our @WAIT_FOR_TICK_BEGIN;
3723
3724sub wait_for_tick { 4123sub wait_for_tick() {
3725 return if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3726 4125
3727 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3728 push @WAIT_FOR_TICK, $signal;
3729 $signal->wait;
3730} 4127}
3731 4128
3732sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3734 4131
3735 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3737 $signal->wait; 4134 $signal->wait;
3738} 4135}
3742 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3743 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3744 return; 4141 return;
3745 } 4142 }
3746 4143
3747 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4145
4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3748 4147
3749 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3751 Coro::async_pool { 4150 Coro::async_pool {
3752 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3753 write_runtime_sync 4152 write_runtime_sync
3754 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3755 }; 4154 };
3756 } 4155 }
3757 4156
3758 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3759 $sig->send; 4158 $sig->send;
3760 } 4159 }
3761 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3762 $sig->send;
3763 }
3764 4161
3765 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3766 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3767 4164
3768 if (0) { 4165 if (0) {
3769 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
3770 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
3771 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3772 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
3773 } 4170 }
3774 } 4171 }
3775} 4172}
3776 4173
3777{ 4174{
3778 # configure BDB 4175 # configure BDB
3779 4176
3780 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3781 BDB::max_poll_reqs $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3782 $AnyEvent::BDB::WATCHER->priority (1); 4179 $AnyEvent::BDB::WATCHER->priority (1);
3783 4180
3784 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3785 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
3822 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3823 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3824 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
3825} 4222}
3826 4223
3827my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3828 4226
3829sub _log_backtrace { 4227sub _log_backtrace {
3830 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3831 4229
3832 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3833 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3834 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3836 ++$_log_backtrace; 4238 ++$_log_backtrace;
4239 my $perl_bt = Carp::longmess $msg;
3837 async { 4240 async {
3838 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
3839 4242
3840 my @bt = fork_call { 4243 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 4244 @addr = map { sprintf "%x", $_ } @addr;
3852 } 4255 }
3853 4256
3854 @funcs 4257 @funcs
3855 }; 4258 };
3856 4259
3857 LOG llevInfo, "[ABT] $msg\n"; 4260 LOG llevInfo, "[ABT] $perl_bt\n";
4261 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 4263 --$_log_backtrace;
3860 }; 4264 };
3861 } else { 4265 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3864 } 4268 }
3865} 4269}
3866 4270
3867# load additional modules 4271# load additional modules
3868use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3869 4274
3870END { cf::emergency_save } 4275END { cf::emergency_save }
3871 4276
38721 42771
3873 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines