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.386 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines