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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines