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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 75
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
63our $DATADIR = datadir; 99our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
67our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
73 120
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 123our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
81 125
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 129our $DB_ENV;
87 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
88our %CFG; 133our %CFG;
89 134
90our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
138our $NOW;
92 139
93our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
96 143
97# used to convert map paths into valid unix filenames by replacing / by ∕ 144# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 146
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
102our $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;
103 159
104binmode STDOUT; 160binmode STDOUT;
105binmode STDERR; 161binmode STDERR;
106 162
107# read virtual server time, if available 163# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
112} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
113 171
114mkdir $_ 172mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 174
117our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
118 176
119sub cf::map::normalise; 177sub cf::map::normalise;
120 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
121############################################################################# 183#############################################################################
122 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
123=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
124 197
125=over 4 198=over 4
126 199
127=item $cf::UPTIME 200=item $cf::UPTIME
128 201
129The 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.
130 218
131=item $cf::RUNTIME 219=item $cf::RUNTIME
132 220
133The 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
134every server tick. 222every server tick.
140Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
141directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
142unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
143database environment. 231database environment.
144 232
145=item $cf::NOW
146
147The time of the last (current) server tick.
148
149=item $cf::TICK
150
151The interval between server ticks, in seconds.
152
153=item $cf::LOADAVG 233=item $cf::LOADAVG
154 234
155The 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
156(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
157objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
166from wherever your confdir points to. 246from wherever your confdir points to.
167 247
168=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
169 249
170These 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
171returns 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
172per 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.
173 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
174=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
175 272
176This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
177C<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
178that call. 275that call.
179 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
180=back 283=back
181 284
182=cut 285=cut
183 286
184BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
185 *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 {
186 my $msg = join "", @_; 294 my $msg = join "", @_;
187 295
188 $msg .= "\n" 296 $msg .= "\n"
189 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
190 298
191 $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;
192 300
193 LOG llevError, $msg; 301 LOG llevWarn, $msg;
194 }; 302};
195} 303
304$Coro::State::DIEHOOK = sub {
305 return unless $^S eq 0; # "eq", not "=="
306
307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
310 error "DIEHOOK called in main context, Coro bug?\n";#d#
311 return;#d#
312 }#d#
313
314 # kill coroutine otherwise
315 Coro::terminate
316};
196 317
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 328for my $pkg (qw(
208 cf::global cf::attachable 329 cf::global cf::attachable
209 cf::object cf::object::player 330 cf::object cf::object::player
210 cf::client cf::player 331 cf::client cf::player
211 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
212 cf::map cf::party cf::region 334 cf::party cf::region
213)) { 335)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 337}
217 338
218$EV::DIED = sub { 339$EV::DIED = sub {
219 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
220}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
221 347
222############################################################################# 348#############################################################################
223 349
224=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
225 351
246 $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;
247 $d 373 $d
248 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
249} 375}
250 376
377=item $scalar = cf::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
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
251=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
252 430
253Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
254 432
255=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 440
263sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
265 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
452=item $ref = cf::decode_yaml $scalar
453
454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
455
456=cut
457
458sub decode_yaml($) {
459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
473}
474
475=item cf::post_init { BLOCK }
476
477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
478but I<before> the server starts ticking again.
479
480The codeblock will have a single boolean argument to indicate whether this
481is a reload or not.
482
483=cut
484
485sub post_init(&) {
486 push @POST_INIT, shift;
487}
488
489sub _post_init {
490 trace "running post_init jobs";
491
492 # run them in parallel...
493
494 my @join;
495
496 while () {
497 push @join, map &Coro::async ($_, 0), @POST_INIT;
498 @POST_INIT = ();
499
500 @join or last;
501
502 (pop @join)->join;
503 }
504}
505
266=item cf::lock_wait $string 506=item cf::lock_wait $string
267 507
268Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
269 509
270=item my $lock = cf::lock_acquire $string 510=item my $lock = cf::lock_acquire $string
271 511
272Wait until the given lock is available and then acquires it and returns 512Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 513a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 514for example when the coroutine gets canceled), the lock is automatically
275returned. 515returned.
276 516
277Locks are *not* recursive, locking from the same coro twice results in a 517Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 518deadlocked coro.
284 524
285Return true if the lock is currently active, i.e. somebody has locked it. 525Return true if the lock is currently active, i.e. somebody has locked it.
286 526
287=cut 527=cut
288 528
289our %LOCK; 529our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 530
292sub lock_wait($) { 531sub lock_wait($) {
293 my ($key) = @_; 532 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 533}
306 534
307sub lock_acquire($) { 535sub lock_acquire($) {
308 my ($key) = @_; 536 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 537}
322 538
323sub lock_active($) { 539sub lock_active($) {
324 my ($key) = @_; 540 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 541}
328 542
329sub freeze_mainloop { 543sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 544 tick_inhibit_inc;
331 545
332 my $guard = Coro::guard { 546 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 547}
338 548
339=item cf::periodic $interval, $cb 549=item cf::periodic $interval, $cb
340 550
341Like EV::periodic, but randomly selects a starting point so that the actions 551Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer. 552get spread over time.
343 553
344=cut 554=cut
345 555
346sub periodic($$) { 556sub periodic($$) {
347 my ($interval, $cb) = @_; 557 my ($interval, $cb) = @_;
351 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
352} 562}
353 563
354=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
355 565
356Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
357This call blocks and returns only when you have at least C<$time> seconds 567(default: 0): This call blocks and returns only when you have at least
358of cpu time till the next tick. The slot is only valid till the next cede. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
359 573
360The optional C<$name> can be used to identify the job to run. It might be 574The optional C<$name> can be used to identify the job to run. It might be
361used for statistical purposes and should identify the same time-class. 575used for statistical purposes and should identify the same time-class.
362 576
363Useful for short background jobs. 577Useful for short background jobs.
364 578
365=cut 579=cut
366 580
367our @SLOT_QUEUE; 581our @SLOT_QUEUE;
368our $SLOT_QUEUE; 582our $SLOT_QUEUE;
583our $SLOT_DECAY = 0.9;
369 584
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 585$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 586$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 587 $Coro::current->desc ("timeslot manager");
373 588
374 my $signal = new Coro::Signal; 589 my $signal = new Coro::Signal;
590 my $busy;
375 591
376 while () { 592 while () {
377 next_job: 593 next_job:
594
378 my $avail = cf::till_tick; 595 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 596
380 for (0 .. $#SLOT_QUEUE) { 597 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 598 if ($SLOT_QUEUE[$_][0] <= $avail) {
599 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 600 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 601 $job->[2]->send;
384 Coro::cede; 602 Coro::cede;
385 goto next_job; 603 goto next_job;
386 } 604 } else {
605 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 606 }
388 } 607 }
389 608
390 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
393 $signal->wait;
394 } else { 612 } else {
613 $busy = 0;
395 Coro::schedule; 614 Coro::schedule;
396 } 615 }
397 } 616 }
398}; 617};
399 618
400sub get_slot($;$$) { 619sub get_slot($;$$) {
620 return if tick_inhibit || $Coro::current == $Coro::main;
621
401 my ($time, $pri, $name) = @_; 622 my ($time, $pri, $name) = @_;
402 623
403 $time = $TICK * .6 if $time > $TICK * .6; 624 $time = clamp $time, 0.01, $TICK * .6;
625
404 my $sig = new Coro::Signal; 626 my $sig = new Coro::Signal;
405 627
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 628 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 629 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 630 $SLOT_QUEUE->ready;
434=cut 656=cut
435 657
436sub sync_job(&) { 658sub sync_job(&) {
437 my ($job) = @_; 659 my ($job) = @_;
438 660
439 if ($Coro::current == $Coro::main) { 661 if (in_main) {
440 my $time = EV::time; 662 my $time = AE::time;
441 663
442 # this is the main coro, too bad, we have to block 664 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 665 # till the operation succeeds, freezing the server :/
444 666
445 LOG llevError, Carp::longmess "sync job";#d# 667 #LOG llevError, Carp::longmess "sync job";#d#
446 668
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 669 my $freeze_guard = freeze_mainloop;
450 670
451 my $busy = 1; 671 my $busy = 1;
452 my @res; 672 my @res;
453 673
454 (async { 674 (async {
455 $Coro::current->desc ("sync job coro"); 675 $Coro::current->desc ("sync job coro");
456 @res = eval { $job->() }; 676 @res = eval { $job->() };
457 warn $@ if $@; 677 error $@ if $@;
458 undef $busy; 678 undef $busy;
459 })->prio (Coro::PRIO_MAX); 679 })->prio (Coro::PRIO_MAX);
460 680
461 while ($busy) { 681 while ($busy) {
462 if (Coro::nready) { 682 if (Coro::nready) {
464 } else { 684 } else {
465 EV::loop EV::LOOP_ONESHOT; 685 EV::loop EV::LOOP_ONESHOT;
466 } 686 }
467 } 687 }
468 688
469 $time = EV::time - $time; 689 my $time = AE::time - $time;
470 690
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 691 $TICK_START += $time; # do not account sync jobs to server load
475 692
476 wantarray ? @res : $res[0] 693 wantarray ? @res : $res[0]
477 } else { 694 } else {
478 # we are in another coroutine, how wonderful, everything just works 695 # we are in another coroutine, how wonderful, everything just works
479 696
499 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
500 717
501 $coro 718 $coro
502} 719}
503 720
504=item fork_call { }, $args 721=item fork_call { }, @args
505 722
506Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
507process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
508Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
509never block itself or use any form of event handling. 726never block itself or use any form of event handling.
510 727
511=cut 728=cut
512 729
730sub post_fork {
731 reset_signals;
732}
733
513sub fork_call(&@) { 734sub fork_call(&@) {
514 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
515 736
516 # we seemingly have to make a local copy of the whole thing, 737 # we seemingly have to make a local copy of the whole thing,
517 # otherwise perl prematurely frees the stuff :/ 738 # otherwise perl prematurely frees the stuff :/
518 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
519 740
520 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
521 reset_signals; 742 cf::post_fork;
522 &$cb 743 &$cb
523 }, @args; 744 } @args;
524 745
525 wantarray ? @res : $res[-1] 746 wantarray ? @res : $res[-1]
747}
748
749sub objinfo {
750 (
751 "counter value" => cf::object::object_count,
752 "objects created" => cf::object::create_count,
753 "objects destroyed" => cf::object::destroy_count,
754 "freelist size" => cf::object::free_count,
755 "allocated objects" => cf::object::objects_size,
756 "active objects" => cf::object::actives_size,
757 )
758}
759
760=item $coin = coin_from_name $name
761
762=cut
763
764our %coin_alias = (
765 "silver" => "silvercoin",
766 "silvercoin" => "silvercoin",
767 "silvercoins" => "silvercoin",
768 "gold" => "goldcoin",
769 "goldcoin" => "goldcoin",
770 "goldcoins" => "goldcoin",
771 "platinum" => "platinacoin",
772 "platinumcoin" => "platinacoin",
773 "platinumcoins" => "platinacoin",
774 "platina" => "platinacoin",
775 "platinacoin" => "platinacoin",
776 "platinacoins" => "platinacoin",
777 "royalty" => "royalty",
778 "royalties" => "royalty",
779);
780
781sub coin_from_name($) {
782 $coin_alias{$_[0]}
783 ? cf::arch::find $coin_alias{$_[0]}
784 : undef
526} 785}
527 786
528=item $value = cf::db_get $family => $key 787=item $value = cf::db_get $family => $key
529 788
530Returns a single value from the environment database. 789Returns a single value from the environment database.
540within each server. 799within each server.
541 800
542=cut 801=cut
543 802
544sub db_table($) { 803sub db_table($) {
804 cf::error "db_get called from main context"
805 if $Coro::current == $Coro::main;
806
545 my ($name) = @_; 807 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV; 808 my $db = BDB::db_create $DB_ENV;
547 809
548 eval { 810 eval {
549 $db->set_flags (BDB::CHKSUM); 811 $db->set_flags (BDB::CHKSUM);
559} 821}
560 822
561our $DB; 823our $DB;
562 824
563sub db_init { 825sub db_init {
564 cf::sync_job {
565 $DB ||= db_table "db"; 826 $DB ||= db_table "db";
566 };
567} 827}
568 828
569sub db_get($$) { 829sub db_get($$) {
570 my $key = "$_[0]/$_[1]"; 830 my $key = "$_[0]/$_[1]";
571 831
572 cf::sync_job { 832 cf::error "db_get called from main context"
833 if $Coro::current == $Coro::main;
834
573 BDB::db_get $DB, undef, $key, my $data; 835 BDB::db_get $DB, undef, $key, my $data;
574 836
575 $! ? () 837 $! ? ()
576 : $data 838 : $data
577 }
578} 839}
579 840
580sub db_put($$$) { 841sub db_put($$$) {
581 BDB::dbreq_pri 4; 842 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 843 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
610 871
611 my @data; 872 my @data;
612 my $md5; 873 my $md5;
613 874
614 for (0 .. $#$src) { 875 for (0 .. $#$src) {
615 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
616 or Carp::croak "$src->[$_]: $!";
617 } 877 }
618 878
619 # if processing is expensive, check 879 # if processing is expensive, check
620 # checksum first 880 # checksum first
621 if (1) { 881 if (1) {
638 898
639 my $t1 = Time::HiRes::time; 899 my $t1 = Time::HiRes::time;
640 my $data = $process->(\@data); 900 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time; 901 my $t2 = Time::HiRes::time;
642 902
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 903 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
644 904
645 db_put cache => "$id/data", $data; 905 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5; 906 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta; 907 db_put cache => "$id/meta", $meta;
648 908
658 918
659=cut 919=cut
660 920
661sub datalog($@) { 921sub datalog($@) {
662 my ($type, %kv) = @_; 922 my ($type, %kv) = @_;
663 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 923 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
664} 924}
665 925
666=back 926=back
667 927
668=cut 928=cut
669 929
670############################################################################# 930#############################################################################
671 931
672=head2 ATTACHABLE OBJECTS 932=head2 ATTACHABLE OBJECTS
673 933
674Many objects in crossfire are so-called attachable objects. That means you can 934Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 935attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 936to it. All such attachable objects support the following methods.
677 937
678In the following description, CLASS can be any of C<global>, C<object> 938In the following description, CLASS can be any of C<global>, C<object>
679C<player>, C<client> or C<map> (i.e. the attachable objects in 939C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 989=item cf::CLASS::attachment $name, ...
730 990
731Register an attachment by C<$name> through which attachable objects of the 991Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 992given CLASS can refer to this attachment.
733 993
734Some classes such as crossfire maps and objects can specify attachments 994Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 995that are attached at load/instantiate time, thus the need for a name.
736 996
737These calls expect any number of the following handler/hook descriptions: 997These calls expect any number of the following handler/hook descriptions:
738 998
739=over 4 999=over 4
863 1123
864 } elsif (exists $cb_id{$type}) { 1124 } elsif (exists $cb_id{$type}) {
865 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1125 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
866 1126
867 } elsif (ref $type) { 1127 } elsif (ref $type) {
868 warn "attaching objects not supported, ignoring.\n"; 1128 error "attaching objects not supported, ignoring.\n";
869 1129
870 } else { 1130 } else {
871 shift @arg; 1131 shift @arg;
872 warn "attach argument '$type' not supported, ignoring.\n"; 1132 error "attach argument '$type' not supported, ignoring.\n";
873 } 1133 }
874 } 1134 }
875} 1135}
876 1136
877sub _object_attach { 1137sub _object_attach {
887 _attach $registry, $klass, @attach; 1147 _attach $registry, $klass, @attach;
888 } 1148 }
889 1149
890 $obj->{$name} = \%arg; 1150 $obj->{$name} = \%arg;
891 } else { 1151 } else {
892 warn "object uses attachment '$name' which is not available, postponing.\n"; 1152 info "object uses attachment '$name' which is not available, postponing.\n";
893 } 1153 }
894 1154
895 $obj->{_attachment}{$name} = undef; 1155 $obj->{_attachment}{$name} = undef;
896} 1156}
897 1157
956 1216
957 for (@$callbacks) { 1217 for (@$callbacks) {
958 eval { &{$_->[1]} }; 1218 eval { &{$_->[1]} };
959 1219
960 if ($@) { 1220 if ($@) {
961 warn "$@";
962 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1221 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
963 override; 1222 override;
964 } 1223 }
965 1224
966 return 1 if $override; 1225 return 1 if $override;
967 } 1226 }
968 1227
969 0 1228 0
970} 1229}
971 1230
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1231=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1232
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1233=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1234
976Generate an object-specific event with the given arguments. 1235Generate an object-specific event with the given arguments.
977 1236
1030 1289
1031sub reattach { 1290sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1291 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1292 my ($obj) = @_;
1034 1293
1294 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1295 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1296
1037 my $registry = $obj->registry; 1297 my $registry = $obj->registry;
1038 1298
1039 @$registry = (); 1299 @$registry = ();
1040 1300
1045 for (@$attach) { 1305 for (@$attach) {
1046 my ($klass, @attach) = @$_; 1306 my ($klass, @attach) = @$_;
1047 _attach $registry, $klass, @attach; 1307 _attach $registry, $klass, @attach;
1048 } 1308 }
1049 } else { 1309 } else {
1050 warn "object uses attachment '$name' that is not available, postponing.\n"; 1310 info "object uses attachment '$name' that is not available, postponing.\n";
1051 } 1311 }
1052 } 1312 }
1053} 1313}
1054 1314
1055cf::attachable->attach ( 1315cf::attachable->attach (
1082 my ($filename, $rdata, $objs) = @_; 1342 my ($filename, $rdata, $objs) = @_;
1083 1343
1084 sync_job { 1344 sync_job {
1085 if (length $$rdata) { 1345 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename); 1346 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1347 trace sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1348 $decname, length $$rdata, scalar @$objs
1349 if $VERBOSE_IO;
1089 1350
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1351 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1352 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1353 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1354 if ($cf::USE_FSYNC) {
1355 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;
1356 aio_fsync $fh;
1357 }
1094 close $fh; 1358 aio_close $fh;
1095 1359
1096 if (@$objs) { 1360 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1361 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1362 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1363 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1364 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1365 if ($cf::USE_FSYNC) {
1366 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;
1367 aio_fsync $fh;
1368 }
1102 close $fh; 1369 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1370 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1371 }
1105 } else { 1372 } else {
1106 aio_unlink "$filename.pst"; 1373 aio_unlink "$filename.pst";
1107 } 1374 }
1108 1375
1109 aio_rename "$filename~", $filename; 1376 aio_rename "$filename~", $filename;
1377
1378 $filename =~ s%/[^/]+$%%;
1379 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1380 } else {
1111 warn "FATAL: $filename~: $!\n"; 1381 error "unable to save objects: $filename~: $!\n";
1112 } 1382 }
1113 } else { 1383 } else {
1114 aio_unlink $filename; 1384 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1385 aio_unlink "$filename.pst";
1116 } 1386 }
1140 my $st = eval { Coro::Storable::thaw $av }; 1410 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs}; 1411 $av = $st->{objs};
1142 } 1412 }
1143 1413
1144 utf8::decode (my $decname = $filename); 1414 utf8::decode (my $decname = $filename);
1145 warn sprintf "loading %s (%d,%d)\n", 1415 trace sprintf "loading %s (%d,%d)\n",
1146 $decname, length $data, scalar @{$av || []}; 1416 $decname, length $data, scalar @{$av || []}
1417 if $VERBOSE_IO;
1147 1418
1148 ($data, $av) 1419 ($data, $av)
1149} 1420}
1150 1421
1151=head2 COMMAND CALLBACKS 1422=head2 COMMAND CALLBACKS
1207 my ($name, $cb) = @_; 1478 my ($name, $cb) = @_;
1208 1479
1209 $EXTICMD{$name} = $cb; 1480 $EXTICMD{$name} = $cb;
1210} 1481}
1211 1482
1483use File::Glob ();
1484
1212cf::player->attach ( 1485cf::player->attach (
1213 on_command => sub { 1486 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1487 my ($pl, $name, $params) = @_;
1215 1488
1216 my $cb = $COMMAND{$name} 1489 my $cb = $COMMAND{$name}
1217 or return; 1490 or return;
1218 1491
1226 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1227 1500
1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1229 1502
1230 if (ref $msg) { 1503 if (ref $msg) {
1231 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1232 "ARRAY" eq ref $msg
1233 ? @$msg
1234 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1235 1505
1236 my @reply; 1506 my @reply;
1237 1507
1238 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1239 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
1241 1511
1242 $pl->ext_reply ($reply, @reply) 1512 $pl->ext_reply ($reply, @reply)
1243 if $reply; 1513 if $reply;
1244 1514
1245 } else { 1515 } else {
1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1516 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1247 } 1517 }
1248 1518
1249 cf::override; 1519 cf::override;
1250 }, 1520 },
1251); 1521);
1252 1522
1523# "readahead" all extensions
1524sub cache_extensions {
1525 my $grp = IO::AIO::aio_group;
1526
1527 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1528 for (grep /\.ext$/, @{$_[0]}) {
1529 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1530 }
1531 };
1532
1533 $grp
1534}
1535
1253sub load_extensions { 1536sub load_extensions {
1537 info "loading extensions...";
1538
1254 cf::sync_job { 1539 cf::sync_job {
1255 my %todo; 1540 my %todo;
1256 1541
1257 for my $path (<$LIBDIR/*.ext>) { 1542 for my $path (<$LIBDIR/*.ext>) {
1258 next unless -r $path; 1543 next unless -r $path;
1276 1561
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1564
1280 $ext{source} = 1565 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1282 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1283 . $source 1568 . $source
1284 . "\n};\n1"; 1569 . "\n};\n1";
1285 1570
1286 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
1287 } 1572 }
1288 1573
1574 my $pass = 0;
1289 my %done; 1575 my %done;
1290 while (%todo) { 1576 while (%todo) {
1291 my $progress; 1577 my $progress;
1292 1578
1579 ++$pass;
1580
1581 ext:
1293 while (my ($k, $v) = each %todo) { 1582 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1583 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1584 next ext
1296 unless exists $done{$_}; 1585 unless exists $done{$_};
1297 } 1586 }
1298 1587
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1588 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1589
1301 unless (eval $v->{source}) { 1590 my $active = eval $v->{source};
1591
1592 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1593 error "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1594
1595 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1596 if exists $v->{meta}{mandatory};
1306 warn $msg; 1597
1307 warn "mandatory extension failed to load, exiting.\n"; 1598 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1599 delete $todo{$k};
1309 } 1600 } else {
1310 1601 $done{$k} = delete $todo{$k};
1311 warn $msg; 1602 push @EXTS, $v->{pkg};
1603 $progress = 1;
1604
1605 info "$v->{base}: extension inactive.\n"
1606 unless $active;
1312 } 1607 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1608 }
1318 1609
1319 skip: 1610 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1611 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1612
1613 while (my ($k, $v) = each %todo) {
1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1615 if exists $v->{meta}{mandatory};
1616 }
1617
1618 last;
1619 }
1322 } 1620 }
1323 }; 1621 };
1324} 1622}
1325 1623
1326############################################################################# 1624#############################################################################
1327 1625
1328=back 1626=back
1329 1627
1330=head2 CORE EXTENSIONS 1628=head2 CORE EXTENSIONS
1331 1629
1332Functions and methods that extend core crossfire objects. 1630Functions and methods that extend core deliantra objects.
1333 1631
1334=cut 1632=cut
1335 1633
1336package cf::player; 1634package cf::player;
1337 1635
1380 1678
1381sub exists($) { 1679sub exists($) {
1382 my ($login) = @_; 1680 my ($login) = @_;
1383 1681
1384 $cf::PLAYER{$login} 1682 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1683 or !aio_stat path $login
1386} 1684}
1387 1685
1388sub find($) { 1686sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1687 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1688 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1700 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1701 or return;
1404 1702
1405 my $pl = cf::player::load_pl $f 1703 my $pl = cf::player::load_pl $f
1406 or return; 1704 or return;
1705
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1706 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1707 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1708 $cf::PLAYER{$login} = $pl
1410 } 1709 }
1411 } 1710 }
1412} 1711}
1413 1712
1713cf::player->attach (
1714 on_load => sub {
1715 my ($pl, $path) = @_;
1716
1717 # restore slots saved in save, below
1718 my $slots = delete $pl->{_slots};
1719
1720 $pl->ob->current_weapon ($slots->[0]);
1721 $pl->combat_ob ($slots->[1]);
1722 $pl->ranged_ob ($slots->[2]);
1723 },
1724);
1725
1414sub save($) { 1726sub save($) {
1415 my ($pl) = @_; 1727 my ($pl) = @_;
1416 1728
1417 return if $pl->{deny_save}; 1729 return if $pl->{deny_save};
1418 1730
1421 1733
1422 return if $pl->{deny_save}; 1734 return if $pl->{deny_save};
1423 1735
1424 aio_mkdir playerdir $pl, 0770; 1736 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1737 $pl->{last_save} = $cf::RUNTIME;
1738
1739 cf::get_slot 0.01;
1740
1741 # save slots, to be restored later
1742 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1743
1427 $pl->save_pl ($path); 1744 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1745 cf::cede_to_tick;
1429} 1746}
1430 1747
1462 my ($pl) = @_; 1779 my ($pl) = @_;
1463 1780
1464 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1465 1782
1466 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1784 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1785
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1470 $pl->deactivate; 1787 $pl->deactivate;
1788
1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1472 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1473 1794
1474 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1476 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
1514 1835
1515 for my $login (@$dirs) { 1836 for my $login (@$dirs) {
1516 my $path = path $login; 1837 my $path = path $login;
1517 1838
1518 # a .pst is a dead give-away for a valid player 1839 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1840 # if no pst file found, open and chekc for blocked users
1841 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1842 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1843 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1844 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1845 }
1524 1846
1528 1850
1529 \@logins 1851 \@logins
1530} 1852}
1531 1853
1532=item $player->maps 1854=item $player->maps
1855
1856=item cf::player::maps $login
1533 1857
1534Returns an arrayref of map paths that are private for this 1858Returns an arrayref of map paths that are private for this
1535player. May block. 1859player. May block.
1536 1860
1537=cut 1861=cut
1555 } 1879 }
1556 1880
1557 \@paths 1881 \@paths
1558} 1882}
1559 1883
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1884=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1885
1562Expand crossfire pod fragments into protocol xml. 1886Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1887
1653=item $player->ext_reply ($msgid, @msg) 1888=item $player->ext_reply ($msgid, @msg)
1654 1889
1655Sends an ext reply to the player. 1890Sends an ext reply to the player.
1656 1891
1688 1923
1689=cut 1924=cut
1690 1925
1691sub find_by_path($) { 1926sub find_by_path($) {
1692 my ($path) = @_; 1927 my ($path) = @_;
1928
1929 $path =~ s/^~[^\/]*//; # skip ~login
1693 1930
1694 my ($match, $specificity); 1931 my ($match, $specificity);
1695 1932
1696 for my $region (list) { 1933 for my $region (list) {
1697 if ($region->{match} && $path =~ $region->{match}) { 1934 if ($region->{match} && $path =~ $region->{match}) {
1723our $MAX_RESET = 3600; 1960our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1961our $DEFAULT_RESET = 3000;
1725 1962
1726sub generate_random_map { 1963sub generate_random_map {
1727 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1728 # mit "rum" bekleckern, nicht 1965
1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1967
1729 $self->_create_random_map ( 1968 $self->_create_random_map ($rmp);
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom}
1741 )
1742} 1969}
1743 1970
1744=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1745 1972
1746Register a handler for the map path matching the given regex at the 1973Register a handler for the map path matching the given regex at the
1751 1978
1752sub register { 1979sub register {
1753 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1981 my $pkg = caller;
1755 1982
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1984
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1986}
1761 1987
1762# also paths starting with '/' 1988# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1989$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1990
1765sub thawer_merge { 1991sub thawer_merge {
1766 my ($self, $merge) = @_; 1992 my ($self, $merge) = @_;
1767 1993
1768 # we have to keep some variables in memory intact 1994 # we have to keep some variables in memory intact
1773} 1999}
1774 2000
1775sub normalise { 2001sub normalise {
1776 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1777 2003
1778 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1779 2005
1780 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1781 2007
1782 # map plan: 2008 # map plan:
1783 # 2009 #
1798 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 2025 $path = "$base/$path";
1800 } 2026 }
1801 2027
1802 for ($path) { 2028 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1806 } 2031 }
1807 2032
1808 $path 2033 $path
1822 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1823 return $self; 2048 return $self;
1824 } 2049 }
1825 } 2050 }
1826 2051
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 2053 ()
1829} 2054}
1830 2055
2056# may re-bless or do other evil things
1831sub init { 2057sub init {
1832 my ($self) = @_; 2058 my ($self) = @_;
1833 2059
1834 $self 2060 $self
1835} 2061}
1854 2080
1855# the temporary/swap location 2081# the temporary/swap location
1856sub save_path { 2082sub save_path {
1857 my ($self) = @_; 2083 my ($self) = @_;
1858 2084
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2085 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 2086 "$TMPDIR/$path.map"
1861} 2087}
1862 2088
1863# the unique path, undef == no special unique path 2089# the unique path, undef == no special unique path
1864sub uniq_path { 2090sub uniq_path {
1865 my ($self) = @_; 2091 my ($self) = @_;
1866 2092
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2093 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 2094 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 2095}
1879 2096
1880sub decay_objects { 2097sub decay_objects {
1881 my ($self) = @_; 2098 my ($self) = @_;
1882 2099
1909 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1910 2127
1911 1 2128 1
1912} 2129}
1913 2130
2131# used to laod the header of an original map
1914sub load_header_orig { 2132sub load_header_orig {
1915 my ($self) = @_; 2133 my ($self) = @_;
1916 2134
1917 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
1918} 2136}
1919 2137
2138# used to laod the header of an instantiated map
1920sub load_header_temp { 2139sub load_header_temp {
1921 my ($self) = @_; 2140 my ($self) = @_;
1922 2141
1923 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
1924} 2143}
1925 2144
2145# called after loading the header from an instantiated map
1926sub prepare_temp { 2146sub prepare_temp {
1927 my ($self) = @_; 2147 my ($self) = @_;
1928 2148
1929 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
1930 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
1931 # safety 2151 # safety
1932 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
1933 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
1934} 2154}
1935 2155
2156# called after loading the header from an original map
1936sub prepare_orig { 2157sub prepare_orig {
1937 my ($self) = @_; 2158 my ($self) = @_;
1938 2159
1939 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
1940 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
1964 2185
1965sub find; 2186sub find;
1966sub find { 2187sub find {
1967 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
1968 2189
2190 cf::cede_to_tick;
2191
1969 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
1970 2193
1971 cf::lock_wait "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2196
1974 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2198 my $map = new_from_path cf::map $path
1979 or return; 2199 or return;
1980 2200
1981 $map->{last_save} = $cf::RUNTIME; 2201 $map->{last_save} = $cf::RUNTIME;
1982 2202
1984 or return; 2204 or return;
1985 2205
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2206 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2207 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2208 #$cf::WAIT_FOR_TICK->wait;
2209 undef $guard2;
1989 undef $guard1; 2210 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2211 $map->reset;
1992 return find $path; 2212 return find $path;
1993 } 2213 }
1994 2214
1995 $cf::MAP{$path} = $map 2215 $cf::MAP{$path} = $map
1996 } 2216 }
1997} 2217}
1998 2218
1999sub pre_load { } 2219sub pre_load { }
2000sub post_load { } 2220#sub post_load { } # XS
2001 2221
2002sub load { 2222sub load {
2003 my ($self) = @_; 2223 my ($self) = @_;
2004 2224
2005 local $self->{deny_reset} = 1; # loading can take a long time 2225 local $self->{deny_reset} = 1; # loading can take a long time
2008 2228
2009 { 2229 {
2010 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2011 2231
2012 return unless $self->valid; 2232 return unless $self->valid;
2013 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2014
2015 $self->in_memory (cf::MAP_LOADING);
2016 2234
2017 $self->alloc; 2235 $self->alloc;
2018 2236
2019 $self->pre_load; 2237 $self->pre_load;
2020 cf::cede_to_tick; 2238 cf::cede_to_tick;
2021 2239
2240 if (exists $self->{load_path}) {
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2242 $f->skip_block;
2024 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2025 or return; 2244 or return;
2026 2245
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2246 $self->post_load_original
2028 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2029 2248
2030 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2250 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2034 $self->clear_unique_items; 2253 $self->clear_unique_items;
2035 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2037 } 2257 }
2038 } 2258 }
2039 }
2040 2259
2041 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2042 2267
2043 cf::cede_to_tick; 2268 cf::cede_to_tick;
2044 # now do the right thing for maps 2269 # now do the right thing for maps
2045 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2046 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
2050 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2276 $self->decay_objects;
2052 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2053 $self->update_buttons; 2278 $self->update_buttons;
2054 cf::cede_to_tick; 2279 cf::cede_to_tick;
2055 $self->set_darkness_map; 2280 #$self->activate; # no longer activate maps automatically
2056 cf::cede_to_tick;
2057 $self->activate;
2058 } 2281 }
2059 2282
2060 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2062
2063 $self->in_memory (cf::MAP_IN_MEMORY);
2064 } 2285 }
2065 2286
2066 $self->post_load; 2287 $self->post_load;
2067}
2068 2288
2289 1
2290}
2291
2292# customize the map for a given player, i.e.
2293# return the _real_ map. used by e.g. per-player
2294# maps to change the path to ~playername/mappath
2069sub customise_for { 2295sub customise_for {
2070 my ($self, $ob) = @_; 2296 my ($self, $ob) = @_;
2071 2297
2072 return find "~" . $ob->name . "/" . $self->{path} 2298 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2299 if $self->per_player;
2076# if $self->per_party; 2302# if $self->per_party;
2077 2303
2078 $self 2304 $self
2079} 2305}
2080 2306
2081# find and load all maps in the 3x3 area around a map
2082sub load_neighbours {
2083 my ($map) = @_;
2084
2085 my @neigh; # diagonal neighbours
2086
2087 for (0 .. 3) {
2088 my $neigh = $map->tile_path ($_)
2089 or next;
2090 $neigh = find $neigh, $map
2091 or next;
2092 $neigh->load;
2093
2094 push @neigh,
2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2097 }
2098
2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
2101 my $neigh = find $path, $origin
2102 or next;
2103 $neigh->load;
2104 }
2105}
2106
2107sub find_sync { 2307sub find_sync {
2108 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2109 2309
2110 cf::sync_job { find $path, $origin } 2310 # it's a bug to call this from the main context
2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2312 if $Coro::current == $Coro::main;
2313
2314 find $path, $origin
2111} 2315}
2112 2316
2113sub do_load_sync { 2317sub do_load_sync {
2114 my ($map) = @_; 2318 my ($map) = @_;
2115 2319
2320 # it's a bug to call this from the main context
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2118 2323
2119 cf::sync_job { $map->load }; 2324 $map->load;
2120} 2325}
2121 2326
2122our %MAP_PREFETCH; 2327our %MAP_PREFETCH;
2123our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2124 2329
2125sub find_async { 2330sub find_async {
2126 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2127 2332
2128 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2129 2334
2130 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2336 return $map if !$load || $map->linkable;
2132 } 2337 }
2133 2338
2134 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2135 2340
2136 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
2150 $MAP_PREFETCHER->prio (6); 2355 $MAP_PREFETCHER->prio (6);
2151 2356
2152 () 2357 ()
2153} 2358}
2154 2359
2360# common code, used by both ->save and ->swapout
2155sub save { 2361sub _save {
2156 my ($self) = @_; 2362 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2363
2160 $self->{last_save} = $cf::RUNTIME; 2364 $self->{last_save} = $cf::RUNTIME;
2161 2365
2162 return unless $self->dirty; 2366 return unless $self->dirty;
2163 2367
2172 2376
2173 cf::async { 2377 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2378 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2379 $_->contr->save for $self->players;
2176 }; 2380 };
2381
2382 cf::get_slot 0.02;
2177 2383
2178 if ($uniq) { 2384 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2385 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2386 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2387 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2388 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2183 } 2389 }
2184} 2390}
2185 2391
2392sub save {
2393 my ($self) = @_;
2394
2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2396
2397 $self->_save;
2398}
2399
2186sub swap_out { 2400sub swap_out {
2187 my ($self) = @_; 2401 my ($self) = @_;
2188 2402
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2404
2405 return if !$self->linkable;
2406 return if $self->{deny_save};
2194 return if $self->players; 2407 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2408
2409 # first deactivate the map and "unlink" it from the core
2410 $self->deactivate;
2411 $_->clear_links_to ($self) for values %cf::MAP;
2412 $self->state (cf::MAP_SWAPPED);
2413
2414 # then atomically save
2415 $self->_save;
2416
2417 # then free the map
2418 $self->clear;
2419}
2420
2421sub reset_at {
2422 my ($self) = @_;
2423
2424 # TODO: safety, remove and allow resettable per-player maps
2196 return if $self->{deny_save}; 2425 return 1e99 if $self->{deny_reset};
2197 2426
2427 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2428 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2429
2430 $time + $to
2431}
2432
2433sub should_reset {
2434 my ($self) = @_;
2435
2436 $self->reset_at <= $cf::RUNTIME
2437}
2438
2439sub reset {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 return if $self->players;
2445
2446 cf::trace "resetting map ", $self->path, "\n";
2447
2198 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2449
2450 # need to save uniques path
2451 unless ($self->{deny_save}) {
2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2453
2454 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2455 if $uniq;
2456 }
2457
2458 delete $cf::MAP{$self->path};
2199 2459
2200 $self->deactivate; 2460 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2461 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->clear; 2462 $self->clear;
2203}
2204
2205sub reset_at {
2206 my ($self) = @_;
2207
2208 # TODO: safety, remove and allow resettable per-player maps
2209 return 1e99 if $self->{deny_reset};
2210
2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2213
2214 $time + $to
2215}
2216
2217sub should_reset {
2218 my ($self) = @_;
2219
2220 $self->reset_at <= $cf::RUNTIME
2221}
2222
2223sub reset {
2224 my ($self) = @_;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227
2228 return if $self->players;
2229
2230 warn "resetting map ", $self->path;
2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 # need to save uniques path
2235 unless ($self->{deny_save}) {
2236 my $uniq = $self->uniq_path; utf8::encode $uniq;
2237
2238 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2239 if $uniq;
2240 }
2241
2242 delete $cf::MAP{$self->path};
2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2246 $self->clear;
2247 2463
2248 $self->unlink_save; 2464 $self->unlink_save;
2249 $self->destroy; 2465 $self->destroy;
2250} 2466}
2251 2467
2259 2475
2260 delete $cf::MAP{$self->path}; 2476 delete $cf::MAP{$self->path};
2261 2477
2262 $self->unlink_save; 2478 $self->unlink_save;
2263 2479
2264 bless $self, "cf::map"; 2480 bless $self, "cf::map::wrap";
2265 delete $self->{deny_reset}; 2481 delete $self->{deny_reset};
2266 $self->{deny_save} = 1; 2482 $self->{deny_save} = 1;
2267 $self->reset_timeout (1); 2483 $self->reset_timeout (1);
2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2484 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2269 2485
2318 2534
2319sub unique_maps() { 2535sub unique_maps() {
2320 [ 2536 [
2321 map { 2537 map {
2322 utf8::decode $_; 2538 utf8::decode $_;
2323 /\.map$/ 2539 s/\.map$//; # TODO future compatibility hack
2540 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2541 ? ()
2324 ? normalise $_ 2542 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2543 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2544 ]
2328} 2545}
2329 2546
2330package cf; 2547=item cf::map::static_maps
2548
2549Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2550file in the shared directory excluding F</styles> and F</editor>). May
2551block.
2552
2553=cut
2554
2555sub static_maps() {
2556 my @dirs = "";
2557 my @maps;
2558
2559 while (@dirs) {
2560 my $dir = shift @dirs;
2561
2562 next if $dir eq "/styles" || $dir eq "/editor";
2563
2564 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2565 or return;
2566
2567 for (@$files) {
2568 s/\.map$// or next;
2569 utf8::decode $_;
2570 push @maps, "$dir/$_";
2571 }
2572
2573 push @dirs, map "$dir/$_", @$dirs;
2574 }
2575
2576 \@maps
2577}
2331 2578
2332=back 2579=back
2333 2580
2334=head3 cf::object 2581=head3 cf::object
2335 2582
2339 2586
2340=over 4 2587=over 4
2341 2588
2342=item $ob->inv_recursive 2589=item $ob->inv_recursive
2343 2590
2344Returns the inventory of the object _and_ their inventories, recursively. 2591Returns the inventory of the object I<and> their inventories, recursively,
2592but I<not> the object itself.
2345 2593
2346=cut 2594=cut
2347 2595
2348sub inv_recursive_; 2596sub inv_recursive_;
2349sub inv_recursive_ { 2597sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2602 inv_recursive_ inv $_[0]
2355} 2603}
2356 2604
2357=item $ref = $ob->ref 2605=item $ref = $ob->ref
2358 2606
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2607Creates and returns a persistent reference to an object that can be stored as a string.
2360 2608
2361=item $ob = cf::object::deref ($refstring) 2609=item $ob = cf::object::deref ($refstring)
2362 2610
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2611returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2612even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2644can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2645dialogue with the given NPC character.
2398 2646
2399=cut 2647=cut
2400 2648
2649our $SAY_CHANNEL = {
2650 id => "say",
2651 title => "Map",
2652 reply => "say ",
2653 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2654};
2655
2656our $CHAT_CHANNEL = {
2657 id => "chat",
2658 title => "Chat",
2659 reply => "chat ",
2660 tooltip => "Player chat and shouts, global to the server.",
2661};
2662
2401# rough implementation of a future "reply" method that works 2663# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2664# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2665#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2666sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2667 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2678 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2679 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2680
2419 } else { 2681 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2682 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2683 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2684 }
2423 } 2685 }
2424} 2686}
2425 2687
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2688=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2713
2452=item $player_object->enter_link 2714=item $player_object->enter_link
2453 2715
2454Freezes the player and moves him/her to a special map (C<{link}>). 2716Freezes the player and moves him/her to a special map (C<{link}>).
2455 2717
2456The player should be reasonably safe there for short amounts of time. You 2718The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2719for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2720though, as the player cannot control the character while it is on the link
2721map.
2458 2722
2459Will never block. 2723Will never block.
2460 2724
2461=item $player_object->leave_link ($map, $x, $y) 2725=item $player_object->leave_link ($map, $x, $y)
2462 2726
2482sub cf::object::player::enter_link { 2746sub cf::object::player::enter_link {
2483 my ($self) = @_; 2747 my ($self) = @_;
2484 2748
2485 $self->deactivate_recursive; 2749 $self->deactivate_recursive;
2486 2750
2751 ++$self->{_link_recursion};
2752
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2753 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2754
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2755 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2756 if $self->map && $self->map->{path} ne "{link}";
2491 2757
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2758 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2759}
2494 2760
2495sub cf::object::player::leave_link { 2761sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2762 my ($self, $map, $x, $y) = @_;
2497 2763
2514 ($x, $y) = (-1, -1) 2780 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2781 unless (defined $x) && (defined $y);
2516 2782
2517 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2520 2786
2521 $map->load; 2787 $map->load;
2522 $map->load_neighbours;
2523 2788
2524 return unless $self->contr->active; 2789 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2790
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2792 if ($self->enter_map ($map, $x, $y)) {
2529} 2793 # entering was successful
2794 delete $self->{_link_recursion};
2795 # only activate afterwards, to support waiting in hooks
2796 $self->activate_recursive;
2797 }
2530 2798
2799}
2800
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2801=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2802
2533Moves the player to the given map-path and coordinates by first freezing 2803Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2804her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2805that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2806the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2807be called at the end of this process.
2538 2808
2809Note that $check will be called with a potentially non-loaded map, so if
2810it needs a loaded map it has to call C<< ->load >>.
2811
2539=cut 2812=cut
2540 2813
2541our $GOTOGEN; 2814our $GOTOGEN;
2542 2815
2543sub cf::object::player::goto { 2816sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2817 my ($self, $path, $x, $y, $check, $done) = @_;
2818
2819 if ($self->{_link_recursion} >= $MAX_LINKS) {
2820 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2821 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2822 ($path, $x, $y) = @$EMERGENCY_POSITION;
2823 }
2545 2824
2546 # do generation counting so two concurrent goto's will be executed in-order 2825 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2826 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2827
2549 $self->enter_link; 2828 $self->enter_link;
2569 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2570 } 2849 }
2571 } 2850 }
2572 2851
2573 my $map = eval { 2852 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2575 2854
2576 if ($map) { 2855 if ($map) {
2577 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2858 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2859 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2860 }
2582 2861
2583 $map 2862 $map
2591 if ($gen == $self->{_goto_generation}) { 2870 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2871 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2872 $self->leave_link ($map, $x, $y);
2594 } 2873 }
2595 2874
2596 $done->() if $done; 2875 $done->($self) if $done;
2597 })->prio (1); 2876 })->prio (1);
2598} 2877}
2599 2878
2600=item $player_object->enter_exit ($exit_object) 2879=item $player_object->enter_exit ($exit_object)
2601 2880
2621} 2900}
2622 2901
2623sub prepare_random_map { 2902sub prepare_random_map {
2624 my ($exit) = @_; 2903 my ($exit) = @_;
2625 2904
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2905 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2906 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2907 # that depends on the exit object
2631 2908
2632 my $rmp = parse_random_map_params $exit->msg; 2909 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2911 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2912 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2913 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2914 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2915 $rmp->{origin_y} = $exit->y;
2916
2917 $exit->map->touch;
2639 } 2918 }
2640 2919
2641 $rmp->{random_seed} ||= $exit->random_seed; 2920 $rmp->{random_seed} ||= $exit->random_seed;
2642 2921
2643 my $data = cf::encode_json $rmp; 2922 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2923 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2924 my $meta = "$RANDOMDIR/$md5.meta";
2646 2925
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2926 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2927 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2928 undef $fh;
2650 aio_rename "$meta~", $meta; 2929 aio_rename "$meta~", $meta;
2651 2930
2931 my $slaying = "?random/$md5";
2932
2933 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2934 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2935 $exit->msg (undef);
2936 }
2654 } 2937 }
2655} 2938}
2656 2939
2657sub cf::object::player::enter_exit { 2940sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2941 my ($self, $exit) = @_;
2659 2942
2660 return unless $self->type == cf::PLAYER; 2943 return unless $self->type == cf::PLAYER;
2661 2944
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2945 $self->enter_link;
2674 2946
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2947 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2948 $Coro::current->{desc} = "enter_exit";
2681 2949
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2950 unless (eval {
2951 $self->deactivate_recursive; # just to be sure
2952
2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2954 my $x = $exit->stats->hp;
2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2979
2684 $self->goto ($slaying, $hp, $sp); 2980 $self->goto ($map, $x, $y);
2685 2981
2982 # if exit is damned, update players death & WoR home-position
2983 $self->contr->savebed ($map, $x, $y)
2984 if $exit->flag (cf::FLAG_DAMNED);
2985
2686 1; 2986 1
2687 }) { 2987 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2988 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2989 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2990 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2991 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2992
2693 warn "ERROR in enter_exit: $@"; 2993 error "ERROR in enter_exit: $@";
2694 $self->leave_link; 2994 $self->leave_link;
2695 } 2995 }
2696 })->prio (1); 2996 })->prio (1);
2697} 2997}
2698 2998
2710sub cf::client::send_drawinfo { 3010sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 3011 my ($self, $text, $flags) = @_;
2712 3012
2713 utf8::encode $text; 3013 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3014 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3015}
3016
3017=item $client->send_big_packet ($pkt)
3018
3019Like C<send_packet>, but tries to compress large packets, and fragments
3020them as required.
3021
3022=cut
3023
3024our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3025
3026sub cf::client::send_big_packet {
3027 my ($self, $pkt) = @_;
3028
3029 # try lzf for large packets
3030 $pkt = "lzf " . Compress::LZF::compress $pkt
3031 if 1024 <= length $pkt and $self->{can_lzf};
3032
3033 # split very large packets
3034 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3035 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3036 $pkt = "frag";
3037 }
3038
3039 $self->send_packet ($pkt);
2715} 3040}
2716 3041
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 3042=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 3043
2719Send a drawinfo or msg packet to the client, formatting the msg for the 3044Send a drawinfo or msg packet to the client, formatting the msg for the
2723 3048
2724=cut 3049=cut
2725 3050
2726# non-persistent channels (usually the info channel) 3051# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 3052our %CHANNEL = (
3053 "c/motd" => {
3054 id => "infobox",
3055 title => "MOTD",
3056 reply => undef,
3057 tooltip => "The message of the day",
3058 },
2728 "c/identify" => { 3059 "c/identify" => {
2729 id => "infobox", 3060 id => "infobox",
2730 title => "Identify", 3061 title => "Identify",
2731 reply => undef, 3062 reply => undef,
2732 tooltip => "Items recently identified", 3063 tooltip => "Items recently identified",
2734 "c/examine" => { 3065 "c/examine" => {
2735 id => "infobox", 3066 id => "infobox",
2736 title => "Examine", 3067 title => "Examine",
2737 reply => undef, 3068 reply => undef,
2738 tooltip => "Signs and other items you examined", 3069 tooltip => "Signs and other items you examined",
3070 },
3071 "c/shopinfo" => {
3072 id => "infobox",
3073 title => "Shop Info",
3074 reply => undef,
3075 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 3076 },
2740 "c/book" => { 3077 "c/book" => {
2741 id => "infobox", 3078 id => "infobox",
2742 title => "Book", 3079 title => "Book",
2743 reply => undef, 3080 reply => undef,
2759 id => "infobox", 3096 id => "infobox",
2760 title => "Body Parts", 3097 title => "Body Parts",
2761 reply => undef, 3098 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 3099 tooltip => "Shows which body parts you posess and are available",
2763 }, 3100 },
3101 "c/statistics" => {
3102 id => "infobox",
3103 title => "Statistics",
3104 reply => undef,
3105 tooltip => "Shows your primary statistics",
3106 },
3107 "c/skills" => {
3108 id => "infobox",
3109 title => "Skills",
3110 reply => undef,
3111 tooltip => "Shows your experience per skill and item power",
3112 },
3113 "c/shopitems" => {
3114 id => "infobox",
3115 title => "Shop Items",
3116 reply => undef,
3117 tooltip => "Shows the items currently for sale in this shop",
3118 },
3119 "c/resistances" => {
3120 id => "infobox",
3121 title => "Resistances",
3122 reply => undef,
3123 tooltip => "Shows your resistances",
3124 },
3125 "c/pets" => {
3126 id => "infobox",
3127 title => "Pets",
3128 reply => undef,
3129 tooltip => "Shows information abotu your pets/a specific pet",
3130 },
3131 "c/perceiveself" => {
3132 id => "infobox",
3133 title => "Perceive Self",
3134 reply => undef,
3135 tooltip => "You gained detailed knowledge about yourself",
3136 },
2764 "c/uptime" => { 3137 "c/uptime" => {
2765 id => "infobox", 3138 id => "infobox",
2766 title => "Uptime", 3139 title => "Uptime",
2767 reply => undef, 3140 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 3141 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 3144 id => "infobox",
2772 title => "Map Info", 3145 title => "Map Info",
2773 reply => undef, 3146 reply => undef,
2774 tooltip => "Information related to the maps", 3147 tooltip => "Information related to the maps",
2775 }, 3148 },
3149 "c/party" => {
3150 id => "party",
3151 title => "Party",
3152 reply => "gsay ",
3153 tooltip => "Messages and chat related to your party",
3154 },
3155 "c/death" => {
3156 id => "death",
3157 title => "Death",
3158 reply => undef,
3159 tooltip => "Reason for and more info about your most recent death",
3160 },
3161 "c/say" => $SAY_CHANNEL,
3162 "c/chat" => $CHAT_CHANNEL,
2776); 3163);
2777 3164
2778sub cf::client::send_msg { 3165sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3166 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3167
2781 $msg = $self->pl->expand_cfpod ($msg); 3168 $msg = $self->pl->expand_cfpod ($msg)
3169 unless $color & cf::NDI_VERBATIM;
2782 3170
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3171 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3172
2785 # check predefined channels, for the benefit of C 3173 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3174 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3175 $channel = $CHANNEL{$channel};
2788 3176
2789 $self->ext_msg (channel_info => $channel) 3177 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3178 $channel = $channel->{id};
2793 3179
2794 } elsif (ref $channel) { 3180 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3181 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3182 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3183 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3184 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3185 }
2801 3186
2802 $channel = $channel->{id}; 3187 $channel = $channel->{id};
2803 } 3188 }
2804 3189
2805 return unless @extra || length $msg; 3190 return unless @extra || length $msg;
2806 3191
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3192 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3193 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3194 if $color & cf::NDI_DEF;
2811 3195
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3196 my $pkt = "msg "
3197 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3198 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3199 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 3200
2826 $color &= cf::NDI_COLOR_MASK; 3201 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 3202}
2840 3203
2841=item $client->ext_msg ($type, @msg) 3204=item $client->ext_msg ($type, @msg)
2842 3205
2843Sends an ext event to the client. 3206Sends an ext event to the client.
2846 3209
2847sub cf::client::ext_msg($$@) { 3210sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3211 my ($self, $type, @msg) = @_;
2849 3212
2850 if ($self->extcmd == 2) { 3213 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3214 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3215 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3216 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3217 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3218 }
2856} 3219}
2857 3220
2858=item $client->ext_reply ($msgid, @msg) 3221=item $client->ext_reply ($msgid, @msg)
2859 3222
2862=cut 3225=cut
2863 3226
2864sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
2866 3229
2867 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 }
2874} 3233}
2875 3234
2876=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2877 3236
2878Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
2933 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
2934 3293
2935 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2936 3295
2937 if (ref $msg) { 3296 if (ref $msg) {
2938 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2939 "ARRAY" eq ref $msg
2940 ? @$msg
2941 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2942 3298
2943 my @reply; 3299 my @reply;
2944 3300
2945 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
2946 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
2948 3304
2949 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
2950 if $reply; 3306 if $reply;
2951 3307
2952 } else { 3308 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 } 3310 }
2955 3311
2956 cf::override; 3312 cf::override;
2957 }, 3313 },
2958); 3314);
2978 3334
2979 $coro 3335 $coro
2980} 3336}
2981 3337
2982cf::client->attach ( 3338cf::client->attach (
2983 on_destroy => sub { 3339 on_client_destroy => sub {
2984 my ($ns) = @_; 3340 my ($ns) = @_;
2985 3341
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3343 },
2988); 3344);
3004our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3005 3361
3006$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3007 3363
3008$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3011 sort time 3367 sort time
3012)); 3368));
3013 3369
3014# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3017 3373
3018The following functions and methods are available within a safe environment: 3374The following functions and methods are available within a safe environment:
3019 3375
3020 cf::object 3376 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3377 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3378 insert remove name archname title slaying race decrease split
3379 value
3023 3380
3024 cf::object::player 3381 cf::object::player
3025 player 3382 player
3026 3383
3027 cf::player 3384 cf::player
3032 3389
3033=cut 3390=cut
3034 3391
3035for ( 3392for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3393 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3394 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3397 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3042) { 3399) {
3043 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 for @funs; 3402 for @funs;
3047} 3403}
3048 3404
3063 3419
3064 my $qcode = $code; 3420 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3067 3423
3424 %vars = (_dummy => 0) unless %vars;
3425
3426 my @res;
3068 local $_; 3427 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3428
3071 my $eval = 3429 my $eval =
3072 "do {\n" 3430 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3433 . $code
3076 . "\n}" 3434 . "\n}"
3077 ; 3435 ;
3078 3436
3437 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3441 sub_generation_inc;
3442 } else {
3443 local @cf::_safe_eval_args = values %vars;
3444 @res = wantarray ? eval eval : scalar eval $eval;
3445 }
3082 3446
3083 if ($@) { 3447 if ($@) {
3084 warn "$@"; 3448 warn "$@",
3085 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3087 } 3451 }
3088 3452
3089 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3090} 3454}
3091 3455
3105=cut 3469=cut
3106 3470
3107sub register_script_function { 3471sub register_script_function {
3108 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3109 3473
3110 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3112} 3476}
3113 3477
3114=back 3478=back
3115 3479
3116=cut 3480=cut
3125 # for this (global event?) 3489 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3127 3491
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129 3493
3130 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3131 3495
3132 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3133 0 < aio_load $path, $facedata
3134 or die "$path: $!";
3135
3136 $facedata = Coro::Storable::thaw $facedata;
3137 3497
3138 $facedata->{version} == 2 3498 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3500
3141 # patch in the exptable 3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3504 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3507 };
3146 cf::cede_to_tick; 3508 cf::cede_to_tick;
3147 3509
3148 { 3510 {
3149 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3150 3512
3151 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3515
3153 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3157 3521
3158 cf::cede_to_tick; 3522 cf::cede_to_tick;
3159 } 3523 }
3160 3524
3161 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3526 next unless $info->{smooth};
3527
3163 my $idx = cf::face::find $face 3528 my $idx = cf::face::find $face
3164 or next; 3529 or next;
3530
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3534 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3170 } 3536 }
3171 3537
3172 cf::cede_to_tick; 3538 cf::cede_to_tick;
3173 } 3539 }
3174 } 3540 }
3183 3549
3184 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3185 } 3551 }
3186 3552
3187 { 3553 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3191 3555
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3560
3198 if ($info->{type} & 1) { 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3562 cf::face::set_type $idx, $type;
3200 3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3564 } else {
3208 $data = $info->{data}; 3565# $RESOURCE{$name} = $info; # unused
3209 } 3566 }
3210 3567
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3568 cf::cede_to_tick;
3215 } 3569 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3570 }
3571
3572 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3573
3236 1 3574 1
3237} 3575}
3238 3576
3239register_exticmd fx_want => sub { 3577register_exticmd fx_want => sub {
3241 3579
3242 while (my ($k, $v) = each %$want) { 3580 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3581 $ns->fx_want ($k, $v);
3244 } 3582 }
3245}; 3583};
3584
3585sub load_resource_file($) {
3586 my $guard = lock_acquire "load_resource_file";
3587
3588 my $status = load_resource_file_ $_[0];
3589 get_slot 0.1, 100;
3590 cf::arch::commit_load;
3591
3592 $status
3593}
3246 3594
3247sub reload_regions { 3595sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3596 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3597 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3598 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3612}
3265 3613
3266sub reload_archetypes { 3614sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3615 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3616 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3617}
3275 3618
3276sub reload_treasures { 3619sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3620 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3621 or die "unable to load treasurelists\n";
3279} 3622}
3280 3623
3624sub reload_sound {
3625 trace "loading sound config from $DATADIR/sound\n";
3626
3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3628
3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3630 my $sound = $soundconf->{compat}[$_]
3631 or next;
3632
3633 my $face = cf::face::find "sound/$sound->[1]";
3634 cf::sound::set $sound->[0] => $face;
3635 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3636 }
3637
3638 while (my ($k, $v) = each %{$soundconf->{event}}) {
3639 my $face = cf::face::find "sound/$v";
3640 cf::sound::set $k => $face;
3641 }
3642}
3643
3281sub reload_resources { 3644sub reload_resources {
3282 warn "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
3283 3646
3647 reload_exp_table;
3648 reload_materials;
3649 reload_facedata;
3650 reload_sound;
3651 reload_archetypes;
3284 reload_regions; 3652 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3653 reload_treasures;
3289 3654
3290 warn "finished reloading resource files\n"; 3655 trace "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3656}
3296 3657
3297sub reload_config { 3658sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3659 trace "reloading config file...\n";
3299 or return;
3300 3660
3301 local $/; 3661 my $config = load_file "$CONFDIR/config";
3302 *CFG = YAML::Syck::Load <$fh>; 3662 utf8::decode $config;
3663 *CFG = decode_yaml $config;
3303 3664
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3305 3666
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3308 3669
3309 if (exists $CFG{mlockall}) { 3670 if (exists $CFG{mlockall}) {
3313 }; 3674 };
3314 warn $@ if $@; 3675 warn $@ if $@;
3315 } 3676 }
3316} 3677}
3317 3678
3679sub pidfile() {
3680 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3681 or die "$PIDFILE: $!";
3682 flock $fh, &Fcntl::LOCK_EX
3683 or die "$PIDFILE: flock: $!";
3684 $fh
3685}
3686
3687# make sure only one server instance is running at any one time
3688sub atomic {
3689 my $fh = pidfile;
3690
3691 my $pid = <$fh>;
3692 kill 9, $pid if $pid > 0;
3693
3694 seek $fh, 0, 0;
3695 print $fh $$;
3696}
3697
3698sub main_loop {
3699 trace "EV::loop starting\n";
3700 if (1) {
3701 EV::loop;
3702 }
3703 trace "EV::loop returned\n";
3704 goto &main_loop unless $REALLY_UNLOOP;
3705}
3706
3318sub main { 3707sub main {
3708 cf::init_globals; # initialise logging
3709
3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3714
3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3716
3319 # we must not ever block the main coroutine 3717 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3718 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3719 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3720 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3721 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3722 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3723 })->prio (Coro::PRIO_MAX);
3326 }; 3724 };
3327 3725
3726 evthread_start IO::AIO::poll_fileno;
3727
3728 cf::sync_job {
3729 cf::incloader::init ();
3730
3731 cf::init_anim;
3732 cf::init_attackmess;
3733 cf::init_dynamic;
3734
3735 cf::load_settings;
3736
3737 reload_resources;
3328 reload_config; 3738 reload_config;
3329 db_init; 3739 db_init;
3740
3741 cf::init_uuid;
3742 cf::init_signals;
3743 cf::init_skills;
3744
3745 cf::init_beforeplay;
3746
3747 atomic;
3748
3330 load_extensions; 3749 load_extensions;
3331 3750
3332 $TICK_WATCHER->start; 3751 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3752
3334 EV::loop; 3753 # no (long-running) fork's whatsoever before this point(!)
3754 use POSIX ();
3755 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3756
3757 cf::_post_init 0;
3758 };
3759
3760 cf::object::thawer::errors_are_fatal 0;
3761 info "parse errors in files are no longer fatal from this point on.\n";
3762
3763 AE::postpone {
3764 undef &main; # free gobs of memory :)
3765 };
3766
3767 goto &main_loop;
3335} 3768}
3336 3769
3337############################################################################# 3770#############################################################################
3338# initialisation and cleanup 3771# initialisation and cleanup
3339 3772
3340# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
3341BEGIN { 3774BEGIN {
3342 our %SIGWATCHER = (); 3775 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
3346 }; 3779 };
3347 } 3780 }
3348} 3781}
3349 3782
3350sub write_runtime { 3783sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3784 my $t0 = AE::time;
3352 3785
3353 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
3355 3788
3356 IO::AIO::aio_utime $runtime, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3790
3358 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
3359 3792
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3794 or return;
3362 3795
3363 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3808 aio_utime $fh, undef, undef;
3376 3809
3377 close $fh 3810 close $fh
3378 or return; 3811 or return;
3379 3812
3380 aio_rename "$runtime~", $runtime 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3814 and return;
3382 3815
3383 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3817
3385 1 3818 1
3819}
3820
3821our $uuid_lock;
3822our $uuid_skip;
3823
3824sub write_uuid_sync($) {
3825 $uuid_skip ||= $_[0];
3826
3827 return if $uuid_lock;
3828 local $uuid_lock = 1;
3829
3830 my $uuid = "$LOCALDIR/uuid";
3831
3832 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3833 or return;
3834
3835 my $value = uuid_seq uuid_cur;
3836
3837 unless ($value) {
3838 info "cowardly refusing to write zero uuid value!\n";
3839 return;
3840 }
3841
3842 my $value = uuid_str $value + $uuid_skip;
3843 $uuid_skip = 0;
3844
3845 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3846 and return;
3847
3848 # always fsync - this file is important
3849 aio_fsync $fh
3850 and return;
3851
3852 close $fh
3853 or return;
3854
3855 aio_rename "$uuid~", $uuid
3856 and return;
3857
3858 trace "uuid file written ($value).\n";
3859
3860 1
3861
3862}
3863
3864sub write_uuid($$) {
3865 my ($skip, $sync) = @_;
3866
3867 $sync ? write_uuid_sync $skip
3868 : async { write_uuid_sync $skip };
3386} 3869}
3387 3870
3388sub emergency_save() { 3871sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3390 3873
3391 warn "enter emergency perl save\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3392 3880
3393 cf::sync_job { 3881 cf::sync_job {
3882 cf::write_runtime_sync; # external watchdog should not bark
3883
3394 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3890 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3892 $pl->save;
3403 } 3893 }
3404 warn "end emergency player save\n"; 3894 info "emergency_perl_save: end player save\n";
3405 3895
3406 warn "begin emergency map save\n"; 3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 info "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3901 $map->valid or next;
3410 $map->save; 3902 $map->save;
3411 } 3903 }
3412 warn "end emergency map save\n"; 3904 info "emergency_perl_save: end map save\n";
3413 3905
3414 warn "begin emergency database checkpoint\n"; 3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3908 info "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3911
3912 info "emergency_perl_save: begin write uuid\n";
3913 write_uuid_sync 1;
3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3417 }; 3934 };
3418 3935
3419 warn "leave emergency perl save\n"; 3936 info "emergency_perl_save: leave\n";
3420} 3937}
3421 3938
3422sub post_cleanup { 3939sub post_cleanup {
3423 my ($make_core) = @_; 3940 my ($make_core) = @_;
3424 3941
3942 IO::AIO::flush;
3943
3425 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3945 if $make_core;
3946
3947 my $fh = pidfile;
3948 unlink $PIDFILE if <$fh> == $$;
3949}
3950
3951# a safer delete_package, copied from Symbol
3952sub clear_package($) {
3953 my $pkg = shift;
3954
3955 # expand to full symbol table name if needed
3956 unless ($pkg =~ /^main::.*::$/) {
3957 $pkg = "main$pkg" if $pkg =~ /^::/;
3958 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3959 $pkg .= '::' unless $pkg =~ /::$/;
3960 }
3961
3962 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3963 my $stem_symtab = *{$stem}{HASH};
3964
3965 defined $stem_symtab and exists $stem_symtab->{$leaf}
3966 or return;
3967
3968 # clear all symbols
3969 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3970 for my $name (keys %$leaf_symtab) {
3971 _gv_clear *{"$pkg$name"};
3972# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3973 }
3427} 3974}
3428 3975
3429sub do_reload_perl() { 3976sub do_reload_perl() {
3430 # can/must only be called in main 3977 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3432 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3433 return; 3980 return;
3434 } 3981 }
3435 3982
3436 warn "reloading..."; 3983 return if $RELOAD++;
3437 3984
3438 warn "entering sync_job"; 3985 my $t1 = AE::time;
3439 3986
3987 while ($RELOAD) {
3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3990
3991 trace "perl_reload: entering sync_job";
3992
3440 cf::sync_job { 3993 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark
3442 cf::emergency_save; 3994 #cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark
3444 3995
3445 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV;
3447
3448 # if anything goes wrong in here, we should simply crash as we already saved
3449
3450 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs;
3456 warn "iterate...";
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = (); 3998 %EXT_CORO = ();
3464 3999
3465 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3466 %COMMAND = (); 4001 %COMMAND = ();
3467 4002
3468 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3469 %EXTCMD = (); 4004 %EXTCMD = ();
3470 %EXTICMD = (); 4005 %EXTICMD = ();
3471 4006
3472 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3473 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3475 4010
3476 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3477 eval { 4012 eval {
3478 $cb->($pkg); 4013 $cb->($pkg);
3479 1 4014 1
3480 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
4016 }
4017
4018 trace "... clearing $pkg";
4019 clear_package $pkg;
3481 } 4020 }
3482 4021
3483 warn "... nuking $pkg";
3484 Symbol::delete_package $pkg;
3485 }
3486
3487 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3488 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 4025
3491 warn "... unloading $k"; 4026 trace "... unloading $k";
3492 delete $INC{$k}; 4027 delete $INC{$k};
3493 4028
3494 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3496 4031
3497 if (my $cb = $k->can ("unload_module")) { 4032 if (my $cb = $k->can ("unload_module")) {
3498 $cb->(); 4033 $cb->();
4034 }
4035
4036 clear_package $k;
3499 } 4037 }
3500 4038
3501 Symbol::delete_package $k;
3502 }
3503
3504 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 4040 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 4042
3508 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 4046
3512 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3513 # and global variables created in xs 4048 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3515 4050
3516 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3517 4052
3518 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3519 require cf; 4054 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4055 cf::_connect_to_perl_1;
3521 4056
3522 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3523 cf::reload_config; 4058 cf::reload_config;
3524 4059
3525 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3526 cf::load_extensions; 4061 cf::load_extensions;
3527 4062
4063 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3531 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
4070 }
3534 4071
3535 warn "leaving sync_job"; 4072 cf::_post_init 1;
3536 4073
4074 trace "perl_reload: leaving sync_job";
4075
3537 1 4076 1
3538 } or do { 4077 } or do {
3539 warn $@; 4078 error $@;
3540 warn "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3541 exit 1; 4080 };
4081
4082 --$RELOAD;
3542 }; 4083 }
3543 4084
3544 warn "reloaded"; 4085 $t1 = AE::time - $t1;
4086 info "perl_reload: completed in ${t1}s\n";
3545}; 4087};
3546 4088
3547our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3548 4090
3549sub reload_perl() { 4091sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 4092 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3552 4094
4095 $RELOAD_WATCHER ||= cf::async {
4096 Coro::AIO::aio_wait cache_extensions;
4097
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4099 do_reload_perl;
3554 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
3555 do_reload_perl; 4101 };
3556 }; 4102 };
3557} 4103}
3558 4104
3559register_command "reload" => sub { 4105register_command "reload" => sub {
3560 my ($who, $arg) = @_; 4106 my ($who, $arg) = @_;
3566 reload_perl; 4112 reload_perl;
3567 }; 4113 };
3568 } 4114 }
3569}; 4115};
3570 4116
3571unshift @INC, $LIBDIR; 4117#############################################################################
3572 4118
3573my $bug_warning = 0; 4119my $bug_warning = 0;
3574 4120
3575our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN;
3577
3578sub wait_for_tick { 4121sub wait_for_tick() {
3579 return unless $TICK_WATCHER->is_active; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3580 return if $Coro::current == $Coro::main;
3581 4123
3582 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3583 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait;
3585} 4125}
3586 4126
3587sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3588 return unless $TICK_WATCHER->is_active; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3589 return if $Coro::current == $Coro::main;
3590 4129
3591 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 4132 $signal->wait;
3594} 4133}
3595 4134
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4135sub tick {
3597 if ($Coro::current != $Coro::main) { 4136 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3600 return; 4139 return;
3601 } 4140 }
3602 4141
3603 $NOW = $tick_start = EV::now; 4142 cf::one_tick; # one server iteration
3604 4143
3605 cf::server_tick; # one server iteration 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3606
3607 $RUNTIME += $TICK;
3608 $NEXT_TICK += $TICK;
3609 4145
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 4148 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 4150 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3616 }; 4152 };
3617 } 4153 }
3618 4154
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3620 $sig->send; 4156 $sig->send;
3621 } 4157 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3623 $sig->send;
3624 }
3625 4159
3626 $LOAD = ($NOW - $tick_start) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 4162
3629 _post_tick; 4163 if (0) {
3630}; 4164 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4165 my $jitter = $TICK_START - $NEXT_TICK;
4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4167 debug "jitter $JITTER\n";#d#
4168 }
4169 }
4170}
3632 4171
3633{ 4172{
4173 # configure BDB
4174
3634 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4177 #$AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 4178
3653 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4183 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4184 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4185 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4186
3660 cf::sync_job { 4187 cf::sync_job {
3661 eval { 4188 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4210 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4211 };
3685} 4212}
3686 4213
3687{ 4214{
4215 # configure IO::AIO
4216
3688 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4219 undef $AnyEvent::AIO::WATCHER;
3693} 4220}
3694 4221
3695my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3696 4224
3697sub _log_backtrace { 4225sub _log_backtrace {
3698 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3699 4227
3700 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3701 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3702 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3704 ++$_log_backtrace; 4236 ++$_log_backtrace;
4237 my $perl_bt = Carp::longmess $msg;
3705 async { 4238 async {
3706 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
3707 4240
3708 my @bt = fork_call { 4241 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4242 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4253 }
3721 4254
3722 @funcs 4255 @funcs
3723 }; 4256 };
3724 4257
3725 LOG llevInfo, "[ABT] $msg\n"; 4258 LOG llevInfo, "[ABT] $perl_bt\n";
4259 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4261 --$_log_backtrace;
3728 }; 4262 };
3729 } else { 4263 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3732 } 4266 }
3733} 4267}
3734 4268
3735# load additional modules 4269# load additional modules
3736use cf::pod; 4270require "cf/$_.pm" for @EXTRA_MODULES;
4271cf::_connect_to_perl_2;
3737 4272
3738END { cf::emergency_save } 4273END { cf::emergency_save }
3739 4274
37401 42751
3741 4276

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines