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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines