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.432 by root, Mon May 5 22:38:47 2008 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
36use Coro 4.50 (); 41use Coro ();
37use Coro::State; 42use Coro::State;
38use Coro::Handle; 43use Coro::Handle;
39use Coro::EV; 44use Coro::EV;
45use Coro::AnyEvent;
40use Coro::Timer; 46use Coro::Timer;
41use Coro::Signal; 47use Coro::Signal;
42use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
50use Coro::AnyEvent;
43use Coro::AIO; 51use Coro::AIO;
44use Coro::BDB; 52use Coro::BDB 1.6;
45use Coro::Storable; 53use Coro::Storable;
46use Coro::Util (); 54use Coro::Util ();
47 55
56use Guard ();
48use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
49use BDB (); 58use BDB ();
50use Data::Dumper; 59use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 60use Fcntl;
53use YAML (); 61use YAML::XS ();
54use IO::AIO 2.51 (); 62use IO::AIO ();
55use Time::HiRes; 63use Time::HiRes;
56use Compress::LZF; 64use Compress::LZF;
57use Digest::MD5 (); 65use Digest::MD5 ();
66
67AnyEvent::detect;
58 68
59# configure various modules to our taste 69# configure various modules to our taste
60# 70#
61$Storable::canonical = 1; # reduce rsync transfers 71$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 79
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 82
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
68 86
69our %COMMAND = (); 87our %COMMAND = ();
70our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
71 89
72our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 91our %EXTCMD = ();
74our %EXTICMD = (); 92our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
77 95
78our $RELOAD; # number of reloads so far 96our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
80 100
81our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
82our $DATADIR = datadir; 103our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
86our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 114our $PIDFILE = "$LOCALDIR/pid";
115our $RUNTIMEFILE = "$LOCALDIR/runtime";
116
117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
93 124
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 127our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 128our $USE_FSYNC = 1; # use fsync to write maps - default on
99 129
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 133our $DB_ENV;
105 134
135our @EXTRA_MODULES = qw(pod match mapscript incloader);
136
106our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
107 139
108our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
110our $NOW; 143our $NOW;
111 144
112our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
113our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
114our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 152our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 153our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 154our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 155our $TICK_START; # for load detecting purposes
123 156
157our @POST_INIT;
158
159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
164
124binmode STDOUT; 165binmode STDOUT;
125binmode STDERR; 166binmode STDERR;
126 167
127# read virtual server time, if available 168# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 169unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 170 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
132} 173}
174
175eval "sub TICK() { $TICK } 1" or die;
133 176
134mkdir $_ 177mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 179
137our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
138 181
139sub cf::map::normalise; 182sub cf::map::normalise;
140 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
141############################################################################# 188#############################################################################
142 189
190%REFLECT = ();
191for (@REFLECT) {
192 my $reflect = JSON::XS::decode_json $_;
193 $REFLECT{$reflect->{class}} = $reflect;
194}
195
196# this is decidedly evil
197$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
198
199#############################################################################
200
143=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
144 202
145=over 4 203=over 4
146 204
147=item $cf::UPTIME 205=item $cf::UPTIME
148 206
149The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
150 223
151=item $cf::RUNTIME 224=item $cf::RUNTIME
152 225
153The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
154every server tick. 227every server tick.
155 228
156=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
157$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
158$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
159 232
160Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
161directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
162unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
163database environment. 236database environment.
164 237
165=item $cf::NOW
166
167The time of the last (current) server tick.
168
169=item $cf::TICK
170
171The interval between server ticks, in seconds.
172
173=item $cf::LOADAVG 238=item $cf::LOADAVG
174 239
175The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
176(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
177objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
186from wherever your confdir points to. 251from wherever your confdir points to.
187 252
188=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
189 254
190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
191returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
275
194=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
195 277
196This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 280that call.
199 281
282=item %cf::REFLECT
283
284Contains, for each (C++) class name, a hash reference with information
285about object members (methods, scalars, arrays and flags) and other
286metadata, which is useful for introspection.
287
200=back 288=back
201 289
202=cut 290=cut
203 291
204BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
298$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 299 my $msg = join "", @_;
207 300
208 $msg .= "\n" 301 $msg .= "\n"
209 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
210 303
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 305
213 LOG llevError, $msg; 306 LOG llevWarn, $msg;
214 }; 307};
215}
216 308
217$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
219 311
220 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 316 return;#d#
223 }#d# 317 }#d#
224 318
225 # kill coroutine otherwise 319 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 320 Coro::terminate
228}; 321};
229
230$SIG{__DIE__} = sub { }; #d#?
231 322
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 333for my $pkg (qw(
243 cf::global cf::attachable 334 cf::global cf::attachable
244 cf::object cf::object::player 335 cf::object cf::object::player
245 cf::client cf::player 336 cf::client cf::player
246 cf::arch cf::living 337 cf::arch cf::living
338 cf::map cf::mapspace
247 cf::map cf::party cf::region 339 cf::party cf::region
248)) { 340)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 342}
252 343
253$EV::DIED = sub { 344$EV::DIED = sub {
254 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
255}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
256 352
257############################################################################# 353#############################################################################
258 354
259=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
260 356
281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
282 $d 378 $d
283 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
284} 380}
285 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
286=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
287 435
288Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
289 437
290=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 445
298sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
300 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
480=item cf::post_init { BLOCK }
481
482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
483but I<before> the server starts ticking again.
484
485The codeblock will have a single boolean argument to indicate whether this
486is a reload or not.
487
488=cut
489
490sub post_init(&) {
491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
509}
510
301=item cf::lock_wait $string 511=item cf::lock_wait $string
302 512
303Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
304 514
305=item my $lock = cf::lock_acquire $string 515=item my $lock = cf::lock_acquire $string
306 516
307Wait until the given lock is available and then acquires it and returns 517Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 518a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 519for example when the coroutine gets canceled), the lock is automatically
310returned. 520returned.
311 521
312Locks are *not* recursive, locking from the same coro twice results in a 522Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 523deadlocked coro.
319 529
320Return true if the lock is currently active, i.e. somebody has locked it. 530Return true if the lock is currently active, i.e. somebody has locked it.
321 531
322=cut 532=cut
323 533
324our %LOCK; 534our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 535
327sub lock_wait($) { 536sub lock_wait($) {
328 my ($key) = @_; 537 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 538}
341 539
342sub lock_acquire($) { 540sub lock_acquire($) {
343 my ($key) = @_; 541 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 542}
357 543
358sub lock_active($) { 544sub lock_active($) {
359 my ($key) = @_; 545 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 546}
363 547
364sub freeze_mainloop { 548sub freeze_mainloop {
365 tick_inhibit_inc; 549 tick_inhibit_inc;
366 550
367 Coro::guard \&tick_inhibit_dec; 551 &Guard::guard (\&tick_inhibit_dec);
368} 552}
369 553
370=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
371 555
372Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 557get spread over time.
374 558
375=cut 559=cut
376 560
377sub periodic($$) { 561sub periodic($$) {
378 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
383} 567}
384 568
385=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
386 570
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
388This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
389of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
390 578
391The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
393 581
394Useful for short background jobs. 582Useful for short background jobs.
395 583
396=cut 584=cut
397 585
398our @SLOT_QUEUE; 586our @SLOT_QUEUE;
399our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
400 589
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
404 593
405 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
406 596
407 while () { 597 while () {
408 next_job: 598 next_job:
599
409 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 601
411 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 606 $job->[2]->send;
415 Coro::cede; 607 Coro::cede;
416 goto next_job; 608 goto next_job;
417 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 611 }
419 } 612 }
420 613
421 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
424 $signal->wait;
425 } else { 617 } else {
618 $busy = 0;
426 Coro::schedule; 619 Coro::schedule;
427 } 620 }
428 } 621 }
429}; 622};
430 623
431sub get_slot($;$$) { 624sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
433 626
434 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
435 628
436 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
437 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
438 632
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
467=cut 661=cut
468 662
469sub sync_job(&) { 663sub sync_job(&) {
470 my ($job) = @_; 664 my ($job) = @_;
471 665
472 if ($Coro::current == $Coro::main) { 666 if (in_main) {
473 my $time = EV::time; 667 my $time = AE::time;
474 668
475 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
477 671
478 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
479 673
480 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
481 675
482 my $busy = 1; 676 my $busy = 1;
483 my @res; 677 my @res;
484 678
485 (async { 679 (async {
486 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 681 @res = eval { $job->() };
488 warn $@ if $@; 682 error $@ if $@;
489 undef $busy; 683 undef $busy;
490 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
491 685
492 while ($busy) { 686 while ($busy) {
493 if (Coro::nready) { 687 if (Coro::nready) {
495 } else { 689 } else {
496 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
497 } 691 }
498 } 692 }
499 693
500 my $time = EV::time - $time; 694 my $time = AE::time - $time;
501 695
502 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
503 697
504 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
505 } else { 699 } else {
527 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
528 722
529 $coro 723 $coro
530} 724}
531 725
532=item fork_call { }, $args 726=item fork_call { }, @args
533 727
534Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 731never block itself or use any form of event handling.
538 732
539=cut 733=cut
540 734
735sub post_fork {
736 reset_signals;
737}
738
541sub fork_call(&@) { 739sub fork_call(&@) {
542 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
543 741
544 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
547 745
548 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
549 reset_signals; 747 cf::post_fork;
550 &$cb 748 &$cb
551 }, @args; 749 } @args;
552 750
553 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
554} 763}
555 764
556=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
557 766
558=cut 767=cut
595within each server. 804within each server.
596 805
597=cut 806=cut
598 807
599sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
600 my ($name) = @_; 812 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
602 814
603 eval { 815 eval {
604 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
614} 826}
615 827
616our $DB; 828our $DB;
617 829
618sub db_init { 830sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
621 };
622} 832}
623 833
624sub db_get($$) { 834sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
626 836
627 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
628 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
629 841
630 $! ? () 842 $! ? ()
631 : $data 843 : $data
632 }
633} 844}
634 845
635sub db_put($$$) { 846sub db_put($$$) {
636 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 876
666 my @data; 877 my @data;
667 my $md5; 878 my $md5;
668 879
669 for (0 .. $#$src) { 880 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 882 }
673 883
674 # if processing is expensive, check 884 # if processing is expensive, check
675 # checksum first 885 # checksum first
676 if (1) { 886 if (1) {
693 903
694 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 905 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
697 907
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 909
700 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
703 913
713 923
714=cut 924=cut
715 925
716sub datalog($@) { 926sub datalog($@) {
717 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 929}
720 930
721=back 931=back
722 932
723=cut 933=cut
724 934
725############################################################################# 935#############################################################################
726 936
727=head2 ATTACHABLE OBJECTS 937=head2 ATTACHABLE OBJECTS
728 938
729Many objects in crossfire are so-called attachable objects. That means you can 939Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 940attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 941to it. All such attachable objects support the following methods.
732 942
733In the following description, CLASS can be any of C<global>, C<object> 943In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 944C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 994=item cf::CLASS::attachment $name, ...
785 995
786Register an attachment by C<$name> through which attachable objects of the 996Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 997given CLASS can refer to this attachment.
788 998
789Some classes such as crossfire maps and objects can specify attachments 999Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 1000that are attached at load/instantiate time, thus the need for a name.
791 1001
792These calls expect any number of the following handler/hook descriptions: 1002These calls expect any number of the following handler/hook descriptions:
793 1003
794=over 4 1004=over 4
918 1128
919 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1131
922 } elsif (ref $type) { 1132 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
924 1134
925 } else { 1135 } else {
926 shift @arg; 1136 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
928 } 1138 }
929 } 1139 }
930} 1140}
931 1141
932sub _object_attach { 1142sub _object_attach {
942 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
943 } 1153 }
944 1154
945 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
946 } else { 1156 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1158 }
949 1159
950 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
951} 1161}
952 1162
1011 1221
1012 for (@$callbacks) { 1222 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1014 1224
1015 if ($@) { 1225 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1227 override;
1019 } 1228 }
1020 1229
1021 return 1 if $override; 1230 return 1 if $override;
1022 } 1231 }
1085 1294
1086sub reattach { 1295sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1296 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1297 my ($obj) = @_;
1089 1298
1299 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1300 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1301
1092 my $registry = $obj->registry; 1302 my $registry = $obj->registry;
1093 1303
1094 @$registry = (); 1304 @$registry = ();
1095 1305
1100 for (@$attach) { 1310 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1103 } 1313 }
1104 } else { 1314 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1316 }
1107 } 1317 }
1108} 1318}
1109 1319
1110cf::attachable->attach ( 1320cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1138 1348
1139 sync_job { 1349 sync_job {
1140 if (length $$rdata) { 1350 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1144 1355
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1359 if ($cf::USE_FSYNC) {
1360 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;
1361 aio_fsync $fh;
1362 }
1149 aio_close $fh; 1363 aio_close $fh;
1150 1364
1151 if (@$objs) { 1365 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1366 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1367 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1370 if ($cf::USE_FSYNC) {
1371 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;
1372 aio_fsync $fh;
1373 }
1157 aio_close $fh; 1374 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1376 }
1160 } else { 1377 } else {
1161 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1162 } 1379 }
1163 1380
1164 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1382
1383 $filename =~ s%/[^/]+$%%;
1384 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1385 } else {
1166 warn "FATAL: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1167 } 1387 }
1168 } else { 1388 } else {
1169 aio_unlink $filename; 1389 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1171 } 1391 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1416 $av = $st->{objs};
1197 } 1417 }
1198 1418
1199 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1202 1423
1203 ($data, $av) 1424 ($data, $av)
1204} 1425}
1205 1426
1206=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1210=cut 1431=cut
1211 1432
1212############################################################################# 1433#############################################################################
1213# command handling &c 1434# command handling &c
1214 1435
1215=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1216 1437
1217Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1218$name. 1439$name.
1219 1440
1220=cut 1441=cut
1226 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1227 1448
1228 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1229} 1450}
1230 1451
1231=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1232 1453
1233Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1234extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1235received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1236the logged-in player. Ext commands can only be processed after a player 1457the logged-in player. Ext commands can only be processed after a player
1237has logged in successfully. 1458has logged in successfully.
1238 1459
1239If the callback returns something, it is sent back as if reply was being 1460If the callback returns something, it is sent back as if reply was being
1240called. 1461called.
1241 1462
1242=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1243 1464
1244Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1245exticmd packet. Exti commands are processed by the server as soon as they 1466exticmd packet. Exti commands are processed by the server as soon as they
1246are received, i.e. out of order w.r.t. other commands. The first argument 1467are received, i.e. out of order w.r.t. other commands. The first argument
1247is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
1262 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1263 1484
1264 $EXTICMD{$name} = $cb; 1485 $EXTICMD{$name} = $cb;
1265} 1486}
1266 1487
1488use File::Glob ();
1489
1267cf::player->attach ( 1490cf::player->attach (
1268 on_command => sub { 1491 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1270 1493
1271 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1272 or return; 1495 or return;
1273 1496
1281 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1282 1505
1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1284 1507
1285 if (ref $msg) { 1508 if (ref $msg) {
1286 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290 1510
1291 my @reply; 1511 my @reply;
1292 1512
1293 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1294 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1295 } 1515 }
1296 1516
1297 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("reply-$reply", @reply)
1298 if $reply; 1518 if $reply;
1299 1519
1300 } else { 1520 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1522 }
1303 1523
1304 cf::override; 1524 cf::override;
1305 }, 1525 },
1306); 1526);
1307 1527
1528# "readahead" all extensions
1529sub cache_extensions {
1530 my $grp = IO::AIO::aio_group;
1531
1532 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1533 for (grep /\.ext$/, @{$_[0]}) {
1534 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1535 }
1536 };
1537
1538 $grp
1539}
1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1308sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1309 cf::sync_job { 1557 cf::sync_job {
1310 my %todo; 1558 my %todo;
1311 1559
1312 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1561 next unless -r $path;
1331 1579
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1582
1335 $ext{source} = 1583 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1338 . $source 1586 . $source
1339 . "\n};\n1"; 1587 . "\n};\n1";
1340 1588
1341 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1342 } 1590 }
1343 1591
1592 my $pass = 0;
1344 my %done; 1593 my %done;
1345 while (%todo) { 1594 while (%todo) {
1346 my $progress; 1595 my $progress;
1347 1596
1597 ++$pass;
1598
1599 ext:
1348 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1602 next ext
1351 unless exists $done{$_}; 1603 unless exists $done{$_};
1352 } 1604 }
1353 1605
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1607
1356 unless (eval $v->{source}) { 1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1617 my $active = eval $source;
1618
1619 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1621
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1623 if exists $v->{meta}{mandatory};
1364 1624
1365 warn $msg; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1627 } else {
1628 $done{$k} = delete $todo{$k};
1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1366 } 1634 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1635 }
1372 1636
1373 skip: 1637 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1639
1640 while (my ($k, $v) = each %todo) {
1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1642 if exists $v->{meta}{mandatory};
1643 }
1644
1645 last;
1646 }
1376 } 1647 }
1377 }; 1648 };
1378} 1649}
1379 1650
1380############################################################################# 1651#############################################################################
1381 1652
1382=back 1653=back
1383 1654
1384=head2 CORE EXTENSIONS 1655=head2 CORE EXTENSIONS
1385 1656
1386Functions and methods that extend core crossfire objects. 1657Functions and methods that extend core deliantra objects.
1387 1658
1388=cut 1659=cut
1389 1660
1390package cf::player; 1661package cf::player;
1391 1662
1434 1705
1435sub exists($) { 1706sub exists($) {
1436 my ($login) = @_; 1707 my ($login) = @_;
1437 1708
1438 $cf::PLAYER{$login} 1709 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1710 or !aio_stat path $login
1440} 1711}
1441 1712
1442sub find($) { 1713sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1714 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1715 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1465 } 1736 }
1466 } 1737 }
1467} 1738}
1468 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1469sub save($) { 1753sub save($) {
1470 my ($pl) = @_; 1754 my ($pl) = @_;
1471 1755
1472 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1473 1757
1478 1762
1479 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1481 1765
1482 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1483 1770
1484 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1772 cf::cede_to_tick;
1486} 1773}
1487 1774
1519 my ($pl) = @_; 1806 my ($pl) = @_;
1520 1807
1521 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1522 1809
1523 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1812
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1527 $pl->deactivate; 1814 $pl->deactivate;
1815
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1530 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1531 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1532 1821
1533 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1534 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1535 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1589 \@logins 1878 \@logins
1590} 1879}
1591 1880
1592=item $player->maps 1881=item $player->maps
1593 1882
1883=item cf::player::maps $login
1884
1594Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1595player. May block. 1886player. May block.
1596 1887
1597=cut 1888=cut
1598 1889
1615 } 1906 }
1616 1907
1617 \@paths 1908 \@paths
1618} 1909}
1619 1910
1620=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1621 1912
1622Expand crossfire pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1623
1624=cut
1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1637sub expand_cfpod {
1638 my ($self, $pod) = @_;
1639
1640 my $xml;
1641
1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1645
1646 $group =~ s/&/&amp;/g;
1647 $group =~ s/</&lt;/g;
1648
1649 $xml .= $group;
1650 } elsif ($pod =~ m%\G
1651 ([BCGHITU])
1652 <
1653 (?:
1654 ([^<>]*) (?{ $group = $^N })
1655 | < $interior >
1656 )
1657 >
1658 %gcsx
1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1679 "")
1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1691
1692 for ($xml) {
1693 # create single paragraphs (very hackish)
1694 s/(?<=\S)\n(?=\w)/ /g;
1695
1696 # compress some whitespace
1697 s/\s+\n/\n/g; # ws line-ends
1698 s/\n\n+/\n/g; # double lines
1699 s/^\n+//; # beginning lines
1700 s/\n+$//; # ending lines
1701 }
1702
1703 $xml
1704}
1705
1706no re 'eval';
1707
1708sub hintmode {
1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1710 $_[0]{hintmode}
1711}
1712
1713=item $player->ext_reply ($msgid, @msg)
1714
1715Sends an ext reply to the player.
1716
1717=cut
1718
1719sub ext_reply($$@) {
1720 my ($self, $id, @msg) = @_;
1721
1722 $self->ns->ext_reply ($id, @msg)
1723}
1724 1914
1725=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1726 1916
1727Sends an ext event to the client. 1917Sends an ext event to the client.
1728 1918
1748 1938
1749=cut 1939=cut
1750 1940
1751sub find_by_path($) { 1941sub find_by_path($) {
1752 my ($path) = @_; 1942 my ($path) = @_;
1943
1944 $path =~ s/^~[^\/]*//; # skip ~login
1753 1945
1754 my ($match, $specificity); 1946 my ($match, $specificity);
1755 1947
1756 for my $region (list) { 1948 for my $region (list) {
1757 if ($region->{match} && $path =~ $region->{match}) { 1949 if ($region->{match} && $path =~ $region->{match}) {
1786sub generate_random_map { 1978sub generate_random_map {
1787 my ($self, $rmp) = @_; 1979 my ($self, $rmp) = @_;
1788 1980
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1981 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790 1982
1791 # mit "rum" bekleckern, nicht
1792 $self->_create_random_map ( 1983 $self->_create_random_map ($rmp);
1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1796 $rmp->{exit_on_final_map},
1797 $rmp->{xsize}, $rmp->{ysize},
1798 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1799 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1800 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1801 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1802 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1803 (cf::region::find $rmp->{region}), $rmp->{custom}
1804 )
1805} 1984}
1806 1985
1807=item cf::map->register ($regex, $prio) 1986=item cf::map->register ($regex, $prio)
1808 1987
1809Register a handler for the map path matching the given regex at the 1988Register a handler for the map path matching the given regex at the
1814 1993
1815sub register { 1994sub register {
1816 my (undef, $regex, $prio) = @_; 1995 my (undef, $regex, $prio) = @_;
1817 my $pkg = caller; 1996 my $pkg = caller;
1818 1997
1819 no strict;
1820 push @{"$pkg\::ISA"}, __PACKAGE__; 1998 push @{"$pkg\::ISA"}, __PACKAGE__;
1821 1999
1822 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2000 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1823} 2001}
1824 2002
1825# also paths starting with '/' 2003# also paths starting with '/'
1826$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2004$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1827 2005
1828sub thawer_merge { 2006sub thawer_merge {
1829 my ($self, $merge) = @_; 2007 my ($self, $merge) = @_;
1830 2008
1831 # we have to keep some variables in memory intact 2009 # we have to keep some variables in memory intact
1836} 2014}
1837 2015
1838sub normalise { 2016sub normalise {
1839 my ($path, $base) = @_; 2017 my ($path, $base) = @_;
1840 2018
1841 $path = "$path"; # make sure its a string 2019 $path = "$path"; # make sure it's a string
1842 2020
1843 $path =~ s/\.map$//; 2021 $path =~ s/\.map$//;
1844 2022
1845 # map plan: 2023 # map plan:
1846 # 2024 #
1861 $base =~ s{[^/]+/?$}{}; 2039 $base =~ s{[^/]+/?$}{};
1862 $path = "$base/$path"; 2040 $path = "$base/$path";
1863 } 2041 }
1864 2042
1865 for ($path) { 2043 for ($path) {
1866 redo if s{//}{/};
1867 redo if s{/\.?/}{/}; 2044 redo if s{/\.?/}{/};
1868 redo if s{/[^/]+/\.\./}{/}; 2045 redo if s{/[^/]+/\.\./}{/};
1869 } 2046 }
1870 2047
1871 $path 2048 $path
1885 $self->init; # pass $1 etc. 2062 $self->init; # pass $1 etc.
1886 return $self; 2063 return $self;
1887 } 2064 }
1888 } 2065 }
1889 2066
1890 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1891 () 2068 ()
1892} 2069}
1893 2070
2071# may re-bless or do other evil things
1894sub init { 2072sub init {
1895 my ($self) = @_; 2073 my ($self) = @_;
1896 2074
1897 $self 2075 $self
1898} 2076}
1929 2107
1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2108 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1931 "$UNIQUEDIR/$path" 2109 "$UNIQUEDIR/$path"
1932} 2110}
1933 2111
1934# and all this just because we cannot iterate over
1935# all maps in C++...
1936sub change_all_map_light {
1937 my ($change) = @_;
1938
1939 $_->change_map_light ($change)
1940 for grep $_->outdoor, values %cf::MAP;
1941}
1942
1943sub decay_objects { 2112sub decay_objects {
1944 my ($self) = @_; 2113 my ($self) = @_;
1945 2114
1946 return if $self->{deny_reset}; 2115 return if $self->{deny_reset};
1947 2116
1972 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
1973 2142
1974 1 2143 1
1975} 2144}
1976 2145
2146# used to laod the header of an original map
1977sub load_header_orig { 2147sub load_header_orig {
1978 my ($self) = @_; 2148 my ($self) = @_;
1979 2149
1980 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
1981} 2151}
1982 2152
2153# used to laod the header of an instantiated map
1983sub load_header_temp { 2154sub load_header_temp {
1984 my ($self) = @_; 2155 my ($self) = @_;
1985 2156
1986 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
1987} 2158}
1988 2159
2160# called after loading the header from an instantiated map
1989sub prepare_temp { 2161sub prepare_temp {
1990 my ($self) = @_; 2162 my ($self) = @_;
1991 2163
1992 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
1993 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
1994 # safety 2166 # safety
1995 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
1996 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
1997} 2169}
1998 2170
2171# called after loading the header from an original map
1999sub prepare_orig { 2172sub prepare_orig {
2000 my ($self) = @_; 2173 my ($self) = @_;
2001 2174
2002 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
2003 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
2027 2200
2028sub find; 2201sub find;
2029sub find { 2202sub find {
2030 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
2031 2204
2205 cf::cede_to_tick;
2206
2032 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
2033 2208
2034 cf::lock_wait "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2035 cf::lock_wait "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
2036 2211
2037 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
2041 my $map = new_from_path cf::map $path 2213 my $map = new_from_path cf::map $path
2042 or return; 2214 or return;
2043 2215
2044 $map->{last_save} = $cf::RUNTIME; 2216 $map->{last_save} = $cf::RUNTIME;
2045 2217
2057 2229
2058 $cf::MAP{$path} = $map 2230 $cf::MAP{$path} = $map
2059 } 2231 }
2060} 2232}
2061 2233
2062sub pre_load { } 2234sub pre_load { }
2063sub post_load { } 2235#sub post_load { } # XS
2064 2236
2065sub load { 2237sub load {
2066 my ($self) = @_; 2238 my ($self) = @_;
2067 2239
2068 local $self->{deny_reset} = 1; # loading can take a long time 2240 local $self->{deny_reset} = 1; # loading can take a long time
2071 2243
2072 { 2244 {
2073 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
2074 2246
2075 return unless $self->valid; 2247 return unless $self->valid;
2076 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
2077
2078 $self->in_memory (cf::MAP_LOADING);
2079 2249
2080 $self->alloc; 2250 $self->alloc;
2081 2251
2082 $self->pre_load; 2252 $self->pre_load;
2083 cf::cede_to_tick; 2253 cf::cede_to_tick;
2084 2254
2255 if (exists $self->{load_path}) {
2085 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block; 2257 $f->skip_block;
2087 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2088 or return; 2259 or return;
2089 2260
2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2261 $self->post_load_original
2091 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2092 2263
2093 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2094 utf8::encode $uniq; 2265 utf8::encode $uniq;
2095 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2096 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2097 $self->clear_unique_items; 2268 $self->clear_unique_items;
2098 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2099 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2100 } 2272 }
2101 } 2273 }
2102 }
2103 2274
2104 $f->resolve_delayed_derefs; 2275 $f->resolve_delayed_derefs;
2276 } else {
2277 $self->post_load_original
2278 if delete $self->{load_original};
2279 }
2280
2281 $self->state (cf::MAP_INACTIVE);
2105 2282
2106 cf::cede_to_tick; 2283 cf::cede_to_tick;
2107 # now do the right thing for maps 2284 # now do the right thing for maps
2108 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2109 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
2113 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2114 $self->decay_objects; 2291 $self->decay_objects;
2115 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2116 $self->update_buttons; 2293 $self->update_buttons;
2117 cf::cede_to_tick; 2294 cf::cede_to_tick;
2118 $self->set_darkness_map; 2295 #$self->activate; # no longer activate maps automatically
2119 cf::cede_to_tick;
2120 $self->activate;
2121 } 2296 }
2122 2297
2123 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2124 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2125
2126 $self->in_memory (cf::MAP_ACTIVE);
2127 } 2300 }
2128 2301
2129 $self->post_load; 2302 $self->post_load;
2130}
2131 2303
2304 1
2305}
2306
2307# customize the map for a given player, i.e.
2308# return the _real_ map. used by e.g. per-player
2309# maps to change the path to ~playername/mappath
2132sub customise_for { 2310sub customise_for {
2133 my ($self, $ob) = @_; 2311 my ($self, $ob) = @_;
2134 2312
2135 return find "~" . $ob->name . "/" . $self->{path} 2313 return find "~" . $ob->name . "/" . $self->{path}
2136 if $self->per_player; 2314 if $self->per_player;
2139# if $self->per_party; 2317# if $self->per_party;
2140 2318
2141 $self 2319 $self
2142} 2320}
2143 2321
2144# find and load all maps in the 3x3 area around a map
2145sub load_neighbours {
2146 my ($map) = @_;
2147
2148 my @neigh; # diagonal neighbours
2149
2150 for (0 .. 3) {
2151 my $neigh = $map->tile_path ($_)
2152 or next;
2153 $neigh = find $neigh, $map
2154 or next;
2155 $neigh->load;
2156
2157 push @neigh,
2158 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2159 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2160 }
2161
2162 for (grep defined $_->[0], @neigh) {
2163 my ($path, $origin) = @$_;
2164 my $neigh = find $path, $origin
2165 or next;
2166 $neigh->load;
2167 }
2168}
2169
2170sub find_sync { 2322sub find_sync {
2171 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2172 2324
2173 cf::sync_job { find $path, $origin } 2325 # it's a bug to call this from the main context
2326 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2327 if $Coro::current == $Coro::main;
2328
2329 find $path, $origin
2174} 2330}
2175 2331
2176sub do_load_sync { 2332sub do_load_sync {
2177 my ($map) = @_; 2333 my ($map) = @_;
2178 2334
2335 # it's a bug to call this from the main context
2179 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2180 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2181 2338
2182 cf::sync_job { $map->load }; 2339 $map->load;
2183} 2340}
2184 2341
2185our %MAP_PREFETCH; 2342our %MAP_PREFETCH;
2186our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2187 2344
2188sub find_async { 2345sub find_async {
2189 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2190 2347
2191 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2192 2349
2193 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2351 return $map if !$load || $map->linkable;
2195 } 2352 }
2196 2353
2197 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2198 2355
2199 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
2213 $MAP_PREFETCHER->prio (6); 2370 $MAP_PREFETCHER->prio (6);
2214 2371
2215 () 2372 ()
2216} 2373}
2217 2374
2375# common code, used by both ->save and ->swapout
2218sub save { 2376sub _save {
2219 my ($self) = @_; 2377 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222 2378
2223 $self->{last_save} = $cf::RUNTIME; 2379 $self->{last_save} = $cf::RUNTIME;
2224 2380
2225 return unless $self->dirty; 2381 return unless $self->dirty;
2226 2382
2246 } else { 2402 } else {
2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2403 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2248 } 2404 }
2249} 2405}
2250 2406
2407sub save {
2408 my ($self) = @_;
2409
2410 my $lock = cf::lock_acquire "map_data:$self->{path}";
2411
2412 $self->_save;
2413}
2414
2251sub swap_out { 2415sub swap_out {
2252 my ($self) = @_; 2416 my ($self) = @_;
2253 2417
2254 # save first because save cedes
2255 $self->save;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258 2419
2420 return if !$self->linkable;
2421 return if $self->{deny_save};
2259 return if $self->players; 2422 return if $self->players;
2260 return if $self->in_memory != cf::MAP_ACTIVE; 2423
2424 # first deactivate the map and "unlink" it from the core
2425 $self->deactivate;
2426 $_->clear_links_to ($self) for values %cf::MAP;
2427 $self->state (cf::MAP_SWAPPED);
2428
2429 # then atomically save
2430 $self->_save;
2431
2432 # then free the map
2433 $self->clear;
2434}
2435
2436sub reset_at {
2437 my ($self) = @_;
2438
2439 # TODO: safety, remove and allow resettable per-player maps
2261 return if $self->{deny_save}; 2440 return 1e99 if $self->{deny_reset};
2262 2441
2442 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2443 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2444
2445 $time + $to
2446}
2447
2448sub should_reset {
2449 my ($self) = @_;
2450
2451 $self->reset_at <= $cf::RUNTIME
2452}
2453
2454sub reset {
2455 my ($self) = @_;
2456
2457 my $lock = cf::lock_acquire "map_data:$self->{path}";
2458
2459 return if $self->players;
2460
2461 cf::trace "resetting map ", $self->path, "\n";
2462
2263 $self->in_memory (cf::MAP_SWAPPED); 2463 $self->state (cf::MAP_SWAPPED);
2464
2465 # need to save uniques path
2466 unless ($self->{deny_save}) {
2467 my $uniq = $self->uniq_path; utf8::encode $uniq;
2468
2469 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2470 if $uniq;
2471 }
2472
2473 delete $cf::MAP{$self->path};
2264 2474
2265 $self->deactivate; 2475 $self->deactivate;
2266 $_->clear_links_to ($self) for values %cf::MAP; 2476 $_->clear_links_to ($self) for values %cf::MAP;
2267 $self->clear; 2477 $self->clear;
2268}
2269
2270sub reset_at {
2271 my ($self) = @_;
2272
2273 # TODO: safety, remove and allow resettable per-player maps
2274 return 1e99 if $self->{deny_reset};
2275
2276 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2277 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2278
2279 $time + $to
2280}
2281
2282sub should_reset {
2283 my ($self) = @_;
2284
2285 $self->reset_at <= $cf::RUNTIME
2286}
2287
2288sub reset {
2289 my ($self) = @_;
2290
2291 my $lock = cf::lock_acquire "map_data:$self->{path}";
2292
2293 return if $self->players;
2294
2295 warn "resetting map ", $self->path;
2296
2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # need to save uniques path
2300 unless ($self->{deny_save}) {
2301 my $uniq = $self->uniq_path; utf8::encode $uniq;
2302
2303 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2304 if $uniq;
2305 }
2306
2307 delete $cf::MAP{$self->path};
2308
2309 $self->deactivate;
2310 $_->clear_links_to ($self) for values %cf::MAP;
2311 $self->clear;
2312 2478
2313 $self->unlink_save; 2479 $self->unlink_save;
2314 $self->destroy; 2480 $self->destroy;
2315} 2481}
2316 2482
2324 2490
2325 delete $cf::MAP{$self->path}; 2491 delete $cf::MAP{$self->path};
2326 2492
2327 $self->unlink_save; 2493 $self->unlink_save;
2328 2494
2329 bless $self, "cf::map"; 2495 bless $self, "cf::map::wrap";
2330 delete $self->{deny_reset}; 2496 delete $self->{deny_reset};
2331 $self->{deny_save} = 1; 2497 $self->{deny_save} = 1;
2332 $self->reset_timeout (1); 2498 $self->reset_timeout (1);
2333 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2499 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2334 2500
2391 : normalise $_ 2557 : normalise $_
2392 } @{ aio_readdir $UNIQUEDIR or [] } 2558 } @{ aio_readdir $UNIQUEDIR or [] }
2393 ] 2559 ]
2394} 2560}
2395 2561
2562=item cf::map::static_maps
2563
2564Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2565file in the shared directory excluding F</styles> and F</editor>). May
2566block.
2567
2568=cut
2569
2570sub static_maps() {
2571 my @dirs = "";
2572 my @maps;
2573
2574 while (@dirs) {
2575 my $dir = shift @dirs;
2576
2577 next if $dir eq "/styles" || $dir eq "/editor";
2578
2579 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2580 or return;
2581
2582 for (@$files) {
2583 s/\.map$// or next;
2584 utf8::decode $_;
2585 push @maps, "$dir/$_";
2586 }
2587
2588 push @dirs, map "$dir/$_", @$dirs;
2589 }
2590
2591 \@maps
2592}
2593
2396=back 2594=back
2397 2595
2398=head3 cf::object 2596=head3 cf::object
2399 2597
2400=cut 2598=cut
2465 2663
2466our $SAY_CHANNEL = { 2664our $SAY_CHANNEL = {
2467 id => "say", 2665 id => "say",
2468 title => "Map", 2666 title => "Map",
2469 reply => "say ", 2667 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2668 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2471}; 2669};
2472 2670
2473our $CHAT_CHANNEL = { 2671our $CHAT_CHANNEL = {
2474 id => "chat", 2672 id => "chat",
2475 title => "Chat", 2673 title => "Chat",
2530 2728
2531=item $player_object->enter_link 2729=item $player_object->enter_link
2532 2730
2533Freezes the player and moves him/her to a special map (C<{link}>). 2731Freezes the player and moves him/her to a special map (C<{link}>).
2534 2732
2535The player should be reasonably safe there for short amounts of time. You 2733The player should be reasonably safe there for short amounts of time (e.g.
2536I<MUST> call C<leave_link> as soon as possible, though. 2734for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2735though, as the player cannot control the character while it is on the link
2736map.
2537 2737
2538Will never block. 2738Will never block.
2539 2739
2540=item $player_object->leave_link ($map, $x, $y) 2740=item $player_object->leave_link ($map, $x, $y)
2541 2741
2561sub cf::object::player::enter_link { 2761sub cf::object::player::enter_link {
2562 my ($self) = @_; 2762 my ($self) = @_;
2563 2763
2564 $self->deactivate_recursive; 2764 $self->deactivate_recursive;
2565 2765
2766 ++$self->{_link_recursion};
2767
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2768 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2769
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2771 if $self->map && $self->map->{path} ne "{link}";
2570 2772
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2773 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2774}
2573 2775
2574sub cf::object::player::leave_link { 2776sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2777 my ($self, $map, $x, $y) = @_;
2576 2778
2593 ($x, $y) = (-1, -1) 2795 ($x, $y) = (-1, -1)
2594 unless (defined $x) && (defined $y); 2796 unless (defined $x) && (defined $y);
2595 2797
2596 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2597 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2598 if $x <=0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2599 2801
2600 $map->load; 2802 $map->load;
2601 $map->load_neighbours;
2602 2803
2603 return unless $self->contr->active; 2804 return unless $self->contr->active;
2604 $self->activate_recursive;
2605 2805
2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2607 $self->enter_map ($map, $x, $y); 2807 if ($self->enter_map ($map, $x, $y)) {
2608} 2808 # entering was successful
2809 delete $self->{_link_recursion};
2810 # only activate afterwards, to support waiting in hooks
2811 $self->activate_recursive;
2812 }
2609 2813
2814}
2815
2610=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2816=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2611 2817
2612Moves the player to the given map-path and coordinates by first freezing 2818Moves the player to the given map-path and coordinates by first freezing
2613her, loading and preparing them map, calling the provided $check callback 2819her, loading and preparing them map, calling the provided $check callback
2614that has to return the map if sucecssful, and then unfreezes the player on 2820that has to return the map if sucecssful, and then unfreezes the player on
2615the new (success) or old (failed) map position. In either case, $done will 2821the new (success) or old (failed) map position. In either case, $done will
2616be called at the end of this process. 2822be called at the end of this process.
2617 2823
2824Note that $check will be called with a potentially non-loaded map, so if
2825it needs a loaded map it has to call C<< ->load >>.
2826
2618=cut 2827=cut
2619 2828
2620our $GOTOGEN; 2829our $GOTOGEN;
2621 2830
2622sub cf::object::player::goto { 2831sub cf::object::player::goto {
2623 my ($self, $path, $x, $y, $check, $done) = @_; 2832 my ($self, $path, $x, $y, $check, $done) = @_;
2833
2834 if ($self->{_link_recursion} >= $MAX_LINKS) {
2835 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2836 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2837 ($path, $x, $y) = @$EMERGENCY_POSITION;
2838 }
2624 2839
2625 # do generation counting so two concurrent goto's will be executed in-order 2840 # do generation counting so two concurrent goto's will be executed in-order
2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2841 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2627 2842
2628 $self->enter_link; 2843 $self->enter_link;
2648 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2649 } 2864 }
2650 } 2865 }
2651 2866
2652 my $map = eval { 2867 my $map = eval {
2653 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2654 2869
2655 if ($map) { 2870 if ($map) {
2656 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2657 $map = $check->($map) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2658 } else { 2873 } else {
2659 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2874 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2660 } 2875 }
2661 2876
2662 $map 2877 $map
2670 if ($gen == $self->{_goto_generation}) { 2885 if ($gen == $self->{_goto_generation}) {
2671 delete $self->{_goto_generation}; 2886 delete $self->{_goto_generation};
2672 $self->leave_link ($map, $x, $y); 2887 $self->leave_link ($map, $x, $y);
2673 } 2888 }
2674 2889
2675 $done->() if $done; 2890 $done->($self) if $done;
2676 })->prio (1); 2891 })->prio (1);
2677} 2892}
2678 2893
2679=item $player_object->enter_exit ($exit_object) 2894=item $player_object->enter_exit ($exit_object)
2680 2895
2748 $Coro::current->{desc} = "enter_exit"; 2963 $Coro::current->{desc} = "enter_exit";
2749 2964
2750 unless (eval { 2965 unless (eval {
2751 $self->deactivate_recursive; # just to be sure 2966 $self->deactivate_recursive; # just to be sure
2752 2967
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2968 my $map = cf::map::normalise $exit->slaying, $exit->map;
2762 my $x = $exit->stats->hp; 2969 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp; 2970 my $y = $exit->stats->sp;
2971
2972 # special map handling
2973 my $slaying = $exit->slaying;
2974
2975 # special map handling
2976 if ($slaying eq "/!") {
2977 my $guard = cf::lock_acquire "exit_prepare:$exit";
2978
2979 prepare_random_map $exit
2980 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2981
2982 $map = $exit->slaying;
2983
2984 } elsif ($slaying eq '!up') {
2985 $map = $exit->map->tile_path (cf::TILE_UP);
2986 $x = $exit->x;
2987 $y = $exit->y;
2988
2989 } elsif ($slaying eq '!down') {
2990 $map = $exit->map->tile_path (cf::TILE_DOWN);
2991 $x = $exit->x;
2992 $y = $exit->y;
2993 }
2764 2994
2765 $self->goto ($map, $x, $y); 2995 $self->goto ($map, $x, $y);
2766 2996
2767 # if exit is damned, update players death & WoR home-position 2997 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y) 2998 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED); 2999 if $exit->flag (cf::FLAG_DAMNED);
2770 3000
2771 1 3001 1
2772 }) { 3002 }) {
2773 $self->message ("Something went wrong deep within the crossfire server. " 3003 $self->message ("Something went wrong deep within the deliantra server. "
2774 . "I'll try to bring you back to the map you were before. " 3004 . "I'll try to bring you back to the map you were before. "
2775 . "Please report this to the dungeon master!", 3005 . "Please report this to the dungeon master!",
2776 cf::NDI_UNIQUE | cf::NDI_RED); 3006 cf::NDI_UNIQUE | cf::NDI_RED);
2777 3007
2778 warn "ERROR in enter_exit: $@"; 3008 error "ERROR in enter_exit: $@";
2779 $self->leave_link; 3009 $self->leave_link;
2780 } 3010 }
2781 })->prio (1); 3011 })->prio (1);
2782} 3012}
2783 3013
2795sub cf::client::send_drawinfo { 3025sub cf::client::send_drawinfo {
2796 my ($self, $text, $flags) = @_; 3026 my ($self, $text, $flags) = @_;
2797 3027
2798 utf8::encode $text; 3028 utf8::encode $text;
2799 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3029 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3030}
3031
3032=item $client->send_big_packet ($pkt)
3033
3034Like C<send_packet>, but tries to compress large packets, and fragments
3035them as required.
3036
3037=cut
3038
3039our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3040
3041sub cf::client::send_big_packet {
3042 my ($self, $pkt) = @_;
3043
3044 # try lzf for large packets
3045 $pkt = "lzf " . Compress::LZF::compress $pkt
3046 if 1024 <= length $pkt and $self->{can_lzf};
3047
3048 # split very large packets
3049 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3050 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3051 $pkt = "frag";
3052 }
3053
3054 $self->send_packet ($pkt);
2800} 3055}
2801 3056
2802=item $client->send_msg ($channel, $msg, $color, [extra...]) 3057=item $client->send_msg ($channel, $msg, $color, [extra...])
2803 3058
2804Send a drawinfo or msg packet to the client, formatting the msg for the 3059Send a drawinfo or msg packet to the client, formatting the msg for the
2808 3063
2809=cut 3064=cut
2810 3065
2811# non-persistent channels (usually the info channel) 3066# non-persistent channels (usually the info channel)
2812our %CHANNEL = ( 3067our %CHANNEL = (
3068 "c/motd" => {
3069 id => "infobox",
3070 title => "MOTD",
3071 reply => undef,
3072 tooltip => "The message of the day",
3073 },
2813 "c/identify" => { 3074 "c/identify" => {
2814 id => "infobox", 3075 id => "infobox",
2815 title => "Identify", 3076 title => "Identify",
2816 reply => undef, 3077 reply => undef,
2817 tooltip => "Items recently identified", 3078 tooltip => "Items recently identified",
2819 "c/examine" => { 3080 "c/examine" => {
2820 id => "infobox", 3081 id => "infobox",
2821 title => "Examine", 3082 title => "Examine",
2822 reply => undef, 3083 reply => undef,
2823 tooltip => "Signs and other items you examined", 3084 tooltip => "Signs and other items you examined",
3085 },
3086 "c/shopinfo" => {
3087 id => "infobox",
3088 title => "Shop Info",
3089 reply => undef,
3090 tooltip => "What your bargaining skill tells you about the shop",
2824 }, 3091 },
2825 "c/book" => { 3092 "c/book" => {
2826 id => "infobox", 3093 id => "infobox",
2827 title => "Book", 3094 title => "Book",
2828 reply => undef, 3095 reply => undef,
2844 id => "infobox", 3111 id => "infobox",
2845 title => "Body Parts", 3112 title => "Body Parts",
2846 reply => undef, 3113 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available", 3114 tooltip => "Shows which body parts you posess and are available",
2848 }, 3115 },
3116 "c/statistics" => {
3117 id => "infobox",
3118 title => "Statistics",
3119 reply => undef,
3120 tooltip => "Shows your primary statistics",
3121 },
3122 "c/skills" => {
3123 id => "infobox",
3124 title => "Skills",
3125 reply => undef,
3126 tooltip => "Shows your experience per skill and item power",
3127 },
3128 "c/shopitems" => {
3129 id => "infobox",
3130 title => "Shop Items",
3131 reply => undef,
3132 tooltip => "Shows the items currently for sale in this shop",
3133 },
3134 "c/resistances" => {
3135 id => "infobox",
3136 title => "Resistances",
3137 reply => undef,
3138 tooltip => "Shows your resistances",
3139 },
3140 "c/pets" => {
3141 id => "infobox",
3142 title => "Pets",
3143 reply => undef,
3144 tooltip => "Shows information abotu your pets/a specific pet",
3145 },
3146 "c/perceiveself" => {
3147 id => "infobox",
3148 title => "Perceive Self",
3149 reply => undef,
3150 tooltip => "You gained detailed knowledge about yourself",
3151 },
2849 "c/uptime" => { 3152 "c/uptime" => {
2850 id => "infobox", 3153 id => "infobox",
2851 title => "Uptime", 3154 title => "Uptime",
2852 reply => undef, 3155 reply => undef,
2853 tooltip => "How long the server has been running since last restart", 3156 tooltip => "How long the server has been running since last restart",
2862 id => "party", 3165 id => "party",
2863 title => "Party", 3166 title => "Party",
2864 reply => "gsay ", 3167 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party", 3168 tooltip => "Messages and chat related to your party",
2866 }, 3169 },
3170 "c/death" => {
3171 id => "death",
3172 title => "Death",
3173 reply => undef,
3174 tooltip => "Reason for and more info about your most recent death",
3175 },
3176 "c/say" => $SAY_CHANNEL,
3177 "c/chat" => $CHAT_CHANNEL,
2867); 3178);
2868 3179
2869sub cf::client::send_msg { 3180sub cf::client::send_msg {
2870 my ($self, $channel, $msg, $color, @extra) = @_; 3181 my ($self, $channel, $msg, $color, @extra) = @_;
2871 3182
2872 $msg = $self->pl->expand_cfpod ($msg); 3183 $msg = $self->pl->expand_cfpod ($msg)
3184 unless $color & cf::NDI_VERBATIM;
2873 3185
2874 $color &= cf::NDI_CLIENT_MASK; # just in case... 3186 $color &= cf::NDI_CLIENT_MASK; # just in case...
2875 3187
2876 # check predefined channels, for the benefit of C 3188 # check predefined channels, for the benefit of C
2877 if ($CHANNEL{$channel}) { 3189 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel}; 3190 $channel = $CHANNEL{$channel};
2879 3191
2880 $self->ext_msg (channel_info => $channel) 3192 $self->ext_msg (channel_info => $channel);
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id}; 3193 $channel = $channel->{id};
2884 3194
2885 } elsif (ref $channel) { 3195 } elsif (ref $channel) {
2886 # send meta info to client, if not yet sent 3196 # send meta info to client, if not yet sent
2887 unless (exists $self->{channel}{$channel->{id}}) { 3197 unless (exists $self->{channel}{$channel->{id}}) {
2888 $self->{channel}{$channel->{id}} = $channel; 3198 $self->{channel}{$channel->{id}} = $channel;
2889 $self->ext_msg (channel_info => $channel) 3199 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891 } 3200 }
2892 3201
2893 $channel = $channel->{id}; 3202 $channel = $channel->{id};
2894 } 3203 }
2895 3204
2896 return unless @extra || length $msg; 3205 return unless @extra || length $msg;
2897 3206
2898 if ($self->can_msg) {
2899 # default colour, mask it out 3207 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3208 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF; 3209 if $color & cf::NDI_DEF;
2902 3210
2903 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3211 my $pkt = "msg "
3212 . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3213 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2905 } else { 3214 );
2906 if ($color >= 0) {
2907 # replace some tags by gcfclient-compatible ones
2908 for ($msg) {
2909 1 while
2910 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2911 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2912 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2913 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2914 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2915 }
2916 3215
2917 $color &= cf::NDI_COLOR_MASK; 3216 $self->send_big_packet ($pkt);
2918
2919 utf8::encode $msg;
2920
2921 if (0 && $msg =~ /\[/) {
2922 # COMMAND/INFO
2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2924 } else {
2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2926 $self->send_packet ("drawinfo $color $msg")
2927 }
2928 }
2929 }
2930} 3217}
2931 3218
2932=item $client->ext_msg ($type, @msg) 3219=item $client->ext_msg ($type, @msg)
2933 3220
2934Sends an ext event to the client. 3221Sends an ext event to the client.
2936=cut 3223=cut
2937 3224
2938sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
2939 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
2940 3227
2941 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2943 } elsif ($self->extcmd == 1) { # TODO: remove
2944 push @msg, msgtype => "event_$type";
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2946 }
2947}
2948
2949=item $client->ext_reply ($msgid, @msg)
2950
2951Sends an ext reply to the client.
2952
2953=cut
2954
2955sub cf::client::ext_reply($$@) {
2956 my ($self, $id, @msg) = @_;
2957
2958 if ($self->extcmd == 2) {
2959 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2960 } elsif ($self->extcmd == 1) {
2961 #TODO: version 1, remove
2962 unshift @msg, msgtype => "reply", msgid => $id;
2963 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2964 }
2965} 3229}
2966 3230
2967=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
2968 3232
2969Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
3024 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
3025 3289
3026 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3027 3291
3028 if (ref $msg) { 3292 if (ref $msg) {
3029 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3030 "ARRAY" eq ref $msg
3031 ? @$msg
3032 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3033 3294
3034 my @reply; 3295 my @reply;
3035 3296
3036 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
3037 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
3038 } 3299 }
3039 3300
3040 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
3041 if $reply; 3302 if $reply;
3042 3303
3043 } else { 3304 } else {
3044 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3305 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3045 } 3306 }
3046 3307
3047 cf::override; 3308 cf::override;
3048 }, 3309 },
3049); 3310);
3069 3330
3070 $coro 3331 $coro
3071} 3332}
3072 3333
3073cf::client->attach ( 3334cf::client->attach (
3074 on_destroy => sub { 3335 on_client_destroy => sub {
3075 my ($ns) = @_; 3336 my ($ns) = @_;
3076 3337
3077 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3338 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3078 }, 3339 },
3079); 3340);
3095our $safe_hole = new Safe::Hole; 3356our $safe_hole = new Safe::Hole;
3096 3357
3097$SIG{FPE} = 'IGNORE'; 3358$SIG{FPE} = 'IGNORE';
3098 3359
3099$safe->permit_only (Opcode::opset qw( 3360$safe->permit_only (Opcode::opset qw(
3100 :base_core :base_mem :base_orig :base_math 3361 :base_core :base_mem :base_orig :base_math :base_loop
3101 grepstart grepwhile mapstart mapwhile 3362 grepstart grepwhile mapstart mapwhile
3102 sort time 3363 sort time
3103)); 3364));
3104 3365
3105# here we export the classes and methods available to script code 3366# here we export the classes and methods available to script code
3109The following functions and methods are available within a safe environment: 3370The following functions and methods are available within a safe environment:
3110 3371
3111 cf::object 3372 cf::object
3112 contr pay_amount pay_player map x y force_find force_add destroy 3373 contr pay_amount pay_player map x y force_find force_add destroy
3113 insert remove name archname title slaying race decrease split 3374 insert remove name archname title slaying race decrease split
3375 value
3114 3376
3115 cf::object::player 3377 cf::object::player
3116 player 3378 player
3117 3379
3118 cf::player 3380 cf::player
3124=cut 3386=cut
3125 3387
3126for ( 3388for (
3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3389 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3128 insert remove inv nrof name archname title slaying race 3390 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)], 3391 decrease split destroy change_exp value msg lore send_msg)],
3130 ["cf::object::player" => qw(player)], 3392 ["cf::object::player" => qw(player)],
3131 ["cf::player" => qw(peaceful)], 3393 ["cf::player" => qw(peaceful send_msg)],
3132 ["cf::map" => qw(trigger)], 3394 ["cf::map" => qw(trigger)],
3133) { 3395) {
3134 no strict 'refs';
3135 my ($pkg, @funs) = @$_; 3396 my ($pkg, @funs) = @$_;
3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3397 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3137 for @funs; 3398 for @funs;
3138} 3399}
3139 3400
3154 3415
3155 my $qcode = $code; 3416 my $qcode = $code;
3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3417 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3157 $qcode =~ s/\n/\\n/g; 3418 $qcode =~ s/\n/\\n/g;
3158 3419
3420 %vars = (_dummy => 0) unless %vars;
3421
3422 my @res;
3159 local $_; 3423 local $_;
3160 local @safe::cf::_safe_eval_args = values %vars;
3161 3424
3162 my $eval = 3425 my $eval =
3163 "do {\n" 3426 "do {\n"
3164 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3427 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3165 . "#line 0 \"{$qcode}\"\n" 3428 . "#line 0 \"{$qcode}\"\n"
3166 . $code 3429 . $code
3167 . "\n}" 3430 . "\n}"
3168 ; 3431 ;
3169 3432
3433 if ($CFG{safe_eval}) {
3170 sub_generation_inc; 3434 sub_generation_inc;
3435 local @safe::cf::_safe_eval_args = values %vars;
3171 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3436 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3172 sub_generation_inc; 3437 sub_generation_inc;
3438 } else {
3439 local @cf::_safe_eval_args = values %vars;
3440 @res = wantarray ? eval eval : scalar eval $eval;
3441 }
3173 3442
3174 if ($@) { 3443 if ($@) {
3175 warn "$@"; 3444 warn "$@",
3176 warn "while executing safe code '$code'\n"; 3445 "while executing safe code '$code'\n",
3177 warn "with arguments " . (join " ", %vars) . "\n"; 3446 "with arguments " . (join " ", %vars) . "\n";
3178 } 3447 }
3179 3448
3180 wantarray ? @res : $res[0] 3449 wantarray ? @res : $res[0]
3181} 3450}
3182 3451
3196=cut 3465=cut
3197 3466
3198sub register_script_function { 3467sub register_script_function {
3199 my ($fun, $cb) = @_; 3468 my ($fun, $cb) = @_;
3200 3469
3201 no strict 'refs'; 3470 $fun = "safe::$fun" if $CFG{safe_eval};
3202 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3471 *$fun = $safe_hole->wrap ($cb);
3203} 3472}
3204 3473
3205=back 3474=back
3206 3475
3207=cut 3476=cut
3208 3477
3209############################################################################# 3478#############################################################################
3210# the server's init and main functions 3479# the server's init and main functions
3480
3481our %FACEHASH; # hash => idx, #d# HACK for http server
3482
3483# internal api, not fianlised
3484sub add_face {
3485 my ($name, $type, $data) = @_;
3486
3487 my $idx = cf::face::find $name;
3488
3489 if ($idx) {
3490 delete $FACEHASH{cf::face::get_chksum $idx};
3491 } else {
3492 $idx = cf::face::alloc $name;
3493 }
3494
3495 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3496
3497 cf::face::set_type $idx, $type;
3498 cf::face::set_data $idx, 0, $data, $hash;
3499 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3500 $FACEHASH{$hash} = $idx;#d#
3501
3502 $idx
3503}
3211 3504
3212sub load_facedata($) { 3505sub load_facedata($) {
3213 my ($path) = @_; 3506 my ($path) = @_;
3214 3507
3215 # HACK to clear player env face cache, we need some signal framework 3508 # HACK to clear player env face cache, we need some signal framework
3216 # for this (global event?) 3509 # for this (global event?)
3217 %ext::player_env::MUSIC_FACE_CACHE = (); 3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3218 3511
3219 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3220 3513
3221 warn "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3222 3515
3223 my $facedata; 3516 my $facedata = decode_storable load_file $path;
3224 0 < aio_load $path, $facedata
3225 or die "$path: $!";
3226
3227 $facedata = Coro::Storable::thaw $facedata;
3228 3517
3229 $facedata->{version} == 2 3518 $facedata->{version} == 2
3230 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3231 3520
3232 # patch in the exptable
3233 $facedata->{resource}{"res/exp_table"} = {
3234 type => FT_RSRC,
3235 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3236 };
3237 cf::cede_to_tick; 3521 cf::cede_to_tick;
3238 3522
3239 { 3523 {
3240 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3241 3525
3242 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3243 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244 3529
3245 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3246 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3247 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3535 $FACEHASH{$info->{hash64}} = $idx;#d#
3249 3536
3250 cf::cede_to_tick; 3537 cf::cede_to_tick;
3251 } 3538 }
3252 3539
3253 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
3258 3545
3259 if (my $smooth = cf::face::find $info->{smooth}) { 3546 if (my $smooth = cf::face::find $info->{smooth}) {
3260 cf::face::set_smooth $idx, $smooth; 3547 cf::face::set_smooth $idx, $smooth;
3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3262 } else { 3549 } else {
3263 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3550 error "smooth face '$info->{smooth}' not found for face '$face'";
3264 } 3551 }
3265 3552
3266 cf::cede_to_tick; 3553 cf::cede_to_tick;
3267 } 3554 }
3268 } 3555 }
3277 3564
3278 cf::anim::invalidate_all; # d'oh 3565 cf::anim::invalidate_all; # d'oh
3279 } 3566 }
3280 3567
3281 { 3568 {
3282 # TODO: for gcfclient pleasure, we should give resources
3283 # that gcfclient doesn't grok a >10000 face index.
3284 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3285 3570
3286 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3287 if (defined $info->{type}) { 3572 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue
3288 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3289 my $data;
3290 3575
3291 if ($info->{type} & 1) {
3292 # prepend meta info
3293
3294 my $meta = $enc->encode ({
3295 name => $name,
3296 %{ $info->{meta} || {} },
3297 });
3298
3299 $data = pack "(w/a*)*", $meta, $info->{data};
3300 } else {
3301 $data = $info->{data};
3302 }
3303
3304 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3305 cf::face::set_type $idx, $info->{type}; 3576 cf::face::set_type $idx, $type;
3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d#
3306 } else { 3580 } else {
3307 $RESOURCE{$name} = $info; 3581# $RESOURCE{$name} = $info; # unused
3308 } 3582 }
3309 3583
3310 cf::cede_to_tick; 3584 cf::cede_to_tick;
3311 } 3585 }
3312 } 3586 }
3313 3587
3314 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3315 3589
3316 1 3590 1
3317} 3591}
3318
3319cf::global->attach (on_resource_update => sub {
3320 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3321 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3322
3323 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3324 my $sound = $soundconf->{compat}[$_]
3325 or next;
3326
3327 my $face = cf::face::find "sound/$sound->[1]";
3328 cf::sound::set $sound->[0] => $face;
3329 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3330 }
3331
3332 while (my ($k, $v) = each %{$soundconf->{event}}) {
3333 my $face = cf::face::find "sound/$v";
3334 cf::sound::set $k => $face;
3335 }
3336 }
3337});
3338 3592
3339register_exticmd fx_want => sub { 3593register_exticmd fx_want => sub {
3340 my ($ns, $want) = @_; 3594 my ($ns, $want) = @_;
3341 3595
3342 while (my ($k, $v) = each %$want) { 3596 while (my ($k, $v) = each %$want) {
3350 my $status = load_resource_file_ $_[0]; 3604 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100; 3605 get_slot 0.1, 100;
3352 cf::arch::commit_load; 3606 cf::arch::commit_load;
3353 3607
3354 $status 3608 $status
3609}
3610
3611sub reload_exp_table {
3612 _reload_exp_table;
3613
3614 add_face "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 );
3618}
3619
3620sub reload_materials {
3621 _reload_materials;
3355} 3622}
3356 3623
3357sub reload_regions { 3624sub reload_regions {
3358 # HACK to clear player env face cache, we need some signal framework 3625 # HACK to clear player env face cache, we need some signal framework
3359 # for this (global event?) 3626 # for this (global event?)
3374} 3641}
3375 3642
3376sub reload_archetypes { 3643sub reload_archetypes {
3377 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3378 or die "unable to load archetypes\n"; 3645 or die "unable to load archetypes\n";
3646
3647 add_face "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 );
3651 add_face "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 );
3379} 3655}
3380 3656
3381sub reload_treasures { 3657sub reload_treasures {
3382 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3383 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3384} 3660}
3385 3661
3662sub reload_sound {
3663 trace "loading sound config from $DATADIR/sound\n";
3664
3665 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3666
3667 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3668 my $sound = $soundconf->{compat}[$_]
3669 or next;
3670
3671 my $face = cf::face::find "sound/$sound->[1]";
3672 cf::sound::set $sound->[0] => $face;
3673 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3674 }
3675
3676 while (my ($k, $v) = each %{$soundconf->{event}}) {
3677 my $face = cf::face::find "sound/$v";
3678 cf::sound::set $k => $face;
3679 }
3680}
3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742}
3743
3386sub reload_resources { 3744sub reload_resources {
3387 warn "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3388 3746
3747 reload_materials;
3389 reload_facedata; 3748 reload_facedata;
3749 reload_exp_table;
3750 reload_sound;
3390 reload_archetypes; 3751 reload_archetypes;
3391 reload_regions; 3752 reload_regions;
3392 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3393 3755
3394 warn "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3395}
3396
3397sub init {
3398 my $guard = freeze_mainloop;
3399
3400 reload_resources;
3401} 3757}
3402 3758
3403sub reload_config { 3759sub reload_config {
3404 open my $fh, "<:utf8", "$CONFDIR/config" 3760 trace "reloading config file...\n";
3405 or return;
3406 3761
3407 local $/; 3762 my $config = load_file "$CONFDIR/config";
3408 *CFG = YAML::Load <$fh>; 3763 utf8::decode $config;
3764 *CFG = decode_yaml $config;
3409 3765
3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3411 3767
3412 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3768 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3413 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3769 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3414 3770
3415 if (exists $CFG{mlockall}) { 3771 if (exists $CFG{mlockall}) {
3419 }; 3775 };
3420 warn $@ if $@; 3776 warn $@ if $@;
3421 } 3777 }
3422} 3778}
3423 3779
3780sub pidfile() {
3781 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3782 or die "$PIDFILE: $!";
3783 flock $fh, &Fcntl::LOCK_EX
3784 or die "$PIDFILE: flock: $!";
3785 $fh
3786}
3787
3788# make sure only one server instance is running at any one time
3789sub atomic {
3790 my $fh = pidfile;
3791
3792 my $pid = <$fh>;
3793 kill 9, $pid if $pid > 0;
3794
3795 seek $fh, 0, 0;
3796 print $fh $$;
3797}
3798
3799sub main_loop {
3800 trace "EV::loop starting\n";
3801 if (1) {
3802 EV::loop;
3803 }
3804 trace "EV::loop returned\n";
3805 goto &main_loop unless $REALLY_UNLOOP;
3806}
3807
3424sub main { 3808sub main {
3809 cf::init_globals; # initialise logging
3810
3811 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3812 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3813 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3814 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3815
3816 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3817
3425 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3426 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3820 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3428 (async { 3821 (async {
3429 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3431 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
3432 }; 3825 };
3433 3826
3434 { 3827 evthread_start IO::AIO::poll_fileno;
3435 my $guard = freeze_mainloop; 3828
3829 cf::sync_job {
3830 cf::incloader::init ();
3831
3832 db_init;
3833
3834 cf::init_anim;
3835 cf::init_attackmess;
3836 cf::init_dynamic;
3837
3838 cf::load_settings;
3839
3840 reload_resources;
3436 reload_config; 3841 reload_config;
3437 db_init; 3842
3843 cf::init_uuid;
3844 cf::init_signals;
3845 cf::init_skills;
3846
3847 cf::init_beforeplay;
3848
3849 atomic;
3850
3438 load_extensions; 3851 load_extensions;
3439 3852
3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3853 utime time, time, $RUNTIMEFILE;
3441 evthread_start IO::AIO::poll_fileno; 3854
3855 # no (long-running) fork's whatsoever before this point(!)
3856 use POSIX ();
3857 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3858
3859 cf::_post_init 0;
3442 } 3860 };
3443 3861
3444 EV::loop; 3862 cf::object::thawer::errors_are_fatal 0;
3863 info "parse errors in files are no longer fatal from this point on.\n";
3864
3865 AE::postpone {
3866 undef &main; # free gobs of memory :)
3867 };
3868
3869 goto &main_loop;
3445} 3870}
3446 3871
3447############################################################################# 3872#############################################################################
3448# initialisation and cleanup 3873# initialisation and cleanup
3449 3874
3450# install some emergency cleanup handlers 3875# install some emergency cleanup handlers
3451BEGIN { 3876BEGIN {
3452 our %SIGWATCHER = (); 3877 our %SIGWATCHER = ();
3453 for my $signal (qw(INT HUP TERM)) { 3878 for my $signal (qw(INT HUP TERM)) {
3454 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3879 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3455 cf::cleanup "SIG$signal"; 3880 cf::cleanup "SIG$signal";
3456 }; 3881 };
3457 } 3882 }
3458} 3883}
3459 3884
3460sub write_runtime_sync { 3885sub write_runtime_sync {
3461 my $runtime = "$LOCALDIR/runtime"; 3886 my $t0 = AE::time;
3462 3887
3463 # first touch the runtime file to show we are still running: 3888 # first touch the runtime file to show we are still running:
3464 # the fsync below can take a very very long time. 3889 # the fsync below can take a very very long time.
3465 3890
3466 IO::AIO::aio_utime $runtime, undef, undef; 3891 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3467 3892
3468 my $guard = cf::lock_acquire "write_runtime"; 3893 my $guard = cf::lock_acquire "write_runtime";
3469 3894
3470 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3895 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3471 or return; 3896 or return;
3472 3897
3473 my $value = $cf::RUNTIME + 90 + 10; 3898 my $value = $cf::RUNTIME + 90 + 10;
3474 # 10 is the runtime save interval, for a monotonic clock 3899 # 10 is the runtime save interval, for a monotonic clock
3475 # 60 allows for the watchdog to kill the server. 3900 # 60 allows for the watchdog to kill the server.
3485 aio_utime $fh, undef, undef; 3910 aio_utime $fh, undef, undef;
3486 3911
3487 close $fh 3912 close $fh
3488 or return; 3913 or return;
3489 3914
3490 aio_rename "$runtime~", $runtime 3915 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3491 and return; 3916 and return;
3492 3917
3493 warn "runtime file written.\n"; 3918 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3494 3919
3495 1 3920 1
3496} 3921}
3497 3922
3498our $uuid_lock; 3923our $uuid_lock;
3507 my $uuid = "$LOCALDIR/uuid"; 3932 my $uuid = "$LOCALDIR/uuid";
3508 3933
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3934 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return; 3935 or return;
3511 3936
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3937 my $value = uuid_seq uuid_cur;
3938
3939 unless ($value) {
3940 info "cowardly refusing to write zero uuid value!\n";
3941 return;
3942 }
3943
3944 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3945 $uuid_skip = 0;
3514 3946
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3947 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return; 3948 and return;
3517 3949
3523 or return; 3955 or return;
3524 3956
3525 aio_rename "$uuid~", $uuid 3957 aio_rename "$uuid~", $uuid
3526 and return; 3958 and return;
3527 3959
3528 warn "uuid file written ($value).\n"; 3960 trace "uuid file written ($value).\n";
3529 3961
3530 1 3962 1
3531 3963
3532} 3964}
3533 3965
3539} 3971}
3540 3972
3541sub emergency_save() { 3973sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3974 my $freeze_guard = cf::freeze_mainloop;
3543 3975
3544 warn "enter emergency perl save\n"; 3976 info "emergency_perl_save: enter\n";
3977
3978 # this is a trade-off: we want to be very quick here, so
3979 # save all maps without fsync, and later call a global sync
3980 # (which in turn might be very very slow)
3981 local $USE_FSYNC = 0;
3545 3982
3546 cf::sync_job { 3983 cf::sync_job {
3984 cf::write_runtime_sync; # external watchdog should not bark
3985
3547 # use a peculiar iteration method to avoid tripping on perl 3986 # use a peculiar iteration method to avoid tripping on perl
3548 # refcount bugs in for. also avoids problems with players 3987 # refcount bugs in for. also avoids problems with players
3549 # and maps saved/destroyed asynchronously. 3988 # and maps saved/destroyed asynchronously.
3550 warn "begin emergency player save\n"; 3989 info "emergency_perl_save: begin player save\n";
3551 for my $login (keys %cf::PLAYER) { 3990 for my $login (keys %cf::PLAYER) {
3552 my $pl = $cf::PLAYER{$login} or next; 3991 my $pl = $cf::PLAYER{$login} or next;
3553 $pl->valid or next; 3992 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3993 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3555 $pl->save; 3994 $pl->save;
3556 } 3995 }
3557 warn "end emergency player save\n"; 3996 info "emergency_perl_save: end player save\n";
3558 3997
3559 warn "begin emergency map save\n"; 3998 cf::write_runtime_sync; # external watchdog should not bark
3999
4000 info "emergency_perl_save: begin map save\n";
3560 for my $path (keys %cf::MAP) { 4001 for my $path (keys %cf::MAP) {
3561 my $map = $cf::MAP{$path} or next; 4002 my $map = $cf::MAP{$path} or next;
3562 $map->valid or next; 4003 $map->valid or next;
3563 $map->save; 4004 $map->save;
3564 } 4005 }
3565 warn "end emergency map save\n"; 4006 info "emergency_perl_save: end map save\n";
3566 4007
3567 warn "begin emergency database checkpoint\n"; 4008 cf::write_runtime_sync; # external watchdog should not bark
4009
4010 info "emergency_perl_save: begin database checkpoint\n";
3568 BDB::db_env_txn_checkpoint $DB_ENV; 4011 BDB::db_env_txn_checkpoint $DB_ENV;
3569 warn "end emergency database checkpoint\n"; 4012 info "emergency_perl_save: end database checkpoint\n";
3570 4013
3571 warn "begin write uuid\n"; 4014 info "emergency_perl_save: begin write uuid\n";
3572 write_uuid_sync 1; 4015 write_uuid_sync 1;
3573 warn "end write uuid\n"; 4016 info "emergency_perl_save: end write uuid\n";
4017
4018 cf::write_runtime_sync; # external watchdog should not bark
4019
4020 trace "emergency_perl_save: syncing database to disk";
4021 BDB::db_env_txn_checkpoint $DB_ENV;
4022
4023 info "emergency_perl_save: starting sync\n";
4024 IO::AIO::aio_sync sub {
4025 info "emergency_perl_save: finished sync\n";
4026 };
4027
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
4030 trace "emergency_perl_save: flushing outstanding aio requests";
4031 while (IO::AIO::nreqs || BDB::nreqs) {
4032 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4033 }
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
3574 }; 4036 };
3575 4037
3576 warn "leave emergency perl save\n"; 4038 info "emergency_perl_save: leave\n";
3577} 4039}
3578 4040
3579sub post_cleanup { 4041sub post_cleanup {
3580 my ($make_core) = @_; 4042 my ($make_core) = @_;
3581 4043
4044 IO::AIO::flush;
4045
3582 warn Carp::longmess "post_cleanup backtrace" 4046 error Carp::longmess "post_cleanup backtrace"
3583 if $make_core; 4047 if $make_core;
4048
4049 my $fh = pidfile;
4050 unlink $PIDFILE if <$fh> == $$;
4051}
4052
4053# a safer delete_package, copied from Symbol
4054sub clear_package($) {
4055 my $pkg = shift;
4056
4057 # expand to full symbol table name if needed
4058 unless ($pkg =~ /^main::.*::$/) {
4059 $pkg = "main$pkg" if $pkg =~ /^::/;
4060 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4061 $pkg .= '::' unless $pkg =~ /::$/;
4062 }
4063
4064 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4065 my $stem_symtab = *{$stem}{HASH};
4066
4067 defined $stem_symtab and exists $stem_symtab->{$leaf}
4068 or return;
4069
4070 # clear all symbols
4071 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4072 for my $name (keys %$leaf_symtab) {
4073 _gv_clear *{"$pkg$name"};
4074# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4075 }
3584} 4076}
3585 4077
3586sub do_reload_perl() { 4078sub do_reload_perl() {
3587 # can/must only be called in main 4079 # can/must only be called in main
3588 if ($Coro::current != $Coro::main) { 4080 unless (in_main) {
3589 warn "can only reload from main coroutine"; 4081 error "can only reload from main coroutine";
3590 return; 4082 return;
3591 } 4083 }
3592 4084
3593 warn "reloading..."; 4085 return if $RELOAD++;
3594 4086
3595 warn "entering sync_job"; 4087 my $t1 = AE::time;
3596 4088
4089 while ($RELOAD) {
4090 cf::get_slot 0.1, -1, "reload_perl";
4091 info "perl_reload: reloading...";
4092
4093 trace "perl_reload: entering sync_job";
4094
3597 cf::sync_job { 4095 cf::sync_job {
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 cf::emergency_save; 4096 #cf::emergency_save;
3600 cf::write_runtime_sync; # external watchdog should not bark
3601 4097
3602 warn "syncing database to disk";
3603 BDB::db_env_txn_checkpoint $DB_ENV;
3604
3605 # if anything goes wrong in here, we should simply crash as we already saved
3606
3607 warn "flushing outstanding aio requests";
3608 for (;;) {
3609 BDB::flush;
3610 IO::AIO::flush;
3611 Coro::cede_notself;
3612 last unless IO::AIO::nreqs || BDB::nreqs;
3613 warn "iterate...";
3614 }
3615
3616 ++$RELOAD;
3617
3618 warn "cancelling all extension coros"; 4098 trace "perl_reload: cancelling all extension coros";
3619 $_->cancel for values %EXT_CORO; 4099 $_->cancel for values %EXT_CORO;
3620 %EXT_CORO = (); 4100 %EXT_CORO = ();
3621 4101
3622 warn "removing commands"; 4102 trace "perl_reload: removing commands";
3623 %COMMAND = (); 4103 %COMMAND = ();
3624 4104
3625 warn "removing ext/exti commands"; 4105 trace "perl_reload: removing ext/exti commands";
3626 %EXTCMD = (); 4106 %EXTCMD = ();
3627 %EXTICMD = (); 4107 %EXTICMD = ();
3628 4108
3629 warn "unloading/nuking all extensions"; 4109 trace "perl_reload: unloading/nuking all extensions";
3630 for my $pkg (@EXTS) { 4110 for my $pkg (@EXTS) {
3631 warn "... unloading $pkg"; 4111 trace "... unloading $pkg";
3632 4112
3633 if (my $cb = $pkg->can ("unload")) { 4113 if (my $cb = $pkg->can ("unload")) {
3634 eval { 4114 eval {
3635 $cb->($pkg); 4115 $cb->($pkg);
3636 1 4116 1
3637 } or warn "$pkg unloaded, but with errors: $@"; 4117 } or error "$pkg unloaded, but with errors: $@";
4118 }
4119
4120 trace "... clearing $pkg";
4121 clear_package $pkg;
3638 } 4122 }
3639 4123
3640 warn "... nuking $pkg";
3641 Symbol::delete_package $pkg;
3642 }
3643
3644 warn "unloading all perl modules loaded from $LIBDIR"; 4124 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3645 while (my ($k, $v) = each %INC) { 4125 while (my ($k, $v) = each %INC) {
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4126 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647 4127
3648 warn "... unloading $k"; 4128 trace "... unloading $k";
3649 delete $INC{$k}; 4129 delete $INC{$k};
3650 4130
3651 $k =~ s/\.pm$//; 4131 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g; 4132 $k =~ s/\//::/g;
3653 4133
3654 if (my $cb = $k->can ("unload_module")) { 4134 if (my $cb = $k->can ("unload_module")) {
3655 $cb->(); 4135 $cb->();
4136 }
4137
4138 clear_package $k;
3656 } 4139 }
3657 4140
3658 Symbol::delete_package $k;
3659 }
3660
3661 warn "getting rid of safe::, as good as possible"; 4141 trace "perl_reload: getting rid of safe::, as good as possible";
3662 Symbol::delete_package "safe::$_" 4142 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4143 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 4144
3665 warn "unloading cf.pm \"a bit\""; 4145 trace "perl_reload: unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 4146 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 4147 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 4148
3669 # don't, removes xs symbols, too, 4149 # don't, removes xs symbols, too,
3670 # and global variables created in xs 4150 # and global variables created in xs
3671 #Symbol::delete_package __PACKAGE__; 4151 #clear_package __PACKAGE__;
3672 4152
3673 warn "unload completed, starting to reload now"; 4153 info "perl_reload: unload completed, starting to reload now";
3674 4154
3675 warn "reloading cf.pm"; 4155 trace "perl_reload: reloading cf.pm";
3676 require cf; 4156 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4157 cf::_connect_to_perl_1;
3678 4158
3679 warn "loading config and database again"; 4159 trace "perl_reload: loading config and database again";
3680 cf::reload_config; 4160 cf::reload_config;
3681 4161
3682 warn "loading extensions"; 4162 trace "perl_reload: loading extensions";
3683 cf::load_extensions; 4163 cf::load_extensions;
3684 4164
4165 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 4166 trace "perl_reload: reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 4167 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 4168 trace "perl_reload: reattaching attachments to maps";
3688 reattach $_ for values %MAP; 4169 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 4170 trace "perl_reload: reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 4171 reattach $_ for values %PLAYER;
4172 }
3691 4173
3692 warn "leaving sync_job"; 4174 cf::_post_init 1;
3693 4175
4176 trace "perl_reload: leaving sync_job";
4177
3694 1 4178 1
3695 } or do { 4179 } or do {
3696 warn $@; 4180 error $@;
3697 cf::cleanup "error while reloading, exiting."; 4181 cf::cleanup "perl_reload: error, exiting.";
4182 };
4183
4184 --$RELOAD;
3698 }; 4185 }
3699 4186
3700 warn "reloaded"; 4187 $t1 = AE::time - $t1;
4188 info "perl_reload: completed in ${t1}s\n";
3701}; 4189};
3702 4190
3703our $RELOAD_WATCHER; # used only during reload 4191our $RELOAD_WATCHER; # used only during reload
3704 4192
3705sub reload_perl() { 4193sub reload_perl() {
3706 # doing reload synchronously and two reloads happen back-to-back, 4194 # doing reload synchronously and two reloads happen back-to-back,
3707 # coro crashes during coro_state_free->destroy here. 4195 # coro crashes during coro_state_free->destroy here.
3708 4196
4197 $RELOAD_WATCHER ||= cf::async {
4198 Coro::AIO::aio_wait cache_extensions;
4199
3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4200 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3710 do_reload_perl; 4201 do_reload_perl;
3711 undef $RELOAD_WATCHER; 4202 undef $RELOAD_WATCHER;
4203 };
3712 }; 4204 };
3713} 4205}
3714 4206
3715register_command "reload" => sub { 4207register_command "reload" => sub {
3716 my ($who, $arg) = @_; 4208 my ($who, $arg) = @_;
3722 reload_perl; 4214 reload_perl;
3723 }; 4215 };
3724 } 4216 }
3725}; 4217};
3726 4218
3727unshift @INC, $LIBDIR; 4219#############################################################################
3728 4220
3729my $bug_warning = 0; 4221my $bug_warning = 0;
3730 4222
3731our @WAIT_FOR_TICK;
3732our @WAIT_FOR_TICK_BEGIN;
3733
3734sub wait_for_tick { 4223sub wait_for_tick() {
3735 return if tick_inhibit || $Coro::current == $Coro::main; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3736 4225
3737 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
3738 push @WAIT_FOR_TICK, $signal;
3739 $signal->wait;
3740} 4227}
3741 4228
3742sub wait_for_tick_begin { 4229sub wait_for_tick_begin() {
3743 return if tick_inhibit || $Coro::current == $Coro::main; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3744 4231
3745 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
3746 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
3747 $signal->wait; 4234 $signal->wait;
3748} 4235}
3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4239 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3753 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
3754 return; 4241 return;
3755 } 4242 }
3756 4243
3757 cf::server_tick; # one server iteration 4244 cf::one_tick; # one server iteration
4245
4246 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3758 4247
3759 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4249 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3761 Coro::async_pool { 4250 Coro::async_pool {
3762 $Coro::current->{desc} = "runtime saver"; 4251 $Coro::current->{desc} = "runtime saver";
3763 write_runtime_sync 4252 write_runtime_sync
3764 or warn "ERROR: unable to write runtime file: $!"; 4253 or error "ERROR: unable to write runtime file: $!";
3765 }; 4254 };
3766 } 4255 }
3767 4256
3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3769 $sig->send; 4258 $sig->send;
3770 } 4259 }
3771 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
3772 $sig->send;
3773 }
3774 4261
3775 $LOAD = ($NOW - $TICK_START) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3777 4264
3778 if (0) { 4265 if (0) {
3779 if ($NEXT_TICK) { 4266 if ($NEXT_TICK) {
3780 my $jitter = $TICK_START - $NEXT_TICK; 4267 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4268 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d# 4269 debug "jitter $JITTER\n";#d#
3783 } 4270 }
3784 } 4271 }
3785} 4272}
3786 4273
3787{ 4274{
3788 # configure BDB 4275 # configure BDB
4276 info "initialising database";
3789 4277
3790 BDB::min_parallel 8; 4278 BDB::min_parallel 16;
3791 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
3792 $Coro::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
3793 4281
3794 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
3795 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3797 | BDB::LOG_AUTOREMOVE, 1); 4285 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4286 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4287 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4288 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3800 4289
3801 cf::sync_job { 4290 cf::sync_job {
3802 eval { 4291 eval {
3821 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3822 }; 4311 };
3823 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3824 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3825 }; 4314 };
4315
4316 info "database initialised";
3826} 4317}
3827 4318
3828{ 4319{
3829 # configure IO::AIO 4320 # configure IO::AIO
3830 4321
4322 info "initialising aio";
3831 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
3832 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
3833 $Coro::AIO::WATCHER->priority (1); 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
3834} 4327}
3835 4328
3836my $_log_backtrace; 4329our $_log_backtrace;
4330our $_log_backtrace_last;
3837 4331
3838sub _log_backtrace { 4332sub _log_backtrace {
3839 my ($msg, @addr) = @_; 4333 my ($msg, @addr) = @_;
3840 4334
3841 $msg =~ s/\n//; 4335 $msg =~ s/\n$//;
3842 4336
4337 if ($_log_backtrace_last eq $msg) {
4338 LOG llevInfo, "[ABT] $msg\n";
4339 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3843 # limit the # of concurrent backtraces 4340 # limit the # of concurrent backtraces
3844 if ($_log_backtrace < 2) { 4341 } elsif ($_log_backtrace < 2) {
4342 $_log_backtrace_last = $msg;
3845 ++$_log_backtrace; 4343 ++$_log_backtrace;
4344 my $perl_bt = Carp::longmess $msg;
3846 async { 4345 async {
3847 $Coro::current->{desc} = "abt $msg"; 4346 $Coro::current->{desc} = "abt $msg";
3848 4347
3849 my @bt = fork_call { 4348 my @bt = fork_call {
3850 @addr = map { sprintf "%x", $_ } @addr; 4349 @addr = map { sprintf "%x", $_ } @addr;
3861 } 4360 }
3862 4361
3863 @funcs 4362 @funcs
3864 }; 4363 };
3865 4364
3866 LOG llevInfo, "[ABT] $msg\n"; 4365 LOG llevInfo, "[ABT] $perl_bt\n";
4366 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3867 LOG llevInfo, "[ABT] $_\n" for @bt; 4367 LOG llevInfo, "[ABT] $_\n" for @bt;
3868 --$_log_backtrace; 4368 --$_log_backtrace;
3869 }; 4369 };
3870 } else { 4370 } else {
3871 LOG llevInfo, "[ABT] $msg\n"; 4371 LOG llevInfo, "[ABT] $msg\n";
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 4372 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3873 } 4373 }
3874} 4374}
3875 4375
3876# load additional modules 4376# load additional modules
3877use cf::pod; 4377require "cf/$_.pm" for @EXTRA_MODULES;
4378cf::_connect_to_perl_2;
3878 4379
3879END { cf::emergency_save } 4380END { cf::emergency_save }
3880 4381
38811 43821
3882 4383

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines