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.412 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 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# <http://www.gnu.org/licenses/>.
18# 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 1.86; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.32 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
86our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
93 120
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 123our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
99 125
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 129our $DB_ENV;
105 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
106our %CFG; 133our %CFG;
107 134
108our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
110our $NOW; 138our $NOW;
111 139
112our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
113our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
114our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 149our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
123 151
152our @POST_INIT;
153
154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
159
124binmode STDOUT; 160binmode STDOUT;
125binmode STDERR; 161binmode STDERR;
126 162
127# read virtual server time, if available 163# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
132} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
133 171
134mkdir $_ 172mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 174
137our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
138 176
139sub cf::map::normalise; 177sub cf::map::normalise;
140 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
141############################################################################# 183#############################################################################
142 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
143=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
144 197
145=over 4 198=over 4
146 199
147=item $cf::UPTIME 200=item $cf::UPTIME
148 201
149The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
150 218
151=item $cf::RUNTIME 219=item $cf::RUNTIME
152 220
153The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
154every server tick. 222every server tick.
160Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
161directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
162unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
163database environment. 231database environment.
164 232
165=item $cf::NOW
166
167The time of the last (current) server tick.
168
169=item $cf::TICK
170
171The interval between server ticks, in seconds.
172
173=item $cf::LOADAVG 233=item $cf::LOADAVG
174 234
175The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
176(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
177objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
186from wherever your confdir points to. 246from wherever your confdir points to.
187 247
188=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
189 249
190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
191returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
194=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
195 272
196This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 275that call.
199 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
200=back 283=back
201 284
202=cut 285=cut
203 286
204BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 294 my $msg = join "", @_;
207 295
208 $msg .= "\n" 296 $msg .= "\n"
209 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
210 298
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 300
213 LOG llevError, $msg; 301 LOG llevWarn, $msg;
214 }; 302};
215}
216 303
217$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
219 306
220 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 311 return;#d#
223 }#d# 312 }#d#
224 313
225 # kill coroutine otherwise 314 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 315 Coro::terminate
228}; 316};
229
230$SIG{__DIE__} = sub { }; #d#?
231 317
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 328for my $pkg (qw(
243 cf::global cf::attachable 329 cf::global cf::attachable
244 cf::object cf::object::player 330 cf::object cf::object::player
245 cf::client cf::player 331 cf::client cf::player
246 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
247 cf::map cf::party cf::region 334 cf::party cf::region
248)) { 335)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 337}
252 338
253$EV::DIED = sub { 339$EV::DIED = sub {
254 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
255}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
256 347
257############################################################################# 348#############################################################################
258 349
259=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
260 351
281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
282 $d 373 $d
283 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
284} 375}
285 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
286=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
287 392
288Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
289 394
290=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 402
298sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
300 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
467
301=item cf::lock_wait $string 468=item cf::lock_wait $string
302 469
303Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
304 471
305=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
306 473
307Wait until the given lock is available and then acquires it and returns 474Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
310returned. 477returned.
311 478
312Locks are *not* recursive, locking from the same coro twice results in a 479Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 480deadlocked coro.
319 486
320Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
321 488
322=cut 489=cut
323 490
324our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 492
327sub lock_wait($) { 493sub lock_wait($) {
328 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 495}
341 496
342sub lock_acquire($) { 497sub lock_acquire($) {
343 my ($key) = @_; 498 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 499}
357 500
358sub lock_active($) { 501sub lock_active($) {
359 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 503}
363 504
364sub freeze_mainloop { 505sub freeze_mainloop {
365 tick_inhibit_inc; 506 tick_inhibit_inc;
366 507
367 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
368} 509}
369 510
370=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
371 512
372Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 514get spread over time.
374 515
375=cut 516=cut
376 517
377sub periodic($$) { 518sub periodic($$) {
378 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
383} 524}
384 525
385=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
386 527
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
388This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
389of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
390 535
391The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
393 538
394Useful for short background jobs. 539Useful for short background jobs.
395 540
396=cut 541=cut
397 542
398our @SLOT_QUEUE; 543our @SLOT_QUEUE;
399our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
400 546
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
404 550
405 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
406 553
407 while () { 554 while () {
408 next_job: 555 next_job:
556
409 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 558
411 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 563 $job->[2]->send;
415 Coro::cede; 564 Coro::cede;
416 goto next_job; 565 goto next_job;
417 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 568 }
419 } 569 }
420 570
421 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
424 $signal->wait;
425 } else { 574 } else {
575 $busy = 0;
426 Coro::schedule; 576 Coro::schedule;
427 } 577 }
428 } 578 }
429}; 579};
430 580
431sub get_slot($;$$) { 581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
432 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
433 585
434 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
435 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
436 589
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
465=cut 618=cut
466 619
467sub sync_job(&) { 620sub sync_job(&) {
468 my ($job) = @_; 621 my ($job) = @_;
469 622
470 if ($Coro::current == $Coro::main) { 623 if (in_main) {
471 my $time = EV::time; 624 my $time = AE::time;
472 625
473 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
475 628
476 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
477 630
478 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
479 632
480 my $busy = 1; 633 my $busy = 1;
481 my @res; 634 my @res;
482 635
483 (async { 636 (async {
484 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 638 @res = eval { $job->() };
486 warn $@ if $@; 639 error $@ if $@;
487 undef $busy; 640 undef $busy;
488 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
489 642
490 while ($busy) { 643 while ($busy) {
491 if (Coro::nready) { 644 if (Coro::nready) {
493 } else { 646 } else {
494 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
495 } 648 }
496 } 649 }
497 650
498 my $time = EV::time - $time; 651 my $time = AE::time - $time;
499 652
500 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
501 654
502 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
503 } else { 656 } else {
525 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
526 679
527 $coro 680 $coro
528} 681}
529 682
530=item fork_call { }, $args 683=item fork_call { }, @args
531 684
532Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
533process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
534Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
535never block itself or use any form of event handling. 688never block itself or use any form of event handling.
536 689
537=cut 690=cut
538 691
692sub post_fork {
693 reset_signals;
694}
695
539sub fork_call(&@) { 696sub fork_call(&@) {
540 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
541 698
542 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
543 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
544 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
545 702
546 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
547 reset_signals; 704 cf::post_fork;
548 &$cb 705 &$cb
549 }, @args; 706 } @args;
550 707
551 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
720}
721
722=item $coin = coin_from_name $name
723
724=cut
725
726our %coin_alias = (
727 "silver" => "silvercoin",
728 "silvercoin" => "silvercoin",
729 "silvercoins" => "silvercoin",
730 "gold" => "goldcoin",
731 "goldcoin" => "goldcoin",
732 "goldcoins" => "goldcoin",
733 "platinum" => "platinacoin",
734 "platinumcoin" => "platinacoin",
735 "platinumcoins" => "platinacoin",
736 "platina" => "platinacoin",
737 "platinacoin" => "platinacoin",
738 "platinacoins" => "platinacoin",
739 "royalty" => "royalty",
740 "royalties" => "royalty",
741);
742
743sub coin_from_name($) {
744 $coin_alias{$_[0]}
745 ? cf::arch::find $coin_alias{$_[0]}
746 : undef
552} 747}
553 748
554=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
555 750
556Returns a single value from the environment database. 751Returns a single value from the environment database.
566within each server. 761within each server.
567 762
568=cut 763=cut
569 764
570sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
571 my ($name) = @_; 769 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
573 771
574 eval { 772 eval {
575 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
585} 783}
586 784
587our $DB; 785our $DB;
588 786
589sub db_init { 787sub db_init {
590 cf::sync_job {
591 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
592 };
593} 789}
594 790
595sub db_get($$) { 791sub db_get($$) {
596 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
597 793
598 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
599 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
600 798
601 $! ? () 799 $! ? ()
602 : $data 800 : $data
603 }
604} 801}
605 802
606sub db_put($$$) { 803sub db_put($$$) {
607 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
608 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
636 833
637 my @data; 834 my @data;
638 my $md5; 835 my $md5;
639 836
640 for (0 .. $#$src) { 837 for (0 .. $#$src) {
641 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
642 or Carp::croak "$src->[$_]: $!";
643 } 839 }
644 840
645 # if processing is expensive, check 841 # if processing is expensive, check
646 # checksum first 842 # checksum first
647 if (1) { 843 if (1) {
664 860
665 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
666 my $data = $process->(\@data); 862 my $data = $process->(\@data);
667 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
668 864
669 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
670 866
671 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
672 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
673 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
674 870
684 880
685=cut 881=cut
686 882
687sub datalog($@) { 883sub datalog($@) {
688 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
689 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
690} 886}
691 887
692=back 888=back
693 889
694=cut 890=cut
695 891
696############################################################################# 892#############################################################################
697 893
698=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
699 895
700Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
703 899
704In the following description, CLASS can be any of C<global>, C<object> 900In the following description, CLASS can be any of C<global>, C<object>
705C<player>, C<client> or C<map> (i.e. the attachable objects in 901C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
756 952
757Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
759 955
760Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
762 958
763These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
764 960
765=over 4 961=over 4
889 1085
890 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
891 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
892 1088
893 } elsif (ref $type) { 1089 } elsif (ref $type) {
894 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
895 1091
896 } else { 1092 } else {
897 shift @arg; 1093 shift @arg;
898 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
899 } 1095 }
900 } 1096 }
901} 1097}
902 1098
903sub _object_attach { 1099sub _object_attach {
913 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
914 } 1110 }
915 1111
916 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
917 } else { 1113 } else {
918 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
919 } 1115 }
920 1116
921 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
922} 1118}
923 1119
982 1178
983 for (@$callbacks) { 1179 for (@$callbacks) {
984 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
985 1181
986 if ($@) { 1182 if ($@) {
987 warn "$@";
988 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
989 override; 1184 override;
990 } 1185 }
991 1186
992 return 1 if $override; 1187 return 1 if $override;
993 } 1188 }
1056 1251
1057sub reattach { 1252sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1254 my ($obj) = @_;
1060 1255
1256 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1257 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1258
1063 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1064 1260
1065 @$registry = (); 1261 @$registry = ();
1066 1262
1071 for (@$attach) { 1267 for (@$attach) {
1072 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1073 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1074 } 1270 }
1075 } else { 1271 } else {
1076 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1077 } 1273 }
1078 } 1274 }
1079} 1275}
1080 1276
1081cf::attachable->attach ( 1277cf::attachable->attach (
1108 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1109 1305
1110 sync_job { 1306 sync_job {
1111 if (length $$rdata) { 1307 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1115 1312
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
1120 close $fh; 1320 aio_close $fh;
1121 1321
1122 if (@$objs) { 1322 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
1128 close $fh; 1331 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1333 }
1131 } else { 1334 } else {
1132 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1133 } 1336 }
1134 1337
1135 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1342 } else {
1137 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1138 } 1344 }
1139 } else { 1345 } else {
1140 aio_unlink $filename; 1346 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1142 } 1348 }
1166 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs}; 1373 $av = $st->{objs};
1168 } 1374 }
1169 1375
1170 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1171 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1172 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1173 1380
1174 ($data, $av) 1381 ($data, $av)
1175} 1382}
1176 1383
1177=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1233 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1234 1441
1235 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1236} 1443}
1237 1444
1445use File::Glob ();
1446
1238cf::player->attach ( 1447cf::player->attach (
1239 on_command => sub { 1448 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1241 1450
1242 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1243 or return; 1452 or return;
1244 1453
1252 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1253 1462
1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1255 1464
1256 if (ref $msg) { 1465 if (ref $msg) {
1257 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1258 "ARRAY" eq ref $msg
1259 ? @$msg
1260 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1261 1467
1262 my @reply; 1468 my @reply;
1263 1469
1264 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1265 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1267 1473
1268 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1269 if $reply; 1475 if $reply;
1270 1476
1271 } else { 1477 } else {
1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1273 } 1479 }
1274 1480
1275 cf::override; 1481 cf::override;
1276 }, 1482 },
1277); 1483);
1278 1484
1485# "readahead" all extensions
1486sub cache_extensions {
1487 my $grp = IO::AIO::aio_group;
1488
1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1490 for (grep /\.ext$/, @{$_[0]}) {
1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1492 }
1493 };
1494
1495 $grp
1496}
1497
1279sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1280 cf::sync_job { 1501 cf::sync_job {
1281 my %todo; 1502 my %todo;
1282 1503
1283 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1284 next unless -r $path; 1505 next unless -r $path;
1302 1523
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1526
1306 $ext{source} = 1527 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1308 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1309 . $source 1530 . $source
1310 . "\n};\n1"; 1531 . "\n};\n1";
1311 1532
1312 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1313 } 1534 }
1314 1535
1536 my $pass = 0;
1315 my %done; 1537 my %done;
1316 while (%todo) { 1538 while (%todo) {
1317 my $progress; 1539 my $progress;
1318 1540
1541 ++$pass;
1542
1543 ext:
1319 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1546 next ext
1322 unless exists $done{$_}; 1547 unless exists $done{$_};
1323 } 1548 }
1324 1549
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1551
1327 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1556
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1558 if exists $v->{meta}{mandatory};
1335 1559
1336 warn $msg; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1561 delete $todo{$k};
1562 } else {
1563 $done{$k} = delete $todo{$k};
1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1337 } 1569 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1570 }
1343 1571
1344 skip: 1572 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1347 } 1582 }
1348 }; 1583 };
1349} 1584}
1350 1585
1351############################################################################# 1586#############################################################################
1352 1587
1353=back 1588=back
1354 1589
1355=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1356 1591
1357Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1358 1593
1359=cut 1594=cut
1360 1595
1361package cf::player; 1596package cf::player;
1362 1597
1405 1640
1406sub exists($) { 1641sub exists($) {
1407 my ($login) = @_; 1642 my ($login) = @_;
1408 1643
1409 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1411} 1646}
1412 1647
1413sub find($) { 1648sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1650 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1662 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1663 or return;
1429 1664
1430 my $pl = cf::player::load_pl $f 1665 my $pl = cf::player::load_pl $f
1431 or return; 1666 or return;
1667
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1668 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1669 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1435 } 1671 }
1436 } 1672 }
1437} 1673}
1438 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1439sub save($) { 1688sub save($) {
1440 my ($pl) = @_; 1689 my ($pl) = @_;
1441 1690
1442 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1443 1692
1446 1695
1447 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1448 1697
1449 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1700
1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1451 1705
1452 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1707 cf::cede_to_tick;
1454} 1708}
1455 1709
1487 my ($pl) = @_; 1741 my ($pl) = @_;
1488 1742
1489 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1490 1744
1491 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1747
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1495 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1497 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1498 1756
1499 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1539 1797
1540 for my $login (@$dirs) { 1798 for my $login (@$dirs) {
1541 my $path = path $login; 1799 my $path = path $login;
1542 1800
1543 # a .pst is a dead give-away for a valid player 1801 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1802 # if no pst file found, open and chekc for blocked users
1803 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1807 }
1549 1808
1553 1812
1554 \@logins 1813 \@logins
1555} 1814}
1556 1815
1557=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1558 1819
1559Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1560player. May block. 1821player. May block.
1561 1822
1562=cut 1823=cut
1580 } 1841 }
1581 1842
1582 \@paths 1843 \@paths
1583} 1844}
1584 1845
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1847
1587Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1849
1678=item $player->ext_reply ($msgid, @msg) 1850=item $player->ext_reply ($msgid, @msg)
1679 1851
1680Sends an ext reply to the player. 1852Sends an ext reply to the player.
1681 1853
1713 1885
1714=cut 1886=cut
1715 1887
1716sub find_by_path($) { 1888sub find_by_path($) {
1717 my ($path) = @_; 1889 my ($path) = @_;
1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1718 1892
1719 my ($match, $specificity); 1893 my ($match, $specificity);
1720 1894
1721 for my $region (list) { 1895 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1748our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1750 1924
1751sub generate_random_map { 1925sub generate_random_map {
1752 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1753 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1754 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1762 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1763 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1764 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1765 (cf::region::find $rmp->{region}), $rmp->{custom}
1766 )
1767} 1931}
1768 1932
1769=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1770 1934
1771Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1776 1940
1777sub register { 1941sub register {
1778 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1779 my $pkg = caller; 1943 my $pkg = caller;
1780 1944
1781 no strict;
1782 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1783 1946
1784 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1785} 1948}
1786 1949
1787# also paths starting with '/' 1950# also paths starting with '/'
1788$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1789 1952
1790sub thawer_merge { 1953sub thawer_merge {
1791 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1792 1955
1793 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1798} 1961}
1799 1962
1800sub normalise { 1963sub normalise {
1801 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1802 1965
1803 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1804 1967
1805 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1806 1969
1807 # map plan: 1970 # map plan:
1808 # 1971 #
1823 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1824 $path = "$base/$path"; 1987 $path = "$base/$path";
1825 } 1988 }
1826 1989
1827 for ($path) { 1990 for ($path) {
1828 redo if s{//}{/};
1829 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1830 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1831 } 1993 }
1832 1994
1833 $path 1995 $path
1847 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1848 return $self; 2010 return $self;
1849 } 2011 }
1850 } 2012 }
1851 2013
1852 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1853 () 2015 ()
1854} 2016}
1855 2017
2018# may re-bless or do other evil things
1856sub init { 2019sub init {
1857 my ($self) = @_; 2020 my ($self) = @_;
1858 2021
1859 $self 2022 $self
1860} 2023}
1879 2042
1880# the temporary/swap location 2043# the temporary/swap location
1881sub save_path { 2044sub save_path {
1882 my ($self) = @_; 2045 my ($self) = @_;
1883 2046
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1886} 2049}
1887 2050
1888# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1889sub uniq_path { 2052sub uniq_path {
1890 my ($self) = @_; 2053 my ($self) = @_;
1891 2054
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 2057}
1904 2058
1905sub decay_objects { 2059sub decay_objects {
1906 my ($self) = @_; 2060 my ($self) = @_;
1907 2061
1934 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1935 2089
1936 1 2090 1
1937} 2091}
1938 2092
2093# used to laod the header of an original map
1939sub load_header_orig { 2094sub load_header_orig {
1940 my ($self) = @_; 2095 my ($self) = @_;
1941 2096
1942 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1943} 2098}
1944 2099
2100# used to laod the header of an instantiated map
1945sub load_header_temp { 2101sub load_header_temp {
1946 my ($self) = @_; 2102 my ($self) = @_;
1947 2103
1948 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1949} 2105}
1950 2106
2107# called after loading the header from an instantiated map
1951sub prepare_temp { 2108sub prepare_temp {
1952 my ($self) = @_; 2109 my ($self) = @_;
1953 2110
1954 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1956 # safety 2113 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2116}
1960 2117
2118# called after loading the header from an original map
1961sub prepare_orig { 2119sub prepare_orig {
1962 my ($self) = @_; 2120 my ($self) = @_;
1963 2121
1964 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1989 2147
1990sub find; 2148sub find;
1991sub find { 2149sub find {
1992 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1993 2151
2152 cf::cede_to_tick;
2153
1994 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1995 2155
1996 cf::lock_wait "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2158
1999 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
2004 or return; 2161 or return;
2005 2162
2006 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
2007 2164
2009 or return; 2166 or return;
2010 2167
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
2014 undef $guard1; 2172 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2173 $map->reset;
2017 return find $path; 2174 return find $path;
2018 } 2175 }
2019 2176
2020 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
2021 } 2178 }
2022} 2179}
2023 2180
2024sub pre_load { } 2181sub pre_load { }
2025sub post_load { } 2182#sub post_load { } # XS
2026 2183
2027sub load { 2184sub load {
2028 my ($self) = @_; 2185 my ($self) = @_;
2029 2186
2030 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2033 2190
2034 { 2191 {
2035 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2036 2193
2037 return unless $self->valid; 2194 return unless $self->valid;
2038 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2039
2040 $self->in_memory (cf::MAP_LOADING);
2041 2196
2042 $self->alloc; 2197 $self->alloc;
2043 2198
2044 $self->pre_load; 2199 $self->pre_load;
2045 cf::cede_to_tick; 2200 cf::cede_to_tick;
2046 2201
2202 if (exists $self->{load_path}) {
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2204 $f->skip_block;
2049 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2050 or return; 2206 or return;
2051 2207
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
2053 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2054 2210
2055 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2212 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2059 $self->clear_unique_items; 2215 $self->clear_unique_items;
2060 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2062 } 2219 }
2063 } 2220 }
2064 }
2065 2221
2066 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2067 2229
2068 cf::cede_to_tick; 2230 cf::cede_to_tick;
2069 # now do the right thing for maps 2231 # now do the right thing for maps
2070 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2071 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2075 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2238 $self->decay_objects;
2077 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2078 $self->update_buttons; 2240 $self->update_buttons;
2079 cf::cede_to_tick; 2241 cf::cede_to_tick;
2080 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
2081 cf::cede_to_tick;
2082 $self->activate;
2083 } 2243 }
2084 2244
2085 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2087
2088 $self->in_memory (cf::MAP_IN_MEMORY);
2089 } 2247 }
2090 2248
2091 $self->post_load; 2249 $self->post_load;
2092}
2093 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2094sub customise_for { 2257sub customise_for {
2095 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2096 2259
2097 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2261 if $self->per_player;
2101# if $self->per_party; 2264# if $self->per_party;
2102 2265
2103 $self 2266 $self
2104} 2267}
2105 2268
2106# find and load all maps in the 3x3 area around a map
2107sub load_neighbours {
2108 my ($map) = @_;
2109
2110 my @neigh; # diagonal neighbours
2111
2112 for (0 .. 3) {
2113 my $neigh = $map->tile_path ($_)
2114 or next;
2115 $neigh = find $neigh, $map
2116 or next;
2117 $neigh->load;
2118
2119 push @neigh,
2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2122 }
2123
2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
2126 my $neigh = find $path, $origin
2127 or next;
2128 $neigh->load;
2129 }
2130}
2131
2132sub find_sync { 2269sub find_sync {
2133 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2134 2271
2135 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2136} 2277}
2137 2278
2138sub do_load_sync { 2279sub do_load_sync {
2139 my ($map) = @_; 2280 my ($map) = @_;
2140 2281
2282 # it's a bug to call this from the main context
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2143 2285
2144 cf::sync_job { $map->load }; 2286 $map->load;
2145} 2287}
2146 2288
2147our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2148our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2149 2291
2150sub find_async { 2292sub find_async {
2151 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2152 2294
2153 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2154 2296
2155 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
2157 } 2299 }
2158 2300
2159 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2160 2302
2161 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2175 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2176 2318
2177 () 2319 ()
2178} 2320}
2179 2321
2322# common code, used by both ->save and ->swapout
2180sub save { 2323sub _save {
2181 my ($self) = @_; 2324 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2325
2185 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2186 2327
2187 return unless $self->dirty; 2328 return unless $self->dirty;
2188 2329
2197 2338
2198 cf::async { 2339 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2340 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
2201 }; 2342 };
2343
2344 cf::get_slot 0.02;
2202 2345
2203 if ($uniq) { 2346 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2349 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2208 } 2351 }
2209} 2352}
2210 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2211sub swap_out { 2362sub swap_out {
2212 my ($self) = @_; 2363 my ($self) = @_;
2213 2364
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2219 return if $self->players; 2369 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2221 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2222 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2223 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2224 2421
2225 $self->deactivate; 2422 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2227 $self->clear; 2424 $self->clear;
2228}
2229
2230sub reset_at {
2231 my ($self) = @_;
2232
2233 # TODO: safety, remove and allow resettable per-player maps
2234 return 1e99 if $self->{deny_reset};
2235
2236 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2237 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2238
2239 $time + $to
2240}
2241
2242sub should_reset {
2243 my ($self) = @_;
2244
2245 $self->reset_at <= $cf::RUNTIME
2246}
2247
2248sub reset {
2249 my ($self) = @_;
2250
2251 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252
2253 return if $self->players;
2254
2255 warn "resetting map ", $self->path;
2256
2257 $self->in_memory (cf::MAP_SWAPPED);
2258
2259 # need to save uniques path
2260 unless ($self->{deny_save}) {
2261 my $uniq = $self->uniq_path; utf8::encode $uniq;
2262
2263 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2264 if $uniq;
2265 }
2266
2267 delete $cf::MAP{$self->path};
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear;
2272 2425
2273 $self->unlink_save; 2426 $self->unlink_save;
2274 $self->destroy; 2427 $self->destroy;
2275} 2428}
2276 2429
2284 2437
2285 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2286 2439
2287 $self->unlink_save; 2440 $self->unlink_save;
2288 2441
2289 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2290 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2291 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2292 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2294 2447
2343 2496
2344sub unique_maps() { 2497sub unique_maps() {
2345 [ 2498 [
2346 map { 2499 map {
2347 utf8::decode $_; 2500 utf8::decode $_;
2348 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2349 ? normalise $_ 2504 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2506 ]
2353} 2507}
2354 2508
2355package cf; 2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2356 2540
2357=back 2541=back
2358 2542
2359=head3 cf::object 2543=head3 cf::object
2360 2544
2364 2548
2365=over 4 2549=over 4
2366 2550
2367=item $ob->inv_recursive 2551=item $ob->inv_recursive
2368 2552
2369Returns the inventory of the object _and_ their inventories, recursively. 2553Returns the inventory of the object I<and> their inventories, recursively,
2554but I<not> the object itself.
2370 2555
2371=cut 2556=cut
2372 2557
2373sub inv_recursive_; 2558sub inv_recursive_;
2374sub inv_recursive_ { 2559sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2380} 2565}
2381 2566
2382=item $ref = $ob->ref 2567=item $ref = $ob->ref
2383 2568
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2569Creates and returns a persistent reference to an object that can be stored as a string.
2385 2570
2386=item $ob = cf::object::deref ($refstring) 2571=item $ob = cf::object::deref ($refstring)
2387 2572
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2573returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2574even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2606can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2607dialogue with the given NPC character.
2423 2608
2424=cut 2609=cut
2425 2610
2611our $SAY_CHANNEL = {
2612 id => "say",
2613 title => "Map",
2614 reply => "say ",
2615 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2616};
2617
2618our $CHAT_CHANNEL = {
2619 id => "chat",
2620 title => "Chat",
2621 reply => "chat ",
2622 tooltip => "Player chat and shouts, global to the server.",
2623};
2624
2426# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2626# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2627#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2629 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2641 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2642
2444 } else { 2643 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2646 }
2448 } 2647 }
2449} 2648}
2450 2649
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2650=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2675
2477=item $player_object->enter_link 2676=item $player_object->enter_link
2478 2677
2479Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2480 2679
2481The player should be reasonably safe there for short amounts of time. You 2680The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2682though, as the player cannot control the character while it is on the link
2683map.
2483 2684
2484Will never block. 2685Will never block.
2485 2686
2486=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2487 2688
2507sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2508 my ($self) = @_; 2709 my ($self) = @_;
2509 2710
2510 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2511 2712
2713 ++$self->{_link_recursion};
2714
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2716
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2516 2719
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2721}
2519 2722
2520sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2522 2725
2539 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2541 2744
2542 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2545 2748
2546 $map->load; 2749 $map->load;
2547 $map->load_neighbours;
2548 2750
2549 return unless $self->contr->active; 2751 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2752
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2554} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2555 2760
2761}
2762
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2557 2764
2558Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2769be called at the end of this process.
2563 2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2773
2564=cut 2774=cut
2565 2775
2566our $GOTOGEN; 2776our $GOTOGEN;
2567 2777
2568sub cf::object::player::goto { 2778sub cf::object::player::goto {
2569 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2570 2786
2571 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2573 2789
2574 $self->enter_link; 2790 $self->enter_link;
2594 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2595 } 2811 }
2596 } 2812 }
2597 2813
2598 my $map = eval { 2814 my $map = eval {
2599 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2600 2816
2601 if ($map) { 2817 if ($map) {
2602 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2603 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2604 } else { 2820 } else {
2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2606 } 2822 }
2607 2823
2608 $map 2824 $map
2616 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2617 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2618 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2619 } 2835 }
2620 2836
2621 $done->() if $done; 2837 $done->($self) if $done;
2622 })->prio (1); 2838 })->prio (1);
2623} 2839}
2624 2840
2625=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2626 2842
2646} 2862}
2647 2863
2648sub prepare_random_map { 2864sub prepare_random_map {
2649 my ($exit) = @_; 2865 my ($exit) = @_;
2650 2866
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2869 # that depends on the exit object
2656 2870
2657 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2873 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2664 } 2880 }
2665 2881
2666 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2667 2883
2668 my $data = cf::encode_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2671 2887
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2890 undef $fh;
2675 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2676 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2679 } 2899 }
2680} 2900}
2681 2901
2682sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2684 2904
2685 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2686 2906
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2907 $self->enter_link;
2699 2908
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2909 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2910 $Coro::current->{desc} = "enter_exit";
2706 2911
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2912 unless (eval {
2913 $self->deactivate_recursive; # just to be sure
2914
2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2916 my $x = $exit->stats->hp;
2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2941
2709 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2710 2943
2944 # if exit is damned, update players death & WoR home-position
2945 $self->contr->savebed ($map, $x, $y)
2946 if $exit->flag (cf::FLAG_DAMNED);
2947
2711 1; 2948 1
2712 }) { 2949 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2954
2718 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2956 $self->leave_link;
2720 } 2957 }
2721 })->prio (1); 2958 })->prio (1);
2722} 2959}
2723 2960
2735sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2737 2974
2738 utf8::encode $text; 2975 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2740} 3002}
2741 3003
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3005
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2748 3010
2749=cut 3011=cut
2750 3012
2751# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2753 "c/identify" => { 3021 "c/identify" => {
2754 id => "infobox", 3022 id => "infobox",
2755 title => "Identify", 3023 title => "Identify",
2756 reply => undef, 3024 reply => undef,
2757 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2759 "c/examine" => { 3027 "c/examine" => {
2760 id => "infobox", 3028 id => "infobox",
2761 title => "Examine", 3029 title => "Examine",
2762 reply => undef, 3030 reply => undef,
2763 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3038 },
2765 "c/book" => { 3039 "c/book" => {
2766 id => "infobox", 3040 id => "infobox",
2767 title => "Book", 3041 title => "Book",
2768 reply => undef, 3042 reply => undef,
2784 id => "infobox", 3058 id => "infobox",
2785 title => "Body Parts", 3059 title => "Body Parts",
2786 reply => undef, 3060 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 3061 tooltip => "Shows which body parts you posess and are available",
2788 }, 3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
3069 "c/skills" => {
3070 id => "infobox",
3071 title => "Skills",
3072 reply => undef,
3073 tooltip => "Shows your experience per skill and item power",
3074 },
3075 "c/shopitems" => {
3076 id => "infobox",
3077 title => "Shop Items",
3078 reply => undef,
3079 tooltip => "Shows the items currently for sale in this shop",
3080 },
3081 "c/resistances" => {
3082 id => "infobox",
3083 title => "Resistances",
3084 reply => undef,
3085 tooltip => "Shows your resistances",
3086 },
3087 "c/pets" => {
3088 id => "infobox",
3089 title => "Pets",
3090 reply => undef,
3091 tooltip => "Shows information abotu your pets/a specific pet",
3092 },
3093 "c/perceiveself" => {
3094 id => "infobox",
3095 title => "Perceive Self",
3096 reply => undef,
3097 tooltip => "You gained detailed knowledge about yourself",
3098 },
2789 "c/uptime" => { 3099 "c/uptime" => {
2790 id => "infobox", 3100 id => "infobox",
2791 title => "Uptime", 3101 title => "Uptime",
2792 reply => undef, 3102 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3103 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 3106 id => "infobox",
2797 title => "Map Info", 3107 title => "Map Info",
2798 reply => undef, 3108 reply => undef,
2799 tooltip => "Information related to the maps", 3109 tooltip => "Information related to the maps",
2800 }, 3110 },
3111 "c/party" => {
3112 id => "party",
3113 title => "Party",
3114 reply => "gsay ",
3115 tooltip => "Messages and chat related to your party",
3116 },
3117 "c/death" => {
3118 id => "death",
3119 title => "Death",
3120 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death",
3122 },
3123 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL,
2801); 3125);
2802 3126
2803sub cf::client::send_msg { 3127sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3129
2806 $msg = $self->pl->expand_cfpod ($msg); 3130 $msg = $self->pl->expand_cfpod ($msg)
3131 unless $color & cf::NDI_VERBATIM;
2807 3132
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3133 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3134
2810 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3136 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3137 $channel = $CHANNEL{$channel};
2813 3138
2814 $self->ext_msg (channel_info => $channel) 3139 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3140 $channel = $channel->{id};
2818 3141
2819 } elsif (ref $channel) { 3142 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3147 }
2826 3148
2827 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2828 } 3150 }
2829 3151
2830 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2831 3153
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3154 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2836 3157
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3158 my $pkt = "msg "
3159 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3161 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3162
2851 $color &= cf::NDI_COLOR_MASK; 3163 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3164}
2865 3165
2866=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2867 3167
2868Sends an ext event to the client. 3168Sends an ext event to the client.
2871 3171
2872sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2874 3174
2875 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3180 }
2881} 3181}
2882 3182
2883=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2884 3184
2887=cut 3187=cut
2888 3188
2889sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2891 3191
2892 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 }
2899} 3195}
2900 3196
2901=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2902 3198
2903Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2958 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2959 3255
2960 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2961 3257
2962 if (ref $msg) { 3258 if (ref $msg) {
2963 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2964 "ARRAY" eq ref $msg
2965 ? @$msg
2966 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2967 3260
2968 my @reply; 3261 my @reply;
2969 3262
2970 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2971 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2973 3266
2974 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2975 if $reply; 3268 if $reply;
2976 3269
2977 } else { 3270 } else {
2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2979 } 3272 }
2980 3273
2981 cf::override; 3274 cf::override;
2982 }, 3275 },
2983); 3276);
3003 3296
3004 $coro 3297 $coro
3005} 3298}
3006 3299
3007cf::client->attach ( 3300cf::client->attach (
3008 on_destroy => sub { 3301 on_client_destroy => sub {
3009 my ($ns) = @_; 3302 my ($ns) = @_;
3010 3303
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3305 },
3013); 3306);
3029our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3030 3323
3031$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3032 3325
3033$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3036 sort time 3329 sort time
3037)); 3330));
3038 3331
3039# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3042 3335
3043The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
3044 3337
3045 cf::object 3338 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3339 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3340 insert remove name archname title slaying race decrease split
3341 value
3048 3342
3049 cf::object::player 3343 cf::object::player
3050 player 3344 player
3051 3345
3052 cf::player 3346 cf::player
3057 3351
3058=cut 3352=cut
3059 3353
3060for ( 3354for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3355 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3067) { 3361) {
3068 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3071 for @funs; 3364 for @funs;
3072} 3365}
3073 3366
3088 3381
3089 my $qcode = $code; 3382 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3092 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
3093 local $_; 3389 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3390
3096 my $eval = 3391 my $eval =
3097 "do {\n" 3392 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3395 . $code
3101 . "\n}" 3396 . "\n}"
3102 ; 3397 ;
3103 3398
3399 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
3107 3408
3108 if ($@) { 3409 if ($@) {
3109 warn "$@"; 3410 warn "$@",
3110 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3112 } 3413 }
3113 3414
3114 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3115} 3416}
3116 3417
3130=cut 3431=cut
3131 3432
3132sub register_script_function { 3433sub register_script_function {
3133 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3134 3435
3135 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3137} 3438}
3138 3439
3139=back 3440=back
3140 3441
3141=cut 3442=cut
3150 # for this (global event?) 3451 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3152 3453
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154 3455
3155 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3156 3457
3157 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3158 0 < aio_load $path, $facedata
3159 or die "$path: $!";
3160
3161 $facedata = Coro::Storable::thaw $facedata;
3162 3459
3163 $facedata->{version} == 2 3460 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3165 3462
3166 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3167 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC, 3466 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3170 }; 3469 };
3171 cf::cede_to_tick; 3470 cf::cede_to_tick;
3172 3471
3173 { 3472 {
3174 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3176 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3477
3179 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3183 3483
3184 cf::cede_to_tick; 3484 cf::cede_to_tick;
3185 } 3485 }
3186 3486
3187 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3192 3492
3193 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3196 } else { 3496 } else {
3197 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3198 } 3498 }
3199 3499
3200 cf::cede_to_tick; 3500 cf::cede_to_tick;
3201 } 3501 }
3202 } 3502 }
3211 3511
3212 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3213 } 3513 }
3214 3514
3215 { 3515 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3219 3517
3220 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3519 if (defined (my $type = delete $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3522
3225 if ($info->{type} & 1) { 3523 cf::face::set_data $idx, 0, delete $info->{data}, delete $info->{hash};
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, (keys %$info && (~$type & 1)) ? $info : undef; # any keys left are stashed into meta unless prepended
3240 } else { 3526 } else {
3241 $RESOURCE{$name} = $info; 3527# $RESOURCE{$name} = $info; # unused
3242 } 3528 }
3243 3529
3244 cf::cede_to_tick; 3530 cf::cede_to_tick;
3245 } 3531 }
3246 } 3532 }
3247 3533
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249 3535
3250 1 3536 1
3251} 3537}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272 3538
3273register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_; 3540 my ($ns, $want) = @_;
3275 3541
3276 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3543 $ns->fx_want ($k, $v);
3278 } 3544 }
3279}; 3545};
3546
3547sub load_resource_file($) {
3548 my $guard = lock_acquire "load_resource_file";
3549
3550 my $status = load_resource_file_ $_[0];
3551 get_slot 0.1, 100;
3552 cf::arch::commit_load;
3553
3554 $status
3555}
3280 3556
3281sub reload_regions { 3557sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3558 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3559 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3560 %ext::player_env::MUSIC_FACE_CACHE = ();
3298} 3574}
3299 3575
3300sub reload_archetypes { 3576sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3577 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3578 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3579}
3309 3580
3310sub reload_treasures { 3581sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3313} 3584}
3314 3585
3586sub reload_sound {
3587 trace "loading sound config from $DATADIR/sound\n";
3588
3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3590
3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3592 my $sound = $soundconf->{compat}[$_]
3593 or next;
3594
3595 my $face = cf::face::find "sound/$sound->[1]";
3596 cf::sound::set $sound->[0] => $face;
3597 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3598 }
3599
3600 while (my ($k, $v) = each %{$soundconf->{event}}) {
3601 my $face = cf::face::find "sound/$v";
3602 cf::sound::set $k => $face;
3603 }
3604}
3605
3315sub reload_resources { 3606sub reload_resources {
3316 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3317 3608
3609 reload_exp_table;
3610 reload_materials;
3611 reload_facedata;
3612 reload_sound;
3613 reload_archetypes;
3318 reload_regions; 3614 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3615 reload_treasures;
3323 3616
3324 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3618}
3330 3619
3331sub reload_config { 3620sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3621 trace "reloading config file...\n";
3333 or return;
3334 3622
3335 local $/; 3623 my $config = load_file "$CONFDIR/config";
3336 *CFG = YAML::Load <$fh>; 3624 utf8::decode $config;
3625 *CFG = decode_yaml $config;
3337 3626
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3339 3628
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3342 3631
3343 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
3347 }; 3636 };
3348 warn $@ if $@; 3637 warn $@ if $@;
3349 } 3638 }
3350} 3639}
3351 3640
3641sub pidfile() {
3642 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3643 or die "$PIDFILE: $!";
3644 flock $fh, &Fcntl::LOCK_EX
3645 or die "$PIDFILE: flock: $!";
3646 $fh
3647}
3648
3649# make sure only one server instance is running at any one time
3650sub atomic {
3651 my $fh = pidfile;
3652
3653 my $pid = <$fh>;
3654 kill 9, $pid if $pid > 0;
3655
3656 seek $fh, 0, 0;
3657 print $fh $$;
3658}
3659
3660sub main_loop {
3661 trace "EV::loop starting\n";
3662 if (1) {
3663 EV::loop;
3664 }
3665 trace "EV::loop returned\n";
3666 goto &main_loop unless $REALLY_UNLOOP;
3667}
3668
3352sub main { 3669sub main {
3670 cf::init_globals; # initialise logging
3671
3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3676
3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3678
3353 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3681 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3682 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3683 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3684 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3685 })->prio (Coro::PRIO_MAX);
3360 }; 3686 };
3361 3687
3688 evthread_start IO::AIO::poll_fileno;
3689
3690 cf::sync_job {
3691 cf::incloader::init ();
3692
3693 cf::init_anim;
3694 cf::init_attackmess;
3695 cf::init_dynamic;
3696
3697 cf::load_settings;
3698
3699 reload_resources;
3362 reload_config; 3700 reload_config;
3363 db_init; 3701 db_init;
3702
3703 cf::init_uuid;
3704 cf::init_signals;
3705 cf::init_skills;
3706
3707 cf::init_beforeplay;
3708
3709 atomic;
3710
3364 load_extensions; 3711 load_extensions;
3365 3712
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3713 utime time, time, $RUNTIMEFILE;
3367 evthread_start; 3714
3368 EV::loop; 3715 # no (long-running) fork's whatsoever before this point(!)
3716 use POSIX ();
3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3718
3719 cf::_post_init 0;
3720 };
3721
3722 cf::object::thawer::errors_are_fatal 0;
3723 info "parse errors in files are no longer fatal from this point on.\n";
3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3729 goto &main_loop;
3369} 3730}
3370 3731
3371############################################################################# 3732#############################################################################
3372# initialisation and cleanup 3733# initialisation and cleanup
3373 3734
3374# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3375BEGIN { 3736BEGIN {
3376 our %SIGWATCHER = (); 3737 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3380 }; 3741 };
3381 } 3742 }
3382} 3743}
3383 3744
3384sub write_runtime { 3745sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3746 my $t0 = AE::time;
3386 3747
3387 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3389 3750
3390 IO::AIO::aio_utime $runtime, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3752
3392 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
3393 3754
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 3756 or return;
3396 3757
3397 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3770 aio_utime $fh, undef, undef;
3410 3771
3411 close $fh 3772 close $fh
3412 or return; 3773 or return;
3413 3774
3414 aio_rename "$runtime~", $runtime 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3776 and return;
3416 3777
3417 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 3779
3419 1 3780 1
3781}
3782
3783our $uuid_lock;
3784our $uuid_skip;
3785
3786sub write_uuid_sync($) {
3787 $uuid_skip ||= $_[0];
3788
3789 return if $uuid_lock;
3790 local $uuid_lock = 1;
3791
3792 my $uuid = "$LOCALDIR/uuid";
3793
3794 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3795 or return;
3796
3797 my $value = uuid_seq uuid_cur;
3798
3799 unless ($value) {
3800 info "cowardly refusing to write zero uuid value!\n";
3801 return;
3802 }
3803
3804 my $value = uuid_str $value + $uuid_skip;
3805 $uuid_skip = 0;
3806
3807 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3808 and return;
3809
3810 # always fsync - this file is important
3811 aio_fsync $fh
3812 and return;
3813
3814 close $fh
3815 or return;
3816
3817 aio_rename "$uuid~", $uuid
3818 and return;
3819
3820 trace "uuid file written ($value).\n";
3821
3822 1
3823
3824}
3825
3826sub write_uuid($$) {
3827 my ($skip, $sync) = @_;
3828
3829 $sync ? write_uuid_sync $skip
3830 : async { write_uuid_sync $skip };
3420} 3831}
3421 3832
3422sub emergency_save() { 3833sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3424 3835
3425 warn "enter emergency perl save\n"; 3836 info "emergency_perl_save: enter\n";
3837
3838 # this is a trade-off: we want to be very quick here, so
3839 # save all maps without fsync, and later call a global sync
3840 # (which in turn might be very very slow)
3841 local $USE_FSYNC = 0;
3426 3842
3427 cf::sync_job { 3843 cf::sync_job {
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3428 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3852 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3854 $pl->save;
3437 } 3855 }
3438 warn "end emergency player save\n"; 3856 info "emergency_perl_save: end player save\n";
3439 3857
3440 warn "begin emergency map save\n"; 3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3860 info "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3863 $map->valid or next;
3444 $map->save; 3864 $map->save;
3445 } 3865 }
3446 warn "end emergency map save\n"; 3866 info "emergency_perl_save: end map save\n";
3447 3867
3448 warn "begin emergency database checkpoint\n"; 3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3870 info "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3873
3874 info "emergency_perl_save: begin write uuid\n";
3875 write_uuid_sync 1;
3876 info "emergency_perl_save: end write uuid\n";
3877
3878 cf::write_runtime_sync; # external watchdog should not bark
3879
3880 trace "emergency_perl_save: syncing database to disk";
3881 BDB::db_env_txn_checkpoint $DB_ENV;
3882
3883 info "emergency_perl_save: starting sync\n";
3884 IO::AIO::aio_sync sub {
3885 info "emergency_perl_save: finished sync\n";
3886 };
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3889
3890 trace "emergency_perl_save: flushing outstanding aio requests";
3891 while (IO::AIO::nreqs || BDB::nreqs) {
3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3893 }
3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3451 }; 3896 };
3452 3897
3453 warn "leave emergency perl save\n"; 3898 info "emergency_perl_save: leave\n";
3454} 3899}
3455 3900
3456sub post_cleanup { 3901sub post_cleanup {
3457 my ($make_core) = @_; 3902 my ($make_core) = @_;
3458 3903
3904 IO::AIO::flush;
3905
3459 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3907 if $make_core;
3908
3909 my $fh = pidfile;
3910 unlink $PIDFILE if <$fh> == $$;
3911}
3912
3913# a safer delete_package, copied from Symbol
3914sub clear_package($) {
3915 my $pkg = shift;
3916
3917 # expand to full symbol table name if needed
3918 unless ($pkg =~ /^main::.*::$/) {
3919 $pkg = "main$pkg" if $pkg =~ /^::/;
3920 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3921 $pkg .= '::' unless $pkg =~ /::$/;
3922 }
3923
3924 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3925 my $stem_symtab = *{$stem}{HASH};
3926
3927 defined $stem_symtab and exists $stem_symtab->{$leaf}
3928 or return;
3929
3930 # clear all symbols
3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3932 for my $name (keys %$leaf_symtab) {
3933 _gv_clear *{"$pkg$name"};
3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3935 }
3461} 3936}
3462 3937
3463sub do_reload_perl() { 3938sub do_reload_perl() {
3464 # can/must only be called in main 3939 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3466 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3467 return; 3942 return;
3468 } 3943 }
3469 3944
3470 warn "reloading..."; 3945 return if $RELOAD++;
3471 3946
3472 warn "entering sync_job"; 3947 my $t1 = AE::time;
3473 3948
3949 while ($RELOAD) {
3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3952
3953 trace "perl_reload: entering sync_job";
3954
3474 cf::sync_job { 3955 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark
3476 cf::emergency_save; 3956 #cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark
3478 3957
3479 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV;
3481
3482 # if anything goes wrong in here, we should simply crash as we already saved
3483
3484 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs;
3490 warn "iterate...";
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = (); 3960 %EXT_CORO = ();
3498 3961
3499 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3500 %COMMAND = (); 3963 %COMMAND = ();
3501 3964
3502 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3503 %EXTCMD = (); 3966 %EXTCMD = ();
3504 %EXTICMD = (); 3967 %EXTICMD = ();
3505 3968
3506 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3507 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3509 3972
3510 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3511 eval { 3974 eval {
3512 $cb->($pkg); 3975 $cb->($pkg);
3513 1 3976 1
3514 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3978 }
3979
3980 trace "... clearing $pkg";
3981 clear_package $pkg;
3515 } 3982 }
3516 3983
3517 warn "... nuking $pkg";
3518 Symbol::delete_package $pkg;
3519 }
3520
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3522 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3987
3525 warn "... unloading $k"; 3988 trace "... unloading $k";
3526 delete $INC{$k}; 3989 delete $INC{$k};
3527 3990
3528 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3530 3993
3531 if (my $cb = $k->can ("unload_module")) { 3994 if (my $cb = $k->can ("unload_module")) {
3532 $cb->(); 3995 $cb->();
3996 }
3997
3998 clear_package $k;
3533 } 3999 }
3534 4000
3535 Symbol::delete_package $k;
3536 }
3537
3538 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 4002 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 4004
3542 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 4008
3546 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3547 # and global variables created in xs 4010 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3549 4012
3550 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3551 4014
3552 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3553 require cf; 4016 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4017 cf::_connect_to_perl_1;
3555 4018
3556 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3557 cf::reload_config; 4020 cf::reload_config;
3558 4021
3559 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3560 cf::load_extensions; 4023 cf::load_extensions;
3561 4024
4025 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3565 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
4032 }
3568 4033
3569 warn "leaving sync_job"; 4034 cf::_post_init 1;
3570 4035
4036 trace "perl_reload: leaving sync_job";
4037
3571 1 4038 1
3572 } or do { 4039 } or do {
3573 warn $@; 4040 error $@;
3574 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
4042 };
4043
4044 --$RELOAD;
3575 }; 4045 }
3576 4046
3577 warn "reloaded"; 4047 $t1 = AE::time - $t1;
4048 info "perl_reload: completed in ${t1}s\n";
3578}; 4049};
3579 4050
3580our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3581 4052
3582sub reload_perl() { 4053sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 4054 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3585 4056
4057 $RELOAD_WATCHER ||= cf::async {
4058 Coro::AIO::aio_wait cache_extensions;
4059
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 4061 do_reload_perl;
3588 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
4063 };
3589 }; 4064 };
3590} 4065}
3591 4066
3592register_command "reload" => sub { 4067register_command "reload" => sub {
3593 my ($who, $arg) = @_; 4068 my ($who, $arg) = @_;
3599 reload_perl; 4074 reload_perl;
3600 }; 4075 };
3601 } 4076 }
3602}; 4077};
3603 4078
3604unshift @INC, $LIBDIR; 4079#############################################################################
3605 4080
3606my $bug_warning = 0; 4081my $bug_warning = 0;
3607 4082
3608our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN;
3610
3611sub wait_for_tick { 4083sub wait_for_tick() {
3612 return if tick_inhibit; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3613 return if $Coro::current == $Coro::main;
3614 4085
3615 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3616 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait;
3618} 4087}
3619 4088
3620sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3621 return if tick_inhibit; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3622 return if $Coro::current == $Coro::main;
3623 4091
3624 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 4094 $signal->wait;
3627} 4095}
3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3632 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3633 return; 4101 return;
3634 } 4102 }
3635 4103
3636 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4105
4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3637 4107
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 4110 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 4111 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 4112 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 4113 or error "ERROR: unable to write runtime file: $!";
3644 }; 4114 };
3645 } 4115 }
3646 4116
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3648 $sig->send; 4118 $sig->send;
3649 } 4119 }
3650 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3651 $sig->send;
3652 }
3653 4121
3654 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3656 4124
3657 if (0) { 4125 if (0) {
3658 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3659 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3662 } 4130 }
3663 } 4131 }
3664} 4132}
3665 4133
3666{ 4134{
3667 # configure BDB 4135 # configure BDB
3668 4136
3669 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3672 4140
3673 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4145 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4146 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4147 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4148
3680 cf::sync_job { 4149 cf::sync_job {
3681 eval { 4150 eval {
3707{ 4176{
3708 # configure IO::AIO 4177 # configure IO::AIO
3709 4178
3710 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4181 undef $AnyEvent::AIO::WATCHER;
3713} 4182}
3714 4183
3715my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3716 4186
3717sub _log_backtrace { 4187sub _log_backtrace {
3718 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3719 4189
3720 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3721 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3722 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3724 ++$_log_backtrace; 4198 ++$_log_backtrace;
4199 my $perl_bt = Carp::longmess $msg;
3725 async { 4200 async {
3726 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3727 4202
3728 my @bt = fork_call { 4203 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4204 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4215 }
3741 4216
3742 @funcs 4217 @funcs
3743 }; 4218 };
3744 4219
3745 LOG llevInfo, "[ABT] $msg\n"; 4220 LOG llevInfo, "[ABT] $perl_bt\n";
4221 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4223 --$_log_backtrace;
3748 }; 4224 };
3749 } else { 4225 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3752 } 4228 }
3753} 4229}
3754 4230
3755# load additional modules 4231# load additional modules
3756use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3757 4234
3758END { cf::emergency_save } 4235END { cf::emergency_save }
3759 4236
37601 42371
3761 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines