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.382 by root, Thu Oct 11 00:34:31 2007 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 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 4.1 (); 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.51 (); 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;
85our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 135our $DB_ENV;
89 136
137our @EXTRA_MODULES = qw(pod match mapscript incloader);
138
90our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
91 141
92our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
145our $NOW;
94 146
95our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
98 150
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 152our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 153
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 154our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 155our $LOADAVG; # same thing, but with alpha-smoothing
156our $JITTER; # average jitter
104our $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;
105 166
106binmode STDOUT; 167binmode STDOUT;
107binmode STDERR; 168binmode STDERR;
108 169
109# read virtual server time, if available 170# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 171unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 172 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
114} 175}
176
177eval "sub TICK() { $TICK } 1" or die;
115 178
116mkdir $_ 179mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 181
119our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
120 183
121sub cf::map::normalise; 184sub cf::map::normalise;
122 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
123############################################################################# 190#############################################################################
124 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
125=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
126 204
127=over 4 205=over 4
128 206
129=item $cf::UPTIME 207=item $cf::UPTIME
130 208
131The 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.
132 225
133=item $cf::RUNTIME 226=item $cf::RUNTIME
134 227
135The 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
136every server tick. 229every server tick.
137 230
138=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
139$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
140$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
141 234
142Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
143directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
144unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
145database environment. 238database environment.
146 239
147=item $cf::NOW
148
149The time of the last (current) server tick.
150
151=item $cf::TICK
152
153The interval between server ticks, in seconds.
154
155=item $cf::LOADAVG 240=item $cf::LOADAVG
156 241
157The 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
158(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
159objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
162 247
163The raw value load value from the last tick. 248The raw value load value from the last tick.
164 249
165=item %cf::CFG 250=item %cf::CFG
166 251
167Configuration for the server, loaded from C</etc/crossfire/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 253from wherever your confdir points to.
169 254
170=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
171 256
172These 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.
173returns 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
174per 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();
175 278
176=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
177 280
178This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
179C<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
180that call. 283that call.
181 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
182=back 291=back
183 292
184=cut 293=cut
185 294
186BEGIN { 295sub error(@) { LOG llevError, join "", @_ }
187 *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 {
188 my $msg = join "", @_; 302 my $msg = join "", @_;
189 303
190 $msg .= "\n" 304 $msg .= "\n"
191 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
192 306
193 $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;
194 308
195 LOG llevError, $msg; 309 LOG llevWarn, $msg;
196 }; 310};
197} 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};
198 325
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 326@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 327@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 328@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 329@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 336for my $pkg (qw(
210 cf::global cf::attachable 337 cf::global cf::attachable
211 cf::object cf::object::player 338 cf::object cf::object::player
212 cf::client cf::player 339 cf::client cf::player
213 cf::arch cf::living 340 cf::arch cf::living
341 cf::map cf::mapspace
214 cf::map cf::party cf::region 342 cf::party cf::region
215)) { 343)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 345}
219 346
220$Event::DIED = sub { 347$EV::DIED = sub {
221 warn "error in event callback: @_"; 348 warn "error in event callback: $@";
222}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
223 355
224############################################################################# 356#############################################################################
225 357
226=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
227 359
248 $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;
249 $d 381 $d
250 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
251} 383}
252 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
253=item $ref = cf::from_json $json 437=item $ref = cf::decode_json $json
254 438
255Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
256 440
257=item $json = cf::to_json $ref 441=item $json = cf::encode_json $ref
258 442
259Converts a perl data structure into its JSON representation. 443Converts a perl data structure into its JSON representation.
260 444
261=cut 445=cut
262 446
263our $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
264 448
265sub to_json ($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
266sub 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}
267 527
268=item cf::lock_wait $string 528=item cf::lock_wait $string
269 529
270Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
271 531
272=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
273 533
274Wait 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
275a 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,
276for example when the coroutine gets canceled), the lock is automatically 536for example when the coroutine gets canceled), the lock is automatically
277returned. 537returned.
278 538
279Locks 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
280deadlocked coro. 540deadlocked coro.
286 546
287Return 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.
288 548
289=cut 549=cut
290 550
291our %LOCK; 551our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 552
294sub lock_wait($) { 553sub lock_wait($) {
295 my ($key) = @_; 554 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 555}
308 556
309sub lock_acquire($) { 557sub lock_acquire($) {
310 my ($key) = @_; 558 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 559}
324 560
325sub lock_active($) { 561sub lock_active($) {
326 my ($key) = @_; 562 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 563}
330 564
331sub freeze_mainloop { 565sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 566 tick_inhibit_inc;
333 567
334 my $guard = Coro::guard { 568 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 569}
336 }; 570
337 $TICK_WATCHER->stop; 571=item cf::periodic $interval, $cb
338 $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
339} 584}
340 585
341=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
342 587
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
344This 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
345of 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.
346 595
347The 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
348used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
349 598
350Useful for short background jobs. 599Useful for short background jobs.
351 600
352=cut 601=cut
353 602
354our @SLOT_QUEUE; 603our @SLOT_QUEUE;
355our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
356 606
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
360 610
361 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
362 613
363 while () { 614 while () {
364 next_job: 615 next_job:
616
617 Coro::cede;
618
365 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 620
367 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 625 $job->[2]->send;
371 Coro::cede;
372 goto next_job; 626 goto next_job;
373 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 629 }
375 } 630 }
376 631
377 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else { 634 } else {
635 $busy = 0;
382 Coro::schedule; 636 Coro::schedule;
383 } 637 }
384 } 638 }
385}; 639};
386 640
387sub get_slot($;$$) { 641sub get_slot($;$$) {
642 return if tick_inhibit || $Coro::current == $Coro::main;
643
388 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
389 645
390 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
391 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
392 649
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
406 663
407BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
408 665
409=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
410 667
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
412is 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
413partly 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
414acceptable. 671acceptable.
415 672
416If 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
417the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
421=cut 678=cut
422 679
423sub sync_job(&) { 680sub sync_job(&) {
424 my ($job) = @_; 681 my ($job) = @_;
425 682
426 if ($Coro::current == $Coro::main) { 683 if (in_main) {
427 my $time = Event::time; 684 my $time = AE::time;
428 685
429 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
431 688
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
433 690
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
437 692
438 my $busy = 1; 693 my $busy = 1;
439 my @res; 694 my @res;
440 695
441 (async { 696 (async {
442 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 698 @res = eval { $job->() };
444 warn $@ if $@; 699 error $@ if $@;
445 undef $busy; 700 undef $busy;
446 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
447 702
448 while ($busy) { 703 while ($busy) {
449 Coro::cede or Event::one_event; 704 if (Coro::nready) {
705 Coro::cede_notself;
706 } else {
707 EV::run EV::RUN_ONCE;
450 } 708 }
709 }
451 710
452 $time = Event::time - $time; 711 my $time = AE::time - $time;
453 712
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
458 714
459 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
460 } else { 716 } else {
461 # we are in another coroutine, how wonderful, everything just works 717 # we are in another coroutine, how wonderful, everything just works
462 718
482 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
483 739
484 $coro 740 $coro
485} 741}
486 742
487=item fork_call { }, $args 743=item fork_call { }, @args
488 744
489Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 748never block itself or use any form of event handling.
493 749
494=cut 750=cut
751
752sub post_fork {
753 reset_signals;
754}
495 755
496sub fork_call(&@) { 756sub fork_call(&@) {
497 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
498 758
499 # we seemingly have to make a local copy of the whole thing,
500 # otherwise perl prematurely frees the stuff :/
501 # TODO: investigate and fix (likely this will be rather laborious)
502
503 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
504 reset_signals; 760 cf::post_fork;
505 &$cb 761 &$cb
506 }, @args; 762 } @args;
507 763
508 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
509} 803}
510 804
511=item $value = cf::db_get $family => $key 805=item $value = cf::db_get $family => $key
512 806
513Returns a single value from the environment database. 807Returns a single value from the environment database.
523within each server. 817within each server.
524 818
525=cut 819=cut
526 820
527sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
528 my ($name) = @_; 825 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
530 827
531 eval { 828 eval {
532 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
542} 839}
543 840
544our $DB; 841our $DB;
545 842
546sub db_init { 843sub db_init {
547 cf::sync_job {
548 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
549 };
550} 845}
551 846
552sub db_get($$) { 847sub db_get($$) {
553 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
554 849
555 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
556 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
557 854
558 $! ? () 855 $! ? ()
559 : $data 856 : $data
560 }
561} 857}
562 858
563sub db_put($$$) { 859sub db_put($$$) {
564 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
565 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
593 889
594 my @data; 890 my @data;
595 my $md5; 891 my $md5;
596 892
597 for (0 .. $#$src) { 893 for (0 .. $#$src) {
598 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
599 or Carp::croak "$src->[$_]: $!";
600 } 895 }
601 896
602 # if processing is expensive, check 897 # if processing is expensive, check
603 # checksum first 898 # checksum first
604 if (1) { 899 if (1) {
617 912
618 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
619 } 914 }
620 } 915 }
621 916
622 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
623 my $data = $process->(\@data); 918 my $data = $process->(\@data);
624 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
625 920
626 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
627 922
628 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
629 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
630 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
631 926
641 936
642=cut 937=cut
643 938
644sub datalog($@) { 939sub datalog($@) {
645 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
646 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
647} 942}
648 943
649=back 944=back
650 945
651=cut 946=cut
652 947
653############################################################################# 948#############################################################################
654 949
655=head2 ATTACHABLE OBJECTS 950=head2 ATTACHABLE OBJECTS
656 951
657Many 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
658attach callbacks/event handlers (a collection of which is called an "attachment") 953attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 954to it. All such attachable objects support the following methods.
660 955
661In 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>
662C<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
663Crossfire TRT). 958Deliantra).
664 959
665=over 4 960=over 4
666 961
667=item $attachable->attach ($attachment, key => $value...) 962=item $attachable->attach ($attachment, key => $value...)
668 963
712=item cf::CLASS::attachment $name, ... 1007=item cf::CLASS::attachment $name, ...
713 1008
714Register an attachment by C<$name> through which attachable objects of the 1009Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 1010given CLASS can refer to this attachment.
716 1011
717Some classes such as crossfire maps and objects can specify attachments 1012Some classes such as deliantra maps and objects can specify attachments
718that 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.
719 1014
720These calls expect any number of the following handler/hook descriptions: 1015These calls expect any number of the following handler/hook descriptions:
721 1016
722=over 4 1017=over 4
846 1141
847 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
848 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
849 1144
850 } elsif (ref $type) { 1145 } elsif (ref $type) {
851 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
852 1147
853 } else { 1148 } else {
854 shift @arg; 1149 shift @arg;
855 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
856 } 1151 }
857 } 1152 }
858} 1153}
859 1154
860sub _object_attach { 1155sub _object_attach {
870 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
871 } 1166 }
872 1167
873 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
874 } else { 1169 } else {
875 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
876 } 1171 }
877 1172
878 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
879} 1174}
880 1175
939 1234
940 for (@$callbacks) { 1235 for (@$callbacks) {
941 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
942 1237
943 if ($@) { 1238 if ($@) {
944 warn "$@";
945 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
946 override; 1240 override;
947 } 1241 }
948 1242
949 return 1 if $override; 1243 return 1 if $override;
950 } 1244 }
951 1245
952 0 1246 0
953} 1247}
954 1248
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1249=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1250
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1251=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1252
959Generate an object-specific event with the given arguments. 1253Generate an object-specific event with the given arguments.
960 1254
966 1260
967=cut 1261=cut
968 1262
969############################################################################# 1263#############################################################################
970# object support 1264# object support
971#
972 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#
973sub _can_merge { 1299sub _can_merge {
974 my ($ob1, $ob2) = @_; 1300 my ($ob1, $ob2) = @_;
975 1301
976 local $Storable::canonical = 1; 1302 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1303
980 $fob1 eq $fob2 1304 # we do the slow way here
1305 return _object_equal $ob1, $ob2
981} 1306}
982 1307
983sub reattach { 1308sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1309 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1310 my ($obj) = @_;
986 1311
1312 # no longer needed after getting rid of delete_package?
987 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
988 1314
989 my $registry = $obj->registry; 1315 my $registry = $obj->registry;
990 1316
991 @$registry = (); 1317 @$registry = ();
992 1318
997 for (@$attach) { 1323 for (@$attach) {
998 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
999 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1000 } 1326 }
1001 } else { 1327 } else {
1002 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1003 } 1329 }
1004 } 1330 }
1005} 1331}
1006 1332
1007cf::attachable->attach ( 1333cf::attachable->attach (
1008 prio => -1000000, 1334 prio => -1000000,
1009 on_instantiate => sub { 1335 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1336 my ($obj, $data) = @_;
1011 1337
1012 $data = from_json $data; 1338 $data = decode_json $data;
1013 1339
1014 for (@$data) { 1340 for (@$data) {
1015 my ($name, $args) = @$_; 1341 my ($name, $args) = @$_;
1016 1342
1017 $obj->attach ($name, %{$args || {} }); 1343 $obj->attach ($name, %{$args || {} });
1034 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1035 1361
1036 sync_job { 1362 sync_job {
1037 if (length $$rdata) { 1363 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1041 1368
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1370 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 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 }
1046 close $fh; 1376 aio_close $fh;
1047 1377
1048 if (@$objs) { 1378 if (@$objs) {
1049 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) {
1050 chmod SAVE_MODE, $fh; 1380 aio_chmod $fh, SAVE_MODE;
1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1381 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1382 aio_write $fh, 0, (length $data), $data, 0;
1053 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 }
1054 close $fh; 1387 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1388 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1389 }
1057 } else { 1390 } else {
1058 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1059 } 1392 }
1060 1393
1061 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1395
1396 $filename =~ s%/[^/]+$%%;
1397 aio_pathsync $filename if $cf::USE_FSYNC;
1062 } else { 1398 } else {
1063 warn "FATAL: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1064 } 1400 }
1065 } else { 1401 } else {
1066 aio_unlink $filename; 1402 aio_unlink $filename;
1067 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1068 } 1404 }
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 my $st = eval { Coro::Storable::thaw $av } 1428 my $st = eval { Coro::Storable::thaw $av };
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs}; 1429 $av = $st->{objs};
1095 } 1430 }
1096 1431
1097 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1100 1436
1101 ($data, $av) 1437 ($data, $av)
1102} 1438}
1103 1439
1104=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1108=cut 1444=cut
1109 1445
1110############################################################################# 1446#############################################################################
1111# command handling &c 1447# command handling &c
1112 1448
1113=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1114 1450
1115Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1116$name. 1452$name.
1117 1453
1118=cut 1454=cut
1124 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1125 1461
1126 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1127} 1463}
1128 1464
1129=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1130 1466
1131Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1132extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1133received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1134the 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
1135has logged in successfully. 1471has logged in successfully.
1136 1472
1137If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1138called.
1139 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
1140=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1141 1481
1142Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1143exticmd 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
1144are 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
1145is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1146log-in. 1486log-in.
1147 1487
1148If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1149called.
1150 1489
1151=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1152 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
1153sub register_extcmd { 1497sub register_extcmd($$) {
1154 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1155 1499
1156 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1157} 1501}
1158 1502
1159sub register_exticmd { 1503sub register_async_extcmd($$) {
1160 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1161 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1162 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1163} 1513}
1164 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1521use File::Glob ();
1522
1165cf::player->attach ( 1523cf::player->attach (
1166 on_command => sub { 1524 on_unknown_command => sub {
1167 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1168 1526
1169 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1170 or return; 1528 or return;
1171 1529
1179 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1180 1538
1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1182 1540
1183 if (ref $msg) { 1541 if (ref $msg) {
1184 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188 1543
1189 my @reply;
1190
1191 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}) {
1192 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1193 } 1562 }
1194 1563
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1198 } else { 1564 } else {
1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1200 } 1566 }
1201 1567
1202 cf::override; 1568 cf::override;
1203 }, 1569 },
1204); 1570);
1205 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
1206sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1207 cf::sync_job { 1601 cf::sync_job {
1208 my %todo; 1602 my %todo;
1209 1603
1210 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1211 next unless -r $path; 1605 next unless -r $path;
1229 1623
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1626
1233 $ext{source} = 1627 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1235 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1236 . $source 1630 . $source
1237 . "\n};\n1"; 1631 . "\n};\n1";
1238 1632
1239 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1240 } 1634 }
1241 1635
1636 my $pass = 0;
1242 my %done; 1637 my %done;
1243 while (%todo) { 1638 while (%todo) {
1244 my $progress; 1639 my $progress;
1245 1640
1641 ++$pass;
1642
1643 ext:
1246 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip 1646 next ext
1249 unless exists $done{$_}; 1647 unless exists $done{$_};
1250 } 1648 }
1251 1649
1252 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1253 1651
1254 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 $@) {
1255 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1256 : "$v->{base}: extension inactive.\n";
1257 1665
1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1258 if (exists $v->{meta}{mandatory}) { 1667 if exists $v->{meta}{mandatory};
1259 warn $msg; 1668
1260 warn "mandatory extension failed to load, exiting.\n"; 1669 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1261 exit 1; 1670 delete $todo{$k};
1262 } 1671 } else {
1263 1672 $done{$k} = delete $todo{$k};
1264 warn $msg; 1673 push @EXTS, $v->{pkg};
1674 $progress = 1;
1675
1676 info "$v->{base}: extension inactive.\n"
1677 unless $active;
1265 } 1678 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
1270 } 1679 }
1271 1680
1272 skip: 1681 unless ($progress) {
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1274 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 }
1275 } 1691 }
1276 }; 1692 };
1277} 1693}
1278 1694
1279############################################################################# 1695#############################################################################
1280 1696
1281=back 1697=back
1282 1698
1283=head2 CORE EXTENSIONS 1699=head2 CORE EXTENSIONS
1284 1700
1285Functions and methods that extend core crossfire objects. 1701Functions and methods that extend core deliantra objects.
1286 1702
1287=cut 1703=cut
1288 1704
1289package cf::player; 1705package cf::player;
1290 1706
1333 1749
1334sub exists($) { 1750sub exists($) {
1335 my ($login) = @_; 1751 my ($login) = @_;
1336 1752
1337 $cf::PLAYER{$login} 1753 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1754 or !aio_stat path $login
1339} 1755}
1340 1756
1341sub find($) { 1757sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1758 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1759 my $login = $_[0];
1355 my $f = new_from_file cf::object::thawer path $login 1771 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1772 or return;
1357 1773
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 {
2048 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2049 2402
2050 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2051 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2052 if (my $map = find $k) { 2405 if (my $map = find $k) {
2053 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2054 } 2407 }
2055 2408
2056 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2057 } 2410 }
2058 } 2411 }
2061 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2062 2415
2063 () 2416 ()
2064} 2417}
2065 2418
2419# common code, used by both ->save and ->swapout
2066sub save { 2420sub _save {
2067 my ($self) = @_; 2421 my ($self) = @_;
2068
2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
2070 2422
2071 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2072 2424
2073 return unless $self->dirty; 2425 return unless $self->dirty;
2074 2426
2083 2435
2084 cf::async { 2436 cf::async {
2085 $Coro::current->{desc} = "map player save"; 2437 $Coro::current->{desc} = "map player save";
2086 $_->contr->save for $self->players; 2438 $_->contr->save for $self->players;
2087 }; 2439 };
2440
2441 cf::get_slot 0.02;
2088 2442
2089 if ($uniq) { 2443 if ($uniq) {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2444 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2091 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2445 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2092 } else { 2446 } else {
2093 $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);
2094 } 2448 }
2095} 2449}
2096 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2097sub swap_out { 2459sub swap_out {
2098 my ($self) = @_; 2460 my ($self) = @_;
2099 2461
2100 # save first because save cedes
2101 $self->save;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2105 return if $self->players; 2466 return if $self->players;
2106 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
2107 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2108 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
2109 $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};
2110 2518
2111 $self->deactivate; 2519 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2113 $self->clear; 2521 $self->clear;
2114}
2115
2116sub reset_at {
2117 my ($self) = @_;
2118
2119 # TODO: safety, remove and allow resettable per-player maps
2120 return 1e99 if $self->{deny_reset};
2121
2122 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2123 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2124
2125 $time + $to
2126}
2127
2128sub should_reset {
2129 my ($self) = @_;
2130
2131 $self->reset_at <= $cf::RUNTIME
2132}
2133
2134sub reset {
2135 my ($self) = @_;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
2139 return if $self->players;
2140
2141 warn "resetting map ", $self->path;
2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 # need to save uniques path
2146 unless ($self->{deny_save}) {
2147 my $uniq = $self->uniq_path; utf8::encode $uniq;
2148
2149 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2150 if $uniq;
2151 }
2152
2153 delete $cf::MAP{$self->path};
2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2157 $self->clear;
2158 2522
2159 $self->unlink_save; 2523 $self->unlink_save;
2160 $self->destroy; 2524 $self->destroy;
2161} 2525}
2162 2526
2170 2534
2171 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2172 2536
2173 $self->unlink_save; 2537 $self->unlink_save;
2174 2538
2175 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2176 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2177 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2178 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2180 2544
2229 2593
2230sub unique_maps() { 2594sub unique_maps() {
2231 [ 2595 [
2232 map { 2596 map {
2233 utf8::decode $_; 2597 utf8::decode $_;
2234 /\.map$/ 2598 s/\.map$//; # TODO future compatibility hack
2599 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2600 ? ()
2235 ? normalise $_ 2601 : normalise $_
2236 : ()
2237 } @{ aio_readdir $UNIQUEDIR or [] } 2602 } @{ aio_readdir $UNIQUEDIR or [] }
2238 ] 2603 ]
2239} 2604}
2240 2605
2241package 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}
2242 2637
2243=back 2638=back
2244 2639
2245=head3 cf::object 2640=head3 cf::object
2246 2641
2250 2645
2251=over 4 2646=over 4
2252 2647
2253=item $ob->inv_recursive 2648=item $ob->inv_recursive
2254 2649
2255Returns 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.
2256 2652
2257=cut 2653=cut
2258 2654
2259sub inv_recursive_; 2655sub inv_recursive_;
2260sub inv_recursive_ { 2656sub inv_recursive_ {
2265 inv_recursive_ inv $_[0] 2661 inv_recursive_ inv $_[0]
2266} 2662}
2267 2663
2268=item $ref = $ob->ref 2664=item $ref = $ob->ref
2269 2665
2270creates 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.
2271 2667
2272=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2273 2669
2274returns 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,
2275even if the object actually exists. May block. 2671even if the object actually exists. May block.
2276 2672
2277=cut 2673=cut
2278 2674
2279sub deref { 2675sub deref {
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) = @_;
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 }
2456 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;
2480 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2481 } 2939 }
2482 } 2940 }
2483 2941
2484 my $map = eval { 2942 my $map = eval {
2485 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2486 2944
2487 if ($map) { 2945 if ($map) {
2488 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2489 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2490 } else { 2948 } else {
2491 $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);
2492 } 2950 }
2493 2951
2494 $map 2952 $map
2502 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2503 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2504 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2505 } 2963 }
2506 2964
2507 $done->() if $done; 2965 $done->($self) if $done;
2508 })->prio (1); 2966 })->prio (1);
2509} 2967}
2510 2968
2511=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2512 2970
2532} 2990}
2533 2991
2534sub prepare_random_map { 2992sub prepare_random_map {
2535 my ($exit) = @_; 2993 my ($exit) = @_;
2536 2994
2537 my $guard = cf::lock_acquire "exit_prepare:$exit";
2538
2539 # all this does is basically replace the /! path by 2995 # all this does is basically replace the /! path by
2540 # a new random map path (?random/...) with a seed 2996 # a new random map path (?random/...) with a seed
2541 # that depends on the exit object 2997 # that depends on the exit object
2542 2998
2543 my $rmp = parse_random_map_params $exit->msg; 2999 my $rmp = parse_random_map_params $exit->msg;
2545 if ($exit->map) { 3001 if ($exit->map) {
2546 $rmp->{region} = $exit->region->name; 3002 $rmp->{region} = $exit->region->name;
2547 $rmp->{origin_map} = $exit->map->path; 3003 $rmp->{origin_map} = $exit->map->path;
2548 $rmp->{origin_x} = $exit->x; 3004 $rmp->{origin_x} = $exit->x;
2549 $rmp->{origin_y} = $exit->y; 3005 $rmp->{origin_y} = $exit->y;
3006
3007 $exit->map->touch;
2550 } 3008 }
2551 3009
2552 $rmp->{random_seed} ||= $exit->random_seed; 3010 $rmp->{random_seed} ||= $exit->random_seed;
2553 3011
2554 my $data = cf::to_json $rmp; 3012 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2555 my $md5 = Digest::MD5::md5_hex $data; 3013 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 3014 my $meta = "$RANDOMDIR/$md5.meta";
2557 3015
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 3016 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 3017 aio_write $fh, 0, (length $data), $data, 0;
2560 undef $fh; 3018 undef $fh;
2561 aio_rename "$meta~", $meta; 3019 aio_rename "$meta~", $meta;
2562 3020
3021 my $slaying = "?random/$md5";
3022
3023 if ($exit->valid) {
2563 $exit->slaying ("?random/$md5"); 3024 $exit->slaying ("?random/$md5");
2564 $exit->msg (undef); 3025 $exit->msg (undef);
3026 }
2565 } 3027 }
2566} 3028}
2567 3029
2568sub cf::object::player::enter_exit { 3030sub cf::object::player::enter_exit {
2569 my ($self, $exit) = @_; 3031 my ($self, $exit) = @_;
2570 3032
2571 return unless $self->type == cf::PLAYER; 3033 return unless $self->type == cf::PLAYER;
2572 3034
2573 if ($exit->slaying eq "/!") {
2574 #TODO: this should de-fi-ni-te-ly not be a sync-job
2575 # the problem is that $exit might not survive long enough
2576 # so it needs to be done right now, right here
2577 cf::sync_job { prepare_random_map $exit };
2578 }
2579
2580 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2581 my $hp = $exit->stats->hp;
2582 my $sp = $exit->stats->sp;
2583
2584 $self->enter_link; 3035 $self->enter_link;
2585 3036
2586 # if exit is damned, update players death & WoR home-position
2587 $self->contr->savebed ($slaying, $hp, $sp)
2588 if $exit->flag (FLAG_DAMNED);
2589
2590 (async { 3037 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3038 $Coro::current->{desc} = "enter_exit";
2592 3039
2593 $self->deactivate_recursive; # just to be sure
2594 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
2595 $self->goto ($slaying, $hp, $sp); 3070 $self->goto ($map, $x, $y);
2596 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
2597 1; 3076 1
2598 }) { 3077 }) {
2599 $self->message ("Something went wrong deep within the crossfire server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2600 . "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. "
2601 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2602 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2603 3082
2604 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2605 $self->leave_link; 3084 $self->leave_link;
2606 } 3085 }
2607 })->prio (1); 3086 })->prio (1);
2608} 3087}
2609 3088
2610=head3 cf::client 3089=head3 cf::client
2611 3090
2612=over 4 3091=over 4
2613 3092
2614=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2615 3094
2616Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2617should not be used under normal circumstances. 3096them as required.
2618 3097
2619=cut 3098=cut
2620 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2621sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2622 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2623 3104
2624 utf8::encode $text; 3105 # try lzf for large packets
2625 $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);
2626} 3116}
2627 3117
2628=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2629 3119
2630Send 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
2631client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2632the 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
2633the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2634 3124
2635=cut 3125=cut
2636 3126
3127# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 3128our %CHANNEL = (
3129 "c/motd" => {
3130 id => "infobox",
3131 title => "MOTD",
3132 reply => undef,
3133 tooltip => "The message of the day",
3134 },
2638 "c/identify" => { 3135 "c/identify" => {
2639 id => "infobox", 3136 id => "infobox",
2640 title => "Identify", 3137 title => "Identify",
2641 reply => undef, 3138 reply => undef,
2642 tooltip => "Items recently identified", 3139 tooltip => "Items recently identified",
2645 id => "infobox", 3142 id => "infobox",
2646 title => "Examine", 3143 title => "Examine",
2647 reply => undef, 3144 reply => undef,
2648 tooltip => "Signs and other items you examined", 3145 tooltip => "Signs and other items you examined",
2649 }, 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 },
2650 "c/lookat" => { 3159 "c/lookat" => {
2651 id => "infobox", 3160 id => "infobox",
2652 title => "Look", 3161 title => "Look",
2653 reply => undef, 3162 reply => undef,
2654 tooltip => "What you saw there", 3163 tooltip => "What you saw there",
2655 }, 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 posess 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,
2656); 3245);
2657 3246
2658sub cf::client::send_msg { 3247sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 3248 my ($self, $channel, $msg, $color, @extra) = @_;
2660 3249
2661 $msg = $self->pl->expand_cfpod ($msg); 3250 $msg = $self->pl->expand_cfpod ($msg)
3251 unless $color & cf::NDI_VERBATIM;
2662 3252
2663 $color &= cf::NDI_CLIENT_MASK; # just in case... 3253 $color &= cf::NDI_CLIENT_MASK; # just in case...
2664 3254
2665 # check predefined channels, for the benefit of C 3255 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) { 3256 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel}; 3257 $channel = $CHANNEL{$channel};
2668 3258
2669 $self->ext_msg (channel_info => $channel) 3259 $self->ext_msg (channel_info => $channel);
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id}; 3260 $channel = $channel->{id};
2673 3261
2674 } elsif (ref $channel) { 3262 } elsif (ref $channel) {
2675 # send meta info to client, if not yet sent 3263 # send meta info to client, if not yet sent
2676 unless (exists $self->{channel}{$channel->{id}}) { 3264 unless (exists $self->{channel}{$channel->{id}}) {
2677 $self->{channel}{$channel->{id}} = $channel; 3265 $self->{channel}{$channel->{id}} = $channel;
2678 $self->ext_msg (channel_info => $channel) 3266 $self->ext_msg (channel_info => $channel);
2679 if $self->can_msg;
2680 } 3267 }
2681 3268
2682 $channel = $channel->{id}; 3269 $channel = $channel->{id};
2683 } 3270 }
2684 3271
2685 return unless @extra || length $msg; 3272 return unless @extra || length $msg;
2686 3273
2687 if ($self->can_msg) {
2688 # default colour, mask it out 3274 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3275 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF; 3276 if $color & cf::NDI_DEF;
2691 3277
2692 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3278 my $pkt = "msg "
3279 . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2694 } else { 3281 );
2695 if ($color >= 0) {
2696 # replace some tags by gcfclient-compatible ones
2697 for ($msg) {
2698 1 while
2699 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2700 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2701 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2702 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2703 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2704 }
2705 3282
2706 $color &= cf::NDI_COLOR_MASK; 3283 $self->send_big_packet ($pkt);
2707
2708 utf8::encode $msg;
2709
2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2713 } else {
2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2715 $self->send_packet ("drawinfo $color $msg")
2716 }
2717 }
2718 }
2719} 3284}
2720 3285
2721=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2722 3287
2723Sends an ext event to the client. 3288Sends an ext event to the client.
2725=cut 3290=cut
2726 3291
2727sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2728 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2729 3294
2730 if ($self->extcmd == 2) {
2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove
2733 push @msg, msgtype => "event_$type";
2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 }
2736}
2737
2738=item $client->ext_reply ($msgid, @msg)
2739
2740Sends an ext reply to the client.
2741
2742=cut
2743
2744sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_;
2746
2747 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id;
2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2753 }
2754} 3296}
2755 3297
2756=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
2757 3299
2758Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
2778 3320
2779 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
2780 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
2781 3323
2782 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;
2783} 3364}
2784 3365
2785cf::client->attach ( 3366cf::client->attach (
2786 on_connect => sub { 3367 on_connect => sub {
2787 my ($ns) = @_; 3368 my ($ns) = @_;
2813 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
2814 3395
2815 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2816 3397
2817 if (ref $msg) { 3398 if (ref $msg) {
2818 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2819 "ARRAY" eq ref $msg
2820 ? @$msg
2821 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2822 3400
2823 my @reply;
2824
2825 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}) {
2826 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
2827 } 3419 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2832 } else { 3420 } else {
2833 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";
2834 } 3422 }
2835 3423
2836 cf::override; 3424 cf::override;
2837 }, 3425 },
2838); 3426);
2858 3446
2859 $coro 3447 $coro
2860} 3448}
2861 3449
2862cf::client->attach ( 3450cf::client->attach (
2863 on_destroy => sub { 3451 on_client_destroy => sub {
2864 my ($ns) = @_; 3452 my ($ns) = @_;
2865 3453
2866 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2867 }, 3455 },
2868); 3456);
2884our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
2885 3473
2886$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
2887 3475
2888$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
2889 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
2890 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
2891 sort time 3479 sort time
2892)); 3480));
2893 3481
2894# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
2896=pod 3484=pod
2897 3485
2898The following functions and methods are available within a safe environment: 3486The following functions and methods are available within a safe environment:
2899 3487
2900 cf::object 3488 cf::object
2901 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
2902 insert remove name archname title slaying race decrease_ob_nr 3490 insert remove name archname title slaying race decrease split
3491 value
2903 3492
2904 cf::object::player 3493 cf::object::player
2905 player 3494 player
2906 3495
2907 cf::player 3496 cf::player
2912 3501
2913=cut 3502=cut
2914 3503
2915for ( 3504for (
2916 ["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
2917 insert remove inv name archname title slaying race 3506 insert remove inv nrof name archname title slaying race
2918 decrease_ob_nr)], 3507 decrease split destroy change_exp value msg lore send_msg)],
2919 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
2920 ["cf::player" => qw(peaceful)], 3509 ["cf::player" => qw(peaceful send_msg)],
2921 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
2922) { 3511) {
2923 no strict 'refs';
2924 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
2925 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2926 for @funs; 3514 for @funs;
2927} 3515}
2928 3516
2943 3531
2944 my $qcode = $code; 3532 my $qcode = $code;
2945 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2946 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
2947 3535
3536 %vars = (_dummy => 0) unless %vars;
3537
3538 my @res;
2948 local $_; 3539 local $_;
2949 local @safe::cf::_safe_eval_args = values %vars;
2950 3540
2951 my $eval = 3541 my $eval =
2952 "do {\n" 3542 "do {\n"
2953 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2954 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
2955 . $code 3545 . $code
2956 . "\n}" 3546 . "\n}"
2957 ; 3547 ;
2958 3548
3549 if ($CFG{safe_eval}) {
2959 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
2960 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2961 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 }
2962 3558
2963 if ($@) { 3559 if ($@) {
2964 warn "$@"; 3560 warn "$@",
2965 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
2966 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
2967 } 3563 }
2968 3564
2969 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
2970} 3566}
2971 3567
2985=cut 3581=cut
2986 3582
2987sub register_script_function { 3583sub register_script_function {
2988 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
2989 3585
2990 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
2991 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
2992} 3588}
2993 3589
2994=back 3590=back
2995 3591
2996=cut 3592=cut
2997 3593
2998############################################################################# 3594#############################################################################
2999# the server's init and main functions 3595# the server's init and main functions
3000 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
3001sub load_facedata($) { 3674sub load_facedata($) {
3002 my ($path) = @_; 3675 my ($path) = @_;
3003 3676
3004 # HACK to clear player env face cache, we need some signal framework
3005 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = ();
3007
3008 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3009 3678
3010 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3011 3680
3012 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3013 0 < aio_load $path, $facedata
3014 or die "$path: $!";
3015
3016 $facedata = Coro::Storable::thaw $facedata;
3017 3682
3018 $facedata->{version} == 2 3683 $facedata->{version} == 2
3019 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3020 3685
3021 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3022 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3023 type => FT_RSRC, 3688
3024 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
3025 }; 3690
3026 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3027 3694
3028 { 3695 {
3029 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3030 3697
3031 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3032 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3701
3033 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3035 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};
3036 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};
3037 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3038 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3039 } 3709 }
3040 3710
3041 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3042 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3713
3043 my $idx = cf::face::find $face 3714 my $idx = cf::face::find $face
3044 or next; 3715 or next;
3716
3045 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3048 } else { 3720 } else {
3049 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3050 } 3722 }
3051
3052 cf::cede_to_tick;
3053 } 3723 }
3054 } 3724 }
3055 3725
3056 { 3726 {
3057 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3058 3728
3059 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3060 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3061 cf::cede_to_tick;
3062 } 3731 }
3063 3732
3064 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3065 } 3734 }
3066 3735
3067 { 3736 {
3068 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3071 3738
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 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
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
3077 3743
3078 if ($info->{type} & 1) { 3744 cf::face::set_type $idx, $type;
3079 # prepend meta info 3745 cf::face::set_csum $idx, 0, $info->{hash};
3080 3746 $cf::face::SIZE[0][$idx] = $info->{size};
3081 my $meta = $enc->encode ({ 3747 $cf::face::FOFS[0][$idx] = $info->{fofs};
3082 name => $name, 3748 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3083 %{ $info->{meta} || {} }, 3749 $cf::face::HASH{$info->{hash}} = $idx;
3084 });
3085
3086 $data = pack "(w/a*)*", $meta, $info->{data};
3087 } else { 3750 } else {
3088 $data = $info->{data}; 3751# $RESOURCE{$name} = $info; # unused
3089 } 3752 }
3090
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
3094 cf::cede_to_tick;
3095 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 } 3753 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
3114 } 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
3115 3769
3116 1 3770 1
3117} 3771}
3118 3772
3119register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3121 3775
3122 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v); 3777 $ns->fx_want ($k, $v);
3124 } 3778 }
3125}; 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}
3126 3804
3127sub reload_regions { 3805sub reload_regions {
3128 # 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
3129 # for this (global event?) 3807 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3808 %ext::player_env::MUSIC_FACE_CACHE = ();
3137 if exists $_->{match}; 3815 if exists $_->{match};
3138 } 3816 }
3139} 3817}
3140 3818
3141sub reload_facedata { 3819sub reload_facedata {
3142 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3143 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3144} 3822}
3145 3823
3146sub reload_archetypes { 3824sub reload_archetypes {
3147 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3148 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3149 #d# NEED to laod twice to resolve forward references 3827
3150 # this really needs to be done in an extra post-pass 3828 cf::face::set
3151 # (which needs to be synchronous, so solve it differently) 3829 "res/skill_info" => FT_RSRC,
3152 load_resource_file "$DATADIR/archetypes" 3830 JSON::XS->new->utf8->canonical->encode (
3153 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;
3154} 3853}
3155 3854
3156sub reload_treasures { 3855sub reload_treasures {
3157 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3158 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3159} 3858}
3160 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
3161sub reload_resources { 3880sub reload_resources {
3162 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3163 3882
3883 reload_materials;
3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3887 reload_archetypes;
3164 reload_regions; 3888 reload_regions;
3165 reload_facedata;
3166 #reload_archetypes;#d#
3167 reload_archetypes;
3168 reload_treasures; 3889 reload_treasures;
3169 3890
3170 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3171}
3172
3173sub init {
3174 reload_resources;
3175} 3892}
3176 3893
3177sub reload_config { 3894sub reload_config {
3178 open my $fh, "<:utf8", "$CONFDIR/config" 3895 trace "reloading config file...\n";
3179 or return;
3180 3896
3181 local $/; 3897 my $config = load_file "$CONFDIR/config";
3182 *CFG = YAML::Syck::Load <$fh>; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3183 3900
3184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3185 3902
3186 $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};
3187 $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};
3188 3905
3189 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3193 }; 3910 };
3194 warn $@ if $@; 3911 warn $@ if $@;
3195 } 3912 }
3196} 3913}
3197 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
3198sub 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
3199 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3201 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#
3202 (async { 3956 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3958 EV::run EV::RUN_ONCE;
3205 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3206 }; 3960 };
3207 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;
3208 reload_config; 3976 reload_config;
3209 db_init; 3977
3978 cf::init_uuid;
3979 cf::init_signals;
3980 cf::init_skills;
3981
3982 cf::init_beforeplay;
3983
3984 atomic;
3985
3210 load_extensions; 3986 load_extensions;
3211 3987
3212 $TICK_WATCHER->start; 3988 utime time, time, $RUNTIMEFILE;
3213 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;
3214} 4005}
3215 4006
3216############################################################################# 4007#############################################################################
3217# initialisation and cleanup 4008# initialisation and cleanup
3218 4009
3219# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3220BEGIN { 4011BEGIN {
4012 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3223 reentrant => 0,
3224 data => WF_AUTOCANCEL,
3225 signal => $signal,
3226 prio => 0,
3227 cb => sub {
3228 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3229 },
3230 ); 4016 };
3231 } 4017 }
3232} 4018}
3233 4019
3234sub write_runtime { 4020sub write_runtime_sync {
3235 my $runtime = "$LOCALDIR/runtime"; 4021 my $t0 = AE::time;
3236 4022
3237 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3238 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3239 4025
3240 IO::AIO::aio_utime $runtime, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3241 4027
3242 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3243 4029
3244 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3245 or return; 4031 or return;
3246 4032
3247 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3248 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3249 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3259 aio_utime $fh, undef, undef; 4045 aio_utime $fh, undef, undef;
3260 4046
3261 close $fh 4047 close $fh
3262 or return; 4048 or return;
3263 4049
3264 aio_rename "$runtime~", $runtime 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3265 and return; 4051 and return;
3266 4052
3267 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3268 4054
3269 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 };
3270} 4106}
3271 4107
3272sub emergency_save() { 4108sub emergency_save() {
3273 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3274 4110
3275 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;
3276 4117
3277 cf::sync_job { 4118 cf::sync_job {
4119 cf::write_runtime_sync; # external watchdog should not bark
4120
3278 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3279 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3280 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3281 warn "begin emergency player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3282 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3283 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3284 $pl->valid or next; 4127 $pl->valid or next;
3285 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3286 $pl->save; 4129 $pl->save;
3287 } 4130 }
3288 warn "end emergency player save\n"; 4131 info "emergency_perl_save: end player save\n";
3289 4132
3290 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";
3291 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3292 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3293 $map->valid or next; 4138 $map->valid or next;
3294 $map->save; 4139 $map->save;
3295 } 4140 }
3296 warn "end emergency map save\n"; 4141 info "emergency_perl_save: end map save\n";
3297 4142
3298 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";
3299 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3300 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
3301 }; 4171 };
3302 4172
3303 warn "leave emergency perl save\n"; 4173 info "emergency_perl_save: leave\n";
3304} 4174}
3305 4175
3306sub post_cleanup { 4176sub post_cleanup {
3307 my ($make_core) = @_; 4177 my ($make_core) = @_;
3308 4178
4179 IO::AIO::flush;
4180
3309 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3310 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 }
3311} 4211}
3312 4212
3313sub do_reload_perl() { 4213sub do_reload_perl() {
3314 # can/must only be called in main 4214 # can/must only be called in main
3315 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3316 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3317 return; 4217 return;
3318 } 4218 }
3319 4219
3320 warn "reloading..."; 4220 return if $RELOAD++;
3321 4221
3322 warn "entering sync_job"; 4222 my $t1 = AE::time;
3323 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
3324 cf::sync_job { 4230 cf::sync_job {
3325 cf::write_runtime; # external watchdog should not bark
3326 cf::emergency_save; 4231 #cf::emergency_save;
3327 cf::write_runtime; # external watchdog should not bark
3328 4232
3329 warn "syncing database to disk";
3330 BDB::db_env_txn_checkpoint $DB_ENV;
3331
3332 # if anything goes wrong in here, we should simply crash as we already saved
3333
3334 warn "cancelling all WF_AUTOCANCEL watchers";
3335 for (Event::all_watchers) {
3336 $_->cancel if $_->data & WF_AUTOCANCEL;
3337 }
3338
3339 warn "flushing outstanding aio requests";
3340 for (;;) {
3341 BDB::flush;
3342 IO::AIO::flush;
3343 Coro::cede;
3344 last unless IO::AIO::nreqs || BDB::nreqs;
3345 warn "iterate...";
3346 }
3347
3348 ++$RELOAD;
3349
3350 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3351 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3352 %EXT_CORO = (); 4235 %EXT_CORO = ();
3353 4236
3354 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3355 %COMMAND = (); 4238 %COMMAND = ();
3356 4239
3357 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3358 %EXTCMD = (); 4241 %EXTCMD = ();
3359 %EXTICMD = (); 4242 %EXTICMD = ();
3360 4243
3361 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3362 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3363 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3364 4247
3365 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3366 eval { 4249 eval {
3367 $cb->($pkg); 4250 $cb->($pkg);
3368 1 4251 1
3369 } 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;
3370 } 4257 }
3371 4258
3372 warn "... nuking $pkg";
3373 Symbol::delete_package $pkg;
3374 }
3375
3376 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3377 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3378 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3379 4262
3380 warn "... unloading $k"; 4263 trace "... unloading $k";
3381 delete $INC{$k}; 4264 delete $INC{$k};
3382 4265
3383 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3384 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3385 4268
3386 if (my $cb = $k->can ("unload_module")) { 4269 if (my $cb = $k->can ("unload_module")) {
3387 $cb->(); 4270 $cb->();
4271 }
4272
4273 clear_package $k;
3388 } 4274 }
3389 4275
3390 Symbol::delete_package $k;
3391 }
3392
3393 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3394 Symbol::delete_package "safe::$_" 4277 clear_package "safe::$_"
3395 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);
3396 4279
3397 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3398 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3399 delete $INC{"cf/pod.pm"}; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3400 4283
3401 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3402 # and global variables created in xs 4285 # and global variables created in xs
3403 #Symbol::delete_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3404 4287
3405 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3406 4289
3407 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3408 require cf; 4291 require cf;
3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4292 cf::_connect_to_perl_1;
3410 4293
3411 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3412 cf::reload_config; 4295 cf::reload_config;
3413 4296
3414 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3415 cf::load_extensions; 4298 cf::load_extensions;
3416 4299
4300 if ($REATTACH_ON_RELOAD) {
3417 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3418 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3419 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3420 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3421 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3422 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
4307 }
3423 4308
3424 warn "leaving sync_job"; 4309 cf::_post_init 1;
3425 4310
4311 trace "perl_reload: leaving sync_job";
4312
3426 1 4313 1
3427 } or do { 4314 } or do {
3428 warn $@; 4315 error $@;
3429 warn "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3430 exit 1; 4317 };
4318
4319 --$RELOAD;
3431 }; 4320 }
3432 4321
3433 warn "reloaded"; 4322 $t1 = AE::time - $t1;
4323 info "perl_reload: completed in ${t1}s\n";
3434}; 4324};
3435 4325
3436our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3437 4327
3438sub reload_perl() { 4328sub reload_perl() {
3439 # doing reload synchronously and two reloads happen back-to-back, 4329 # doing reload synchronously and two reloads happen back-to-back,
3440 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3441 4331
3442 $RELOAD_WATCHER ||= Event->timer ( 4332 $RELOAD_WATCHER ||= cf::async {
3443 reentrant => 0, 4333 Coro::AIO::aio_wait cache_extensions;
3444 after => 0, 4334
3445 data => WF_AUTOCANCEL, 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3446 cb => sub {
3447 do_reload_perl; 4336 do_reload_perl;
3448 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
3449 }, 4338 };
3450 ); 4339 };
3451} 4340}
3452 4341
3453register_command "reload" => sub { 4342register_command "reload" => sub {
3454 my ($who, $arg) = @_; 4343 my ($who, $arg) = @_;
3455 4344
3460 reload_perl; 4349 reload_perl;
3461 }; 4350 };
3462 } 4351 }
3463}; 4352};
3464 4353
3465unshift @INC, $LIBDIR; 4354#############################################################################
3466 4355
3467my $bug_warning = 0; 4356my $bug_warning = 0;
3468 4357
3469our @WAIT_FOR_TICK;
3470our @WAIT_FOR_TICK_BEGIN;
3471
3472sub wait_for_tick { 4358sub wait_for_tick() {
3473 return unless $TICK_WATCHER->is_active; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3474 return if $Coro::current == $Coro::main;
3475 4360
3476 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3477 push @WAIT_FOR_TICK, $signal;
3478 $signal->wait;
3479} 4362}
3480 4363
3481sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3482 return unless $TICK_WATCHER->is_active; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3483 return if $Coro::current == $Coro::main;
3484 4366
3485 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3486 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3487 $signal->wait; 4369 $signal->wait;
3488} 4370}
3489 4371
3490$TICK_WATCHER = Event->timer ( 4372sub tick {
3491 reentrant => 0,
3492 parked => 1,
3493 prio => 0,
3494 at => $NEXT_TICK || $TICK,
3495 data => WF_AUTOCANCEL,
3496 cb => sub {
3497 if ($Coro::current != $Coro::main) { 4373 if ($Coro::current != $Coro::main) {
3498 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"
3499 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3500 return; 4376 return;
3501 } 4377 }
3502 4378
3503 $NOW = $tick_start = Event::time; 4379 cf::one_tick; # one server iteration
3504 4380
3505 cf::server_tick; # one server iteration 4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3506 4382
3507 $RUNTIME += $TICK;
3508 $NEXT_TICK += $TICK;
3509
3510 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3511 $NEXT_RUNTIME_WRITE = $NOW + 10; 4384 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3512 Coro::async_pool { 4385 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3514 write_runtime 4387 write_runtime_sync
3515 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3516 };
3517 } 4389 };
4390 }
3518 4391
3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3520 $sig->send; 4393 $sig->send;
3521 } 4394 }
3522 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3523 $sig->send;
3524 }
3525 4396
3526 $NOW = Event::time; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3527
3528 # if we are delayed by four ticks or more, skip them all
3529 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3530
3531 $TICK_WATCHER->at ($NEXT_TICK);
3532 $TICK_WATCHER->start;
3533
3534 $LOAD = ($NOW - $tick_start) / $TICK;
3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3536 4399
3537 _post_tick; 4400 if (0) {
4401 if ($NEXT_TICK) {
4402 my $jitter = $TICK_START - $NEXT_TICK;
4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4404 debug "jitter $JITTER\n";#d#
4405 }
3538 }, 4406 }
3539); 4407}
3540 4408
3541{ 4409{
4410 # configure BDB
4411 info "initialising database";
4412
3542 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3543 BDB::max_poll_time $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3544 $BDB_POLL_WATCHER = Event->io ( 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3545 reentrant => 0,
3546 fd => BDB::poll_fileno,
3547 poll => 'r',
3548 prio => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => \&BDB::poll_cb,
3551 );
3552
3553 BDB::set_sync_prepare {
3554 my $status;
3555 my $current = $Coro::current;
3556 (
3557 sub {
3558 $status = $!;
3559 $current->ready; undef $current;
3560 },
3561 sub {
3562 Coro::schedule while defined $current;
3563 $! = $status;
3564 },
3565 )
3566 };
3567 4416
3568 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3569 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3571 | BDB::LOG_AUTOREMOVE, 1); 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;
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4422 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4423 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3574 4424
3575 cf::sync_job { 4425 cf::sync_job {
3576 eval { 4426 eval {
3586 4436
3587 cf::cleanup "db_env_open(db): $@" if $@; 4437 cf::cleanup "db_env_open(db): $@" if $@;
3588 }; 4438 };
3589 } 4439 }
3590 4440
3591 $BDB_DEADLOCK_WATCHER = Event->timer ( 4441 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4442 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 ); 4443 };
3601 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4444 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 ); 4446 };
3611 $BDB_TRICKLE_WATCHER = Event->timer ( 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 ); 4449 };
4450
4451 info "database initialised";
3621} 4452}
3622 4453
3623{ 4454{
4455 # configure IO::AIO
4456
4457 info "initialising aio";
3624 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3625
3626 undef $Coro::AIO::WATCHER;
3627 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3628 $AIO_POLL_WATCHER = Event->io ( 4460 undef $AnyEvent::AIO::WATCHER;
3629 reentrant => 0, 4461 info "aio initialised";
3630 data => WF_AUTOCANCEL,
3631 fd => IO::AIO::poll_fileno,
3632 poll => 'r',
3633 prio => 0,
3634 cb => \&IO::AIO::poll_cb,
3635 );
3636} 4462}
3637 4463
3638my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3639 4466
3640sub _log_backtrace { 4467sub _log_backtrace {
3641 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3642 4469
3643 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3644 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3645 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3646 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3647 ++$_log_backtrace; 4478 ++$_log_backtrace;
4479 my $perl_bt = Carp::longmess $msg;
3648 async { 4480 async {
3649 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
3650 4482
3651 my @bt = fork_call { 4483 my @bt = fork_call {
3652 @addr = map { sprintf "%x", $_ } @addr; 4484 @addr = map { sprintf "%x", $_ } @addr;
3663 } 4495 }
3664 4496
3665 @funcs 4497 @funcs
3666 }; 4498 };
3667 4499
3668 LOG llevInfo, "[ABT] $msg\n"; 4500 LOG llevInfo, "[ABT] $perl_bt\n";
4501 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3669 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
3670 --$_log_backtrace; 4503 --$_log_backtrace;
3671 }; 4504 };
3672 } else { 4505 } else {
3673 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
3674 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3675 } 4508 }
3676} 4509}
3677 4510
3678# load additional modules 4511# load additional modules
3679use cf::pod; 4512require "cf/$_.pm" for @EXTRA_MODULES;
4513cf::_connect_to_perl_2;
3680 4514
3681END { cf::emergency_save } 4515END { cf::emergency_save }
3682 4516
36831 45171
3684 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines