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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines