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.390 by root, Thu Oct 25 09:01:24 2007 UTC vs.
Revision 1.575 by root, Sat Aug 13 20:20:30 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 if (Coro::nready) { 644 if (Coro::nready) {
450 Coro::cede_notself; 645 Coro::cede_notself;
451 } else { 646 } else {
452 Event::one_event; 647 EV::loop EV::LOOP_ONESHOT;
453 } 648 }
454 } 649 }
455 650
456 $time = Event::time - $time; 651 my $time = AE::time - $time;
457 652
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
462 654
463 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
464 } else { 656 } else {
465 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
466 658
486 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
487 679
488 $coro 680 $coro
489} 681}
490 682
491=item fork_call { }, $args 683=item fork_call { }, @args
492 684
493Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 688never block itself or use any form of event handling.
497 689
498=cut 690=cut
691
692sub post_fork {
693 reset_signals;
694}
499 695
500sub fork_call(&@) { 696sub fork_call(&@) {
501 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
502 698
503 # 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,
504 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
506 702
507 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
508 reset_signals; 704 cf::post_fork;
509 &$cb 705 &$cb
510 }, @args; 706 } @args;
511 707
512 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
513} 747}
514 748
515=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
516 750
517Returns a single value from the environment database. 751Returns a single value from the environment database.
527within each server. 761within each server.
528 762
529=cut 763=cut
530 764
531sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
532 my ($name) = @_; 769 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
534 771
535 eval { 772 eval {
536 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
546} 783}
547 784
548our $DB; 785our $DB;
549 786
550sub db_init { 787sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
553 };
554} 789}
555 790
556sub db_get($$) { 791sub db_get($$) {
557 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
558 793
559 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
560 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
561 798
562 $! ? () 799 $! ? ()
563 : $data 800 : $data
564 }
565} 801}
566 802
567sub db_put($$$) { 803sub db_put($$$) {
568 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
597 833
598 my @data; 834 my @data;
599 my $md5; 835 my $md5;
600 836
601 for (0 .. $#$src) { 837 for (0 .. $#$src) {
602 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
603 or Carp::croak "$src->[$_]: $!";
604 } 839 }
605 840
606 # if processing is expensive, check 841 # if processing is expensive, check
607 # checksum first 842 # checksum first
608 if (1) { 843 if (1) {
625 860
626 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data); 862 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
629 864
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
631 866
632 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
635 870
645 880
646=cut 881=cut
647 882
648sub datalog($@) { 883sub datalog($@) {
649 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
651} 886}
652 887
653=back 888=back
654 889
655=cut 890=cut
656 891
657############################################################################# 892#############################################################################
658 893
659=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
660 895
661Many 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
662attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
664 899
665In 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>
666C<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
667Crossfire TRT). 902Deliantra).
668 903
669=over 4 904=over 4
670 905
671=item $attachable->attach ($attachment, key => $value...) 906=item $attachable->attach ($attachment, key => $value...)
672 907
716=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
717 952
718Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
720 955
721Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
722that 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.
723 958
724These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
725 960
726=over 4 961=over 4
850 1085
851 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
852 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
853 1088
854 } elsif (ref $type) { 1089 } elsif (ref $type) {
855 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
856 1091
857 } else { 1092 } else {
858 shift @arg; 1093 shift @arg;
859 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
860 } 1095 }
861 } 1096 }
862} 1097}
863 1098
864sub _object_attach { 1099sub _object_attach {
874 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
875 } 1110 }
876 1111
877 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
878 } else { 1113 } else {
879 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
880 } 1115 }
881 1116
882 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
883} 1118}
884 1119
943 1178
944 for (@$callbacks) { 1179 for (@$callbacks) {
945 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
946 1181
947 if ($@) { 1182 if ($@) {
948 warn "$@";
949 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
950 override; 1184 override;
951 } 1185 }
952 1186
953 return 1 if $override; 1187 return 1 if $override;
954 } 1188 }
955 1189
956 0 1190 0
957} 1191}
958 1192
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1193=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1194
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1195=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1196
963Generate an object-specific event with the given arguments. 1197Generate an object-specific event with the given arguments.
964 1198
1017 1251
1018sub reattach { 1252sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1254 my ($obj) = @_;
1021 1255
1256 # no longer needed after getting rid of delete_package?
1022 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
1023 1258
1024 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1025 1260
1026 @$registry = (); 1261 @$registry = ();
1027 1262
1032 for (@$attach) { 1267 for (@$attach) {
1033 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1034 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1035 } 1270 }
1036 } else { 1271 } else {
1037 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1038 } 1273 }
1039 } 1274 }
1040} 1275}
1041 1276
1042cf::attachable->attach ( 1277cf::attachable->attach (
1043 prio => -1000000, 1278 prio => -1000000,
1044 on_instantiate => sub { 1279 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1280 my ($obj, $data) = @_;
1046 1281
1047 $data = from_json $data; 1282 $data = decode_json $data;
1048 1283
1049 for (@$data) { 1284 for (@$data) {
1050 my ($name, $args) = @$_; 1285 my ($name, $args) = @$_;
1051 1286
1052 $obj->attach ($name, %{$args || {} }); 1287 $obj->attach ($name, %{$args || {} });
1069 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1070 1305
1071 sync_job { 1306 sync_job {
1072 if (length $$rdata) { 1307 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1076 1312
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 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 }
1081 close $fh; 1320 aio_close $fh;
1082 1321
1083 if (@$objs) { 1322 if (@$objs) {
1084 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) {
1085 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1088 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 }
1089 close $fh; 1331 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1333 }
1092 } else { 1334 } else {
1093 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1094 } 1336 }
1095 1337
1096 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1342 } else {
1098 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1099 } 1344 }
1100 } else { 1345 } else {
1101 aio_unlink $filename; 1346 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1103 } 1348 }
1127 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs}; 1373 $av = $st->{objs};
1129 } 1374 }
1130 1375
1131 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1132 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1133 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1134 1380
1135 ($data, $av) 1381 ($data, $av)
1136} 1382}
1137 1383
1138=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1194 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1195 1441
1196 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1197} 1443}
1198 1444
1445use File::Glob ();
1446
1199cf::player->attach ( 1447cf::player->attach (
1200 on_command => sub { 1448 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1202 1450
1203 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1204 or return; 1452 or return;
1205 1453
1228 1476
1229 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1230 if $reply; 1478 if $reply;
1231 1479
1232 } else { 1480 } else {
1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1234 } 1482 }
1235 1483
1236 cf::override; 1484 cf::override;
1237 }, 1485 },
1238); 1486);
1239 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
1240sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1241 cf::sync_job { 1504 cf::sync_job {
1242 my %todo; 1505 my %todo;
1243 1506
1244 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1245 next unless -r $path; 1508 next unless -r $path;
1263 1526
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1529
1267 $ext{source} = 1530 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1269 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1270 . $source 1533 . $source
1271 . "\n};\n1"; 1534 . "\n};\n1";
1272 1535
1273 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1274 } 1537 }
1275 1538
1539 my $pass = 0;
1276 my %done; 1540 my %done;
1277 while (%todo) { 1541 while (%todo) {
1278 my $progress; 1542 my $progress;
1279 1543
1544 ++$pass;
1545
1546 ext:
1280 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1549 next ext
1283 unless exists $done{$_}; 1550 unless exists $done{$_};
1284 } 1551 }
1285 1552
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1554
1288 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1559
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1561 if exists $v->{meta}{mandatory};
1293 warn $msg; 1562
1294 warn "mandatory extension failed to load, exiting.\n"; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1564 delete $todo{$k};
1296 } 1565 } else {
1297 1566 $done{$k} = delete $todo{$k};
1298 warn $msg; 1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1299 } 1572 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1573 }
1305 1574
1306 skip: 1575 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 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 }
1309 } 1585 }
1310 }; 1586 };
1311} 1587}
1312 1588
1313############################################################################# 1589#############################################################################
1314 1590
1315=back 1591=back
1316 1592
1317=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1318 1594
1319Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1320 1596
1321=cut 1597=cut
1322 1598
1323package cf::player; 1599package cf::player;
1324 1600
1367 1643
1368sub exists($) { 1644sub exists($) {
1369 my ($login) = @_; 1645 my ($login) = @_;
1370 1646
1371 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1373} 1649}
1374 1650
1375sub find($) { 1651sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1653 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1665 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1666 or return;
1391 1667
1392 my $pl = cf::player::load_pl $f 1668 my $pl = cf::player::load_pl $f
1393 or return; 1669 or return;
1670
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1671 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1672 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1397 } 1674 }
1398 } 1675 }
1399} 1676}
1400 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
1401sub save($) { 1691sub save($) {
1402 my ($pl) = @_; 1692 my ($pl) = @_;
1403 1693
1404 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1405 1695
1408 1698
1409 return if $pl->{deny_save}; 1699 return if $pl->{deny_save};
1410 1700
1411 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1412 $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];
1413 1708
1414 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1710 cf::cede_to_tick;
1416} 1711}
1417 1712
1449 my ($pl) = @_; 1744 my ($pl) = @_;
1450 1745
1451 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1452 1747
1453 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1454 $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
1455 1750
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1457 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1459 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1460 1759
1461 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1501 1800
1502 for my $login (@$dirs) { 1801 for my $login (@$dirs) {
1503 my $path = path $login; 1802 my $path = path $login;
1504 1803
1505 # a .pst is a dead give-away for a valid player 1804 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1805 # if no pst file found, open and chekc for blocked users
1806 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1807 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1808 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1809 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1810 }
1511 1811
1515 1815
1516 \@logins 1816 \@logins
1517} 1817}
1518 1818
1519=item $player->maps 1819=item $player->maps
1820
1821=item cf::player::maps $login
1520 1822
1521Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1522player. May block. 1824player. May block.
1523 1825
1524=cut 1826=cut
1542 } 1844 }
1543 1845
1544 \@paths 1846 \@paths
1545} 1847}
1546 1848
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1850
1549Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1852
1598=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1599 1854
1600Sends an ext reply to the player. 1855Sends an ext reply to the player.
1601 1856
1633 1888
1634=cut 1889=cut
1635 1890
1636sub find_by_path($) { 1891sub find_by_path($) {
1637 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1638 1895
1639 my ($match, $specificity); 1896 my ($match, $specificity);
1640 1897
1641 for my $region (list) { 1898 for my $region (list) {
1642 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1668our $MAX_RESET = 3600; 1925our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1926our $DEFAULT_RESET = 3000;
1670 1927
1671sub generate_random_map { 1928sub generate_random_map {
1672 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1673 # mit "rum" bekleckern, nicht 1930
1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1932
1674 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1678 $rmp->{exit_on_final_map},
1679 $rmp->{xsize}, $rmp->{ysize},
1680 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1681 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1682 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1683 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1684 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1685 (cf::region::find $rmp->{region}), $rmp->{custom}
1686 )
1687} 1934}
1688 1935
1689=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1690 1937
1691Register 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
1696 1943
1697sub register { 1944sub register {
1698 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1699 my $pkg = caller; 1946 my $pkg = caller;
1700 1947
1701 no strict;
1702 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1703 1949
1704 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1705} 1951}
1706 1952
1707# also paths starting with '/' 1953# also paths starting with '/'
1708$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1709 1955
1710sub thawer_merge { 1956sub thawer_merge {
1711 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1712 1958
1713 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1718} 1964}
1719 1965
1720sub normalise { 1966sub normalise {
1721 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1722 1968
1723 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1724 1970
1725 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1726 1972
1727 # map plan: 1973 # map plan:
1728 # 1974 #
1743 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1744 $path = "$base/$path"; 1990 $path = "$base/$path";
1745 } 1991 }
1746 1992
1747 for ($path) { 1993 for ($path) {
1748 redo if s{//}{/};
1749 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1750 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1751 } 1996 }
1752 1997
1753 $path 1998 $path
1767 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1768 return $self; 2013 return $self;
1769 } 2014 }
1770 } 2015 }
1771 2016
1772 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1773 () 2018 ()
1774} 2019}
1775 2020
2021# may re-bless or do other evil things
1776sub init { 2022sub init {
1777 my ($self) = @_; 2023 my ($self) = @_;
1778 2024
1779 $self 2025 $self
1780} 2026}
1799 2045
1800# the temporary/swap location 2046# the temporary/swap location
1801sub save_path { 2047sub save_path {
1802 my ($self) = @_; 2048 my ($self) = @_;
1803 2049
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1806} 2052}
1807 2053
1808# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1809sub uniq_path { 2055sub uniq_path {
1810 my ($self) = @_; 2056 my ($self) = @_;
1811 2057
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1814}
1815
1816# and all this just because we cannot iterate over
1817# all maps in C++...
1818sub change_all_map_light {
1819 my ($change) = @_;
1820
1821 $_->change_map_light ($change)
1822 for grep $_->outdoor, values %cf::MAP;
1823} 2060}
1824 2061
1825sub decay_objects { 2062sub decay_objects {
1826 my ($self) = @_; 2063 my ($self) = @_;
1827 2064
1854 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1855 2092
1856 1 2093 1
1857} 2094}
1858 2095
2096# used to laod the header of an original map
1859sub load_header_orig { 2097sub load_header_orig {
1860 my ($self) = @_; 2098 my ($self) = @_;
1861 2099
1862 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1863} 2101}
1864 2102
2103# used to laod the header of an instantiated map
1865sub load_header_temp { 2104sub load_header_temp {
1866 my ($self) = @_; 2105 my ($self) = @_;
1867 2106
1868 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1869} 2108}
1870 2109
2110# called after loading the header from an instantiated map
1871sub prepare_temp { 2111sub prepare_temp {
1872 my ($self) = @_; 2112 my ($self) = @_;
1873 2113
1874 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1875 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1876 # safety 2116 # safety
1877 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1878 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1879} 2119}
1880 2120
2121# called after loading the header from an original map
1881sub prepare_orig { 2122sub prepare_orig {
1882 my ($self) = @_; 2123 my ($self) = @_;
1883 2124
1884 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1885 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1909 2150
1910sub find; 2151sub find;
1911sub find { 2152sub find {
1912 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1913 2154
2155 cf::cede_to_tick;
2156
1914 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1915 2158
1916 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1918 2161
1919 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1923 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1924 or return; 2164 or return;
1925 2165
1926 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1927 2167
1929 or return; 2169 or return;
1930 2170
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
1934 undef $guard1; 2175 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2176 $map->reset;
1937 return find $path; 2177 return find $path;
1938 } 2178 }
1939 2179
1940 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1941 } 2181 }
1942} 2182}
1943 2183
1944sub pre_load { } 2184sub pre_load { }
1945sub post_load { } 2185#sub post_load { } # XS
1946 2186
1947sub load { 2187sub load {
1948 my ($self) = @_; 2188 my ($self) = @_;
1949 2189
1950 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
1953 2193
1954 { 2194 {
1955 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
1956 2196
1957 return unless $self->valid; 2197 return unless $self->valid;
1958 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
1959
1960 $self->in_memory (cf::MAP_LOADING);
1961 2199
1962 $self->alloc; 2200 $self->alloc;
1963 2201
1964 $self->pre_load; 2202 $self->pre_load;
1965 cf::cede_to_tick; 2203 cf::cede_to_tick;
1966 2204
2205 if (exists $self->{load_path}) {
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2207 $f->skip_block;
1969 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
1970 or return; 2209 or return;
1971 2210
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
1973 if delete $self->{load_original}; 2212 if delete $self->{load_original};
1974 2213
1975 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2215 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
1979 $self->clear_unique_items; 2218 $self->clear_unique_items;
1980 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
1982 } 2222 }
1983 } 2223 }
1984 }
1985 2224
1986 $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);
1987 2232
1988 cf::cede_to_tick; 2233 cf::cede_to_tick;
1989 # now do the right thing for maps 2234 # now do the right thing for maps
1990 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
1991 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
1995 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2241 $self->decay_objects;
1997 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
1998 $self->update_buttons; 2243 $self->update_buttons;
1999 cf::cede_to_tick; 2244 cf::cede_to_tick;
2000 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
2001 cf::cede_to_tick;
2002 $self->activate;
2003 } 2246 }
2004 2247
2005 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2007
2008 $self->in_memory (cf::MAP_IN_MEMORY);
2009 } 2250 }
2010 2251
2011 $self->post_load; 2252 $self->post_load;
2012}
2013 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
2014sub customise_for { 2260sub customise_for {
2015 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2016 2262
2017 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2018 if $self->per_player; 2264 if $self->per_player;
2021# if $self->per_party; 2267# if $self->per_party;
2022 2268
2023 $self 2269 $self
2024} 2270}
2025 2271
2026# find and load all maps in the 3x3 area around a map
2027sub load_neighbours {
2028 my ($map) = @_;
2029
2030 my @neigh; # diagonal neighbours
2031
2032 for (0 .. 3) {
2033 my $neigh = $map->tile_path ($_)
2034 or next;
2035 $neigh = find $neigh, $map
2036 or next;
2037 $neigh->load;
2038
2039 push @neigh,
2040 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2041 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2042 }
2043
2044 for (grep defined $_->[0], @neigh) {
2045 my ($path, $origin) = @$_;
2046 my $neigh = find $path, $origin
2047 or next;
2048 $neigh->load;
2049 }
2050}
2051
2052sub find_sync { 2272sub find_sync {
2053 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2054 2274
2055 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
2056} 2280}
2057 2281
2058sub do_load_sync { 2282sub do_load_sync {
2059 my ($map) = @_; 2283 my ($map) = @_;
2060 2284
2285 # it's a bug to call this from the main context
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2063 2288
2064 cf::sync_job { $map->load }; 2289 $map->load;
2065} 2290}
2066 2291
2067our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2068our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2069 2294
2070sub find_async { 2295sub find_async {
2071 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2072 2297
2073 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2074 2299
2075 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2301 return $map if !$load || $map->linkable;
2077 } 2302 }
2078 2303
2079 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2080 2305
2081 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2095 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2096 2321
2097 () 2322 ()
2098} 2323}
2099 2324
2325# common code, used by both ->save and ->swapout
2100sub save { 2326sub _save {
2101 my ($self) = @_; 2327 my ($self) = @_;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2328
2105 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2106 2330
2107 return unless $self->dirty; 2331 return unless $self->dirty;
2108 2332
2117 2341
2118 cf::async { 2342 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2343 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2344 $_->contr->save for $self->players;
2121 }; 2345 };
2346
2347 cf::get_slot 0.02;
2122 2348
2123 if ($uniq) { 2349 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2351 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2352 } else {
2127 $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);
2128 } 2354 }
2129} 2355}
2130 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2131sub swap_out { 2365sub swap_out {
2132 my ($self) = @_; 2366 my ($self) = @_;
2133 2367
2134 # save first because save cedes
2135 $self->save;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2139 return if $self->players; 2372 return if $self->players;
2140 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
2141 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2142 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
2143 $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};
2144 2424
2145 $self->deactivate; 2425 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear; 2427 $self->clear;
2148}
2149
2150sub reset_at {
2151 my ($self) = @_;
2152
2153 # TODO: safety, remove and allow resettable per-player maps
2154 return 1e99 if $self->{deny_reset};
2155
2156 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2157 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2158
2159 $time + $to
2160}
2161
2162sub should_reset {
2163 my ($self) = @_;
2164
2165 $self->reset_at <= $cf::RUNTIME
2166}
2167
2168sub reset {
2169 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172
2173 return if $self->players;
2174
2175 warn "resetting map ", $self->path;
2176
2177 $self->in_memory (cf::MAP_SWAPPED);
2178
2179 # need to save uniques path
2180 unless ($self->{deny_save}) {
2181 my $uniq = $self->uniq_path; utf8::encode $uniq;
2182
2183 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2184 if $uniq;
2185 }
2186
2187 delete $cf::MAP{$self->path};
2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2191 $self->clear;
2192 2428
2193 $self->unlink_save; 2429 $self->unlink_save;
2194 $self->destroy; 2430 $self->destroy;
2195} 2431}
2196 2432
2204 2440
2205 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2206 2442
2207 $self->unlink_save; 2443 $self->unlink_save;
2208 2444
2209 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2210 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2211 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2212 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2214 2450
2263 2499
2264sub unique_maps() { 2500sub unique_maps() {
2265 [ 2501 [
2266 map { 2502 map {
2267 utf8::decode $_; 2503 utf8::decode $_;
2268 /\.map$/ 2504 s/\.map$//; # TODO future compatibility hack
2505 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2506 ? ()
2269 ? normalise $_ 2507 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2509 ]
2273} 2510}
2274 2511
2275package 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}
2276 2543
2277=back 2544=back
2278 2545
2279=head3 cf::object 2546=head3 cf::object
2280 2547
2284 2551
2285=over 4 2552=over 4
2286 2553
2287=item $ob->inv_recursive 2554=item $ob->inv_recursive
2288 2555
2289Returns 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.
2290 2558
2291=cut 2559=cut
2292 2560
2293sub inv_recursive_; 2561sub inv_recursive_;
2294sub inv_recursive_ { 2562sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2567 inv_recursive_ inv $_[0]
2300} 2568}
2301 2569
2302=item $ref = $ob->ref 2570=item $ref = $ob->ref
2303 2571
2304creates 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.
2305 2573
2306=item $ob = cf::object::deref ($refstring) 2574=item $ob = cf::object::deref ($refstring)
2307 2575
2308returns 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,
2309even if the object actually exists. May block. 2577even if the object actually exists. May block.
2341can 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
2342dialogue with the given NPC character. 2610dialogue with the given NPC character.
2343 2611
2344=cut 2612=cut
2345 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
2346# rough implementation of a future "reply" method that works 2628# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2629# with dialog boxes.
2348#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
2349sub cf::object::player::reply($$$;$) { 2631sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2632 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2643 my $dialog = $pl->{npc_dialog};
2362 $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));
2363 2645
2364 } else { 2646 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2647 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2648 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2649 }
2368 } 2650 }
2369} 2651}
2370 2652
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2653=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2678
2397=item $player_object->enter_link 2679=item $player_object->enter_link
2398 2680
2399Freezes 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}>).
2400 2682
2401The 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.
2402I<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.
2403 2687
2404Will never block. 2688Will never block.
2405 2689
2406=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2407 2691
2427sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2428 my ($self) = @_; 2712 my ($self) = @_;
2429 2713
2430 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2431 2715
2716 ++$self->{_link_recursion};
2717
2432 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2433 2719
2434 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2435 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2436 2722
2437 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2438} 2724}
2439 2725
2440sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2441 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2442 2728
2459 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2460 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2461 2747
2462 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2463 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2464 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2465 2751
2466 $map->load; 2752 $map->load;
2467 $map->load_neighbours;
2468 2753
2469 return unless $self->contr->active; 2754 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2755
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2474} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2475 2763
2764}
2765
2476=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)]])
2477 2767
2478Moves 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
2479her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2480that 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
2481the 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
2482be called at the end of this process. 2772be called at the end of this process.
2483 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
2484=cut 2777=cut
2485 2778
2486our $GOTOGEN; 2779our $GOTOGEN;
2487 2780
2488sub cf::object::player::goto { 2781sub cf::object::player::goto {
2489 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 }
2490 2789
2491 # 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
2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2493 2792
2494 $self->enter_link; 2793 $self->enter_link;
2514 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2515 } 2814 }
2516 } 2815 }
2517 2816
2518 my $map = eval { 2817 my $map = eval {
2519 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2520 2819
2521 if ($map) { 2820 if ($map) {
2522 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2523 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2524 } else { 2823 } else {
2525 $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);
2526 } 2825 }
2527 2826
2528 $map 2827 $map
2536 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2537 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2538 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2539 } 2838 }
2540 2839
2541 $done->() if $done; 2840 $done->($self) if $done;
2542 })->prio (1); 2841 })->prio (1);
2543} 2842}
2544 2843
2545=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2546 2845
2566} 2865}
2567 2866
2568sub prepare_random_map { 2867sub prepare_random_map {
2569 my ($exit) = @_; 2868 my ($exit) = @_;
2570 2869
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2870 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2871 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2872 # that depends on the exit object
2576 2873
2577 my $rmp = parse_random_map_params $exit->msg; 2874 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2876 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2877 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2878 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2879 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2880 $rmp->{origin_y} = $exit->y;
2881
2882 $exit->map->touch;
2584 } 2883 }
2585 2884
2586 $rmp->{random_seed} ||= $exit->random_seed; 2885 $rmp->{random_seed} ||= $exit->random_seed;
2587 2886
2588 my $data = cf::to_json $rmp; 2887 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2888 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2889 my $meta = "$RANDOMDIR/$md5.meta";
2591 2890
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2891 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2892 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2893 undef $fh;
2595 aio_rename "$meta~", $meta; 2894 aio_rename "$meta~", $meta;
2596 2895
2896 my $slaying = "?random/$md5";
2897
2898 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2899 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2900 $exit->msg (undef);
2901 }
2599 } 2902 }
2600} 2903}
2601 2904
2602sub cf::object::player::enter_exit { 2905sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2906 my ($self, $exit) = @_;
2604 2907
2605 return unless $self->type == cf::PLAYER; 2908 return unless $self->type == cf::PLAYER;
2606 2909
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2910 $self->enter_link;
2619 2911
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2912 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2913 $Coro::current->{desc} = "enter_exit";
2626 2914
2627 $self->deactivate_recursive; # just to be sure
2628 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
2629 $self->goto ($slaying, $hp, $sp); 2945 $self->goto ($map, $x, $y);
2630 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
2631 1; 2951 1
2632 }) { 2952 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "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. "
2635 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2957
2638 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2639 $self->leave_link; 2959 $self->leave_link;
2640 } 2960 }
2641 })->prio (1); 2961 })->prio (1);
2642} 2962}
2643 2963
2655sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2656 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2657 2977
2658 utf8::encode $text; 2978 utf8::encode $text;
2659 $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);
2660} 3005}
2661 3006
2662=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2663 3008
2664Send 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
2666the 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
2667the message unless the client supports the msg packet. 3012the message unless the client supports the msg packet.
2668 3013
2669=cut 3014=cut
2670 3015
3016# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2672 "c/identify" => { 3024 "c/identify" => {
2673 id => "infobox", 3025 id => "infobox",
2674 title => "Identify", 3026 title => "Identify",
2675 reply => undef, 3027 reply => undef,
2676 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2678 "c/examine" => { 3030 "c/examine" => {
2679 id => "infobox", 3031 id => "infobox",
2680 title => "Examine", 3032 title => "Examine",
2681 reply => undef, 3033 reply => undef,
2682 tooltip => "Signs and other items you examined", 3034 tooltip => "Signs and other items you examined",
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",
2683 }, 3041 },
2684 "c/book" => { 3042 "c/book" => {
2685 id => "infobox", 3043 id => "infobox",
2686 title => "Book", 3044 title => "Book",
2687 reply => undef, 3045 reply => undef,
2703 id => "infobox", 3061 id => "infobox",
2704 title => "Body Parts", 3062 title => "Body Parts",
2705 reply => undef, 3063 reply => undef,
2706 tooltip => "Shows which body parts you posess and are available", 3064 tooltip => "Shows which body parts you posess and are available",
2707 }, 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 },
2708 "c/uptime" => { 3102 "c/uptime" => {
2709 id => "infobox", 3103 id => "infobox",
2710 title => "Uptime", 3104 title => "Uptime",
2711 reply => undef, 3105 reply => undef,
2712 tooltip => "How long the server has been running sicne last restart", 3106 tooltip => "How long the server has been running since last restart",
2713 }, 3107 },
2714 "c/mapinfo" => { 3108 "c/mapinfo" => {
2715 id => "infobox", 3109 id => "infobox",
2716 title => "Map Info", 3110 title => "Map Info",
2717 reply => undef, 3111 reply => undef,
2718 tooltip => "Information related to the maps", 3112 tooltip => "Information related to the maps",
2719 }, 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,
2720); 3128);
2721 3129
2722sub cf::client::send_msg { 3130sub cf::client::send_msg {
2723 my ($self, $channel, $msg, $color, @extra) = @_; 3131 my ($self, $channel, $msg, $color, @extra) = @_;
2724 3132
2725 $msg = $self->pl->expand_cfpod ($msg); 3133 $msg = $self->pl->expand_cfpod ($msg)
3134 unless $color & cf::NDI_VERBATIM;
2726 3135
2727 $color &= cf::NDI_CLIENT_MASK; # just in case... 3136 $color &= cf::NDI_CLIENT_MASK; # just in case...
2728 3137
2729 # check predefined channels, for the benefit of C 3138 # check predefined channels, for the benefit of C
2730 if ($CHANNEL{$channel}) { 3139 if ($CHANNEL{$channel}) {
2731 $channel = $CHANNEL{$channel}; 3140 $channel = $CHANNEL{$channel};
2732 3141
2733 $self->ext_msg (channel_info => $channel) 3142 $self->ext_msg (channel_info => $channel);
2734 if $self->can_msg;
2735
2736 $channel = $channel->{id}; 3143 $channel = $channel->{id};
2737 3144
2738 } elsif (ref $channel) { 3145 } elsif (ref $channel) {
2739 # send meta info to client, if not yet sent 3146 # send meta info to client, if not yet sent
2740 unless (exists $self->{channel}{$channel->{id}}) { 3147 unless (exists $self->{channel}{$channel->{id}}) {
2741 $self->{channel}{$channel->{id}} = $channel; 3148 $self->{channel}{$channel->{id}} = $channel;
2742 $self->ext_msg (channel_info => $channel) 3149 $self->ext_msg (channel_info => $channel);
2743 if $self->can_msg;
2744 } 3150 }
2745 3151
2746 $channel = $channel->{id}; 3152 $channel = $channel->{id};
2747 } 3153 }
2748 3154
2749 return unless @extra || length $msg; 3155 return unless @extra || length $msg;
2750 3156
2751 if ($self->can_msg) {
2752 # default colour, mask it out 3157 # default colour, mask it out
2753 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3158 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2754 if $color & cf::NDI_DEF; 3159 if $color & cf::NDI_DEF;
2755 3160
2756 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3161 my $pkt = "msg "
3162 . $self->{json_coder}->encode (
2757 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2758 } else { 3164 );
2759 if ($color >= 0) {
2760 # replace some tags by gcfclient-compatible ones
2761 for ($msg) {
2762 1 while
2763 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2764 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2765 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2766 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2767 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2768 }
2769 3165
2770 $color &= cf::NDI_COLOR_MASK; 3166 $self->send_big_packet ($pkt);
2771
2772 utf8::encode $msg;
2773
2774 if (0 && $msg =~ /\[/) {
2775 # COMMAND/INFO
2776 $self->send_packet ("drawextinfo $color 10 8 $msg")
2777 } else {
2778 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2779 $self->send_packet ("drawinfo $color $msg")
2780 }
2781 }
2782 }
2783} 3167}
2784 3168
2785=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2786 3170
2787Sends an ext event to the client. 3171Sends an ext event to the client.
2790 3174
2791sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2792 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2793 3177
2794 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2795 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2796 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2797 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2798 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2799 } 3183 }
2800} 3184}
2801 3185
2802=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2803 3187
2807 3191
2808sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2809 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2810 3194
2811 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2812 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2813 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2814 #TODO: version 1, remove 3198 #TODO: version 1, remove
2815 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2816 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2817 } 3201 }
2818} 3202}
2819 3203
2820=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2821 3205
2892 3276
2893 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
2894 if $reply; 3278 if $reply;
2895 3279
2896 } else { 3280 } else {
2897 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";
2898 } 3282 }
2899 3283
2900 cf::override; 3284 cf::override;
2901 }, 3285 },
2902); 3286);
2922 3306
2923 $coro 3307 $coro
2924} 3308}
2925 3309
2926cf::client->attach ( 3310cf::client->attach (
2927 on_destroy => sub { 3311 on_client_destroy => sub {
2928 my ($ns) = @_; 3312 my ($ns) = @_;
2929 3313
2930 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2931 }, 3315 },
2932); 3316);
2948our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
2949 3333
2950$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
2951 3335
2952$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
2953 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
2954 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
2955 sort time 3339 sort time
2956)); 3340));
2957 3341
2958# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
2961 3345
2962The following functions and methods are available within a safe environment: 3346The following functions and methods are available within a safe environment:
2963 3347
2964 cf::object 3348 cf::object
2965 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
2966 insert remove name archname title slaying race decrease_ob_nr 3350 insert remove name archname title slaying race decrease split
3351 value
2967 3352
2968 cf::object::player 3353 cf::object::player
2969 player 3354 player
2970 3355
2971 cf::player 3356 cf::player
2976 3361
2977=cut 3362=cut
2978 3363
2979for ( 3364for (
2980 ["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
2981 insert remove inv name archname title slaying race 3366 insert remove inv nrof name archname title slaying race
2982 decrease_ob_nr destroy)], 3367 decrease split destroy change_exp value msg lore send_msg)],
2983 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
2984 ["cf::player" => qw(peaceful)], 3369 ["cf::player" => qw(peaceful send_msg)],
2985 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
2986) { 3371) {
2987 no strict 'refs';
2988 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
2989 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2990 for @funs; 3374 for @funs;
2991} 3375}
2992 3376
3007 3391
3008 my $qcode = $code; 3392 my $qcode = $code;
3009 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3010 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3011 3395
3396 %vars = (_dummy => 0) unless %vars;
3397
3398 my @res;
3012 local $_; 3399 local $_;
3013 local @safe::cf::_safe_eval_args = values %vars;
3014 3400
3015 my $eval = 3401 my $eval =
3016 "do {\n" 3402 "do {\n"
3017 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3018 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3019 . $code 3405 . $code
3020 . "\n}" 3406 . "\n}"
3021 ; 3407 ;
3022 3408
3409 if ($CFG{safe_eval}) {
3023 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3024 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3025 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 }
3026 3418
3027 if ($@) { 3419 if ($@) {
3028 warn "$@"; 3420 warn "$@",
3029 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3030 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3031 } 3423 }
3032 3424
3033 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3034} 3426}
3035 3427
3049=cut 3441=cut
3050 3442
3051sub register_script_function { 3443sub register_script_function {
3052 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3053 3445
3054 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3055 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3056} 3448}
3057 3449
3058=back 3450=back
3059 3451
3060=cut 3452=cut
3069 # for this (global event?) 3461 # for this (global event?)
3070 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3071 3463
3072 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3073 3465
3074 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3075 3467
3076 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3077 0 < aio_load $path, $facedata
3078 or die "$path: $!";
3079
3080 $facedata = Coro::Storable::thaw $facedata;
3081 3469
3082 $facedata->{version} == 2 3470 $facedata->{version} == 2
3083 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3084 3472
3085 # 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]);
3086 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3087 type => FT_RSRC, 3476 type => FT_RSRC,
3088 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),
3089 }; 3479 };
3090 cf::cede_to_tick; 3480 cf::cede_to_tick;
3091 3481
3092 { 3482 {
3093 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3094 3484
3095 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3096 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3487
3097 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3098 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3099 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3100 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} ;
3101 3493
3102 cf::cede_to_tick; 3494 cf::cede_to_tick;
3103 } 3495 }
3104 3496
3105 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3106 next unless $info->{smooth}; 3498 next unless $info->{smooth};
3499
3107 my $idx = cf::face::find $face 3500 my $idx = cf::face::find $face
3108 or next; 3501 or next;
3502
3109 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3110 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3111 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3112 } else { 3506 } else {
3113 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3114 } 3508 }
3115 3509
3116 cf::cede_to_tick; 3510 cf::cede_to_tick;
3117 } 3511 }
3118 } 3512 }
3127 3521
3128 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3129 } 3523 }
3130 3524
3131 { 3525 {
3132 # TODO: for gcfclient pleasure, we should give resources
3133 # that gcfclient doesn't grok a >10000 face index.
3134 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3135 3527
3136 my $soundconf = delete $res->{"res/sound.conf"};
3137
3138 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3529 if (defined $info->{type}) {
3139 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3140 my $data;
3141 3531
3142 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3143 # prepend meta info 3533 cf::face::set_type $idx, $info->{type};
3144
3145 my $meta = $enc->encode ({
3146 name => $name,
3147 %{ $info->{meta} || {} },
3148 });
3149
3150 $data = pack "(w/a*)*", $meta, $info->{data};
3151 } else { 3534 } else {
3152 $data = $info->{data}; 3535 $RESOURCE{$name} = $info; # unused
3153 } 3536 }
3154 3537
3155 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3156 cf::face::set_type $idx, $info->{type};
3157
3158 cf::cede_to_tick; 3538 cf::cede_to_tick;
3159 } 3539 }
3160
3161 if ($soundconf) {
3162 $soundconf = $enc->decode (delete $soundconf->{data});
3163
3164 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3165 my $sound = $soundconf->{compat}[$_]
3166 or next;
3167
3168 my $face = cf::face::find "sound/$sound->[1]";
3169 cf::sound::set $sound->[0] => $face;
3170 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3171 }
3172
3173 while (my ($k, $v) = each %{$soundconf->{event}}) {
3174 my $face = cf::face::find "sound/$v";
3175 cf::sound::set $k => $face;
3176 }
3177 }
3178 } 3540 }
3541
3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3179 3543
3180 1 3544 1
3181} 3545}
3182 3546
3183register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3185 3549
3186 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3187 $ns->fx_want ($k, $v); 3551 $ns->fx_want ($k, $v);
3188 } 3552 }
3189}; 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}
3190 3564
3191sub reload_regions { 3565sub reload_regions {
3192 # 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
3193 # for this (global event?) 3567 # for this (global event?)
3194 %ext::player_env::MUSIC_FACE_CACHE = (); 3568 %ext::player_env::MUSIC_FACE_CACHE = ();
3208} 3582}
3209 3583
3210sub reload_archetypes { 3584sub reload_archetypes {
3211 load_resource_file "$DATADIR/archetypes" 3585 load_resource_file "$DATADIR/archetypes"
3212 or die "unable to load archetypes\n"; 3586 or die "unable to load archetypes\n";
3213 #d# NEED to laod twice to resolve forward references
3214 # this really needs to be done in an extra post-pass
3215 # (which needs to be synchronous, so solve it differently)
3216 load_resource_file "$DATADIR/archetypes"
3217 or die "unable to load archetypes\n";
3218} 3587}
3219 3588
3220sub reload_treasures { 3589sub reload_treasures {
3221 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3222 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3223} 3592}
3224 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
3225sub reload_resources { 3614sub reload_resources {
3226 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3227 3616
3617 reload_exp_table;
3618 reload_materials;
3619 reload_facedata;
3620 reload_sound;
3621 reload_archetypes;
3228 reload_regions; 3622 reload_regions;
3229 reload_facedata;
3230 #reload_archetypes;#d#
3231 reload_archetypes;
3232 reload_treasures; 3623 reload_treasures;
3233 3624
3234 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3235}
3236
3237sub init {
3238 reload_resources;
3239} 3626}
3240 3627
3241sub reload_config { 3628sub reload_config {
3242 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3243 or return;
3244 3630
3245 local $/; 3631 my $config = load_file "$CONFDIR/config";
3246 *CFG = YAML::Syck::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3247 3634
3248 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3249 3636
3250 $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};
3251 $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};
3252 3639
3253 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3257 }; 3644 };
3258 warn $@ if $@; 3645 warn $@ if $@;
3259 } 3646 }
3260} 3647}
3261 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
3262sub 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
3263 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3264 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3265 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#
3266 (async { 3690 (async {
3267 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3691 $Coro::current->{desc} = "IDLE BUG HANDLER";
3268 Event::one_event; 3692 EV::loop EV::LOOP_ONESHOT;
3269 })->prio (Coro::PRIO_MAX); 3693 })->prio (Coro::PRIO_MAX);
3270 }; 3694 };
3271 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;
3272 reload_config; 3708 reload_config;
3273 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
3274 load_extensions; 3719 load_extensions;
3275 3720
3276 $TICK_WATCHER->start; 3721 utime time, time, $RUNTIMEFILE;
3277 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 AE::postpone {
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3278} 3738}
3279 3739
3280############################################################################# 3740#############################################################################
3281# initialisation and cleanup 3741# initialisation and cleanup
3282 3742
3283# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3284BEGIN { 3744BEGIN {
3745 our %SIGWATCHER = ();
3285 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3286 Event->signal ( 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 signal => $signal,
3290 prio => 0,
3291 cb => sub {
3292 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3293 },
3294 ); 3749 };
3295 } 3750 }
3296} 3751}
3297 3752
3298sub write_runtime { 3753sub write_runtime_sync {
3299 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3300 3755
3301 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3302 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3303 3758
3304 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3305 3760
3306 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3307 3762
3308 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3309 or return; 3764 or return;
3310 3765
3311 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3312 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3313 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3323 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3324 3779
3325 close $fh 3780 close $fh
3326 or return; 3781 or return;
3327 3782
3328 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3329 and return; 3784 and return;
3330 3785
3331 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3332 3787
3333 1 3788 1
3789}
3790
3791our $uuid_lock;
3792our $uuid_skip;
3793
3794sub write_uuid_sync($) {
3795 $uuid_skip ||= $_[0];
3796
3797 return if $uuid_lock;
3798 local $uuid_lock = 1;
3799
3800 my $uuid = "$LOCALDIR/uuid";
3801
3802 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3803 or return;
3804
3805 my $value = uuid_seq uuid_cur;
3806
3807 unless ($value) {
3808 info "cowardly refusing to write zero uuid value!\n";
3809 return;
3810 }
3811
3812 my $value = uuid_str $value + $uuid_skip;
3813 $uuid_skip = 0;
3814
3815 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3816 and return;
3817
3818 # always fsync - this file is important
3819 aio_fsync $fh
3820 and return;
3821
3822 close $fh
3823 or return;
3824
3825 aio_rename "$uuid~", $uuid
3826 and return;
3827
3828 trace "uuid file written ($value).\n";
3829
3830 1
3831
3832}
3833
3834sub write_uuid($$) {
3835 my ($skip, $sync) = @_;
3836
3837 $sync ? write_uuid_sync $skip
3838 : async { write_uuid_sync $skip };
3334} 3839}
3335 3840
3336sub emergency_save() { 3841sub emergency_save() {
3337 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3338 3843
3339 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3340 3850
3341 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3342 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3343 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3344 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3345 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3346 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3347 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3348 $pl->valid or next; 3860 $pl->valid or next;
3349 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3350 $pl->save; 3862 $pl->save;
3351 } 3863 }
3352 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3353 3865
3354 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
3355 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3356 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3357 $map->valid or next; 3871 $map->valid or next;
3358 $map->save; 3872 $map->save;
3359 } 3873 }
3360 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3361 3875
3362 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
3363 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3364 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3881
3882 info "emergency_perl_save: begin write uuid\n";
3883 write_uuid_sync 1;
3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3365 }; 3904 };
3366 3905
3367 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3368} 3907}
3369 3908
3370sub post_cleanup { 3909sub post_cleanup {
3371 my ($make_core) = @_; 3910 my ($make_core) = @_;
3372 3911
3912 IO::AIO::flush;
3913
3373 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3374 if $make_core; 3915 if $make_core;
3916
3917 my $fh = pidfile;
3918 unlink $PIDFILE if <$fh> == $$;
3919}
3920
3921# a safer delete_package, copied from Symbol
3922sub clear_package($) {
3923 my $pkg = shift;
3924
3925 # expand to full symbol table name if needed
3926 unless ($pkg =~ /^main::.*::$/) {
3927 $pkg = "main$pkg" if $pkg =~ /^::/;
3928 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3929 $pkg .= '::' unless $pkg =~ /::$/;
3930 }
3931
3932 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3933 my $stem_symtab = *{$stem}{HASH};
3934
3935 defined $stem_symtab and exists $stem_symtab->{$leaf}
3936 or return;
3937
3938 # clear all symbols
3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3940 for my $name (keys %$leaf_symtab) {
3941 _gv_clear *{"$pkg$name"};
3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3943 }
3375} 3944}
3376 3945
3377sub do_reload_perl() { 3946sub do_reload_perl() {
3378 # can/must only be called in main 3947 # can/must only be called in main
3379 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3380 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3381 return; 3950 return;
3382 } 3951 }
3383 3952
3384 warn "reloading..."; 3953 return if $RELOAD++;
3385 3954
3386 warn "entering sync_job"; 3955 my $t1 = AE::time;
3387 3956
3957 while ($RELOAD) {
3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3960
3961 trace "perl_reload: entering sync_job";
3962
3388 cf::sync_job { 3963 cf::sync_job {
3389 cf::write_runtime; # external watchdog should not bark
3390 cf::emergency_save; 3964 #cf::emergency_save;
3391 cf::write_runtime; # external watchdog should not bark
3392 3965
3393 warn "syncing database to disk";
3394 BDB::db_env_txn_checkpoint $DB_ENV;
3395
3396 # if anything goes wrong in here, we should simply crash as we already saved
3397
3398 warn "cancelling all WF_AUTOCANCEL watchers";
3399 for (Event::all_watchers) {
3400 $_->cancel if $_->data & WF_AUTOCANCEL;
3401 }
3402
3403 warn "flushing outstanding aio requests";
3404 for (;;) {
3405 BDB::flush;
3406 IO::AIO::flush;
3407 Coro::cede_notself;
3408 last unless IO::AIO::nreqs || BDB::nreqs;
3409 warn "iterate...";
3410 }
3411
3412 ++$RELOAD;
3413
3414 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3415 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3416 %EXT_CORO = (); 3968 %EXT_CORO = ();
3417 3969
3418 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3419 %COMMAND = (); 3971 %COMMAND = ();
3420 3972
3421 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3422 %EXTCMD = (); 3974 %EXTCMD = ();
3423 %EXTICMD = (); 3975 %EXTICMD = ();
3424 3976
3425 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3426 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3427 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3428 3980
3429 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3430 eval { 3982 eval {
3431 $cb->($pkg); 3983 $cb->($pkg);
3432 1 3984 1
3433 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3986 }
3987
3988 trace "... clearing $pkg";
3989 clear_package $pkg;
3434 } 3990 }
3435 3991
3436 warn "... nuking $pkg";
3437 Symbol::delete_package $pkg;
3438 }
3439
3440 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3441 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3442 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3443 3995
3444 warn "... unloading $k"; 3996 trace "... unloading $k";
3445 delete $INC{$k}; 3997 delete $INC{$k};
3446 3998
3447 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3448 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3449 4001
3450 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3451 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3452 } 4007 }
3453 4008
3454 Symbol::delete_package $k;
3455 }
3456
3457 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3458 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3459 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3460 4012
3461 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3462 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3463 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3464 4016
3465 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3466 # and global variables created in xs 4018 # and global variables created in xs
3467 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3468 4020
3469 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3470 4022
3471 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3472 require cf; 4024 require cf;
3473 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3474 4026
3475 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3476 cf::reload_config; 4028 cf::reload_config;
3477 4029
3478 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3479 cf::load_extensions; 4031 cf::load_extensions;
3480 4032
4033 if ($REATTACH_ON_RELOAD) {
3481 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3482 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3483 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3484 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3485 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3486 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3487 4041
3488 warn "leaving sync_job"; 4042 cf::_post_init 1;
3489 4043
4044 trace "perl_reload: leaving sync_job";
4045
3490 1 4046 1
3491 } or do { 4047 } or do {
3492 warn $@; 4048 error $@;
3493 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3494 exit 1; 4050 };
4051
4052 --$RELOAD;
3495 }; 4053 }
3496 4054
3497 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3498}; 4057};
3499 4058
3500our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3501 4060
3502sub reload_perl() { 4061sub reload_perl() {
3503 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3504 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3505 4064
3506 $RELOAD_WATCHER ||= Event->timer ( 4065 $RELOAD_WATCHER ||= cf::async {
3507 reentrant => 0, 4066 Coro::AIO::aio_wait cache_extensions;
3508 after => 0, 4067
3509 data => WF_AUTOCANCEL, 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3510 cb => sub {
3511 do_reload_perl; 4069 do_reload_perl;
3512 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3513 }, 4071 };
3514 ); 4072 };
3515} 4073}
3516 4074
3517register_command "reload" => sub { 4075register_command "reload" => sub {
3518 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3519 4077
3524 reload_perl; 4082 reload_perl;
3525 }; 4083 };
3526 } 4084 }
3527}; 4085};
3528 4086
3529unshift @INC, $LIBDIR; 4087#############################################################################
3530 4088
3531my $bug_warning = 0; 4089my $bug_warning = 0;
3532 4090
3533our @WAIT_FOR_TICK;
3534our @WAIT_FOR_TICK_BEGIN;
3535
3536sub wait_for_tick { 4091sub wait_for_tick() {
3537 return unless $TICK_WATCHER->is_active; 4092 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3538 return if $Coro::current == $Coro::main;
3539 4093
3540 my $signal = new Coro::Signal; 4094 $WAIT_FOR_TICK->wait;
3541 push @WAIT_FOR_TICK, $signal;
3542 $signal->wait;
3543} 4095}
3544 4096
3545sub wait_for_tick_begin { 4097sub wait_for_tick_begin() {
3546 return unless $TICK_WATCHER->is_active; 4098 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3547 return if $Coro::current == $Coro::main;
3548 4099
3549 my $signal = new Coro::Signal; 4100 my $signal = new Coro::Signal;
3550 push @WAIT_FOR_TICK_BEGIN, $signal; 4101 push @WAIT_FOR_TICK_BEGIN, $signal;
3551 $signal->wait; 4102 $signal->wait;
3552} 4103}
3553 4104
3554$TICK_WATCHER = Event->timer ( 4105sub tick {
3555 reentrant => 0,
3556 parked => 1,
3557 prio => 0,
3558 at => $NEXT_TICK || $TICK,
3559 data => WF_AUTOCANCEL,
3560 cb => sub {
3561 if ($Coro::current != $Coro::main) { 4106 if ($Coro::current != $Coro::main) {
3562 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4107 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3563 unless ++$bug_warning > 10; 4108 unless ++$bug_warning > 10;
3564 return; 4109 return;
3565 } 4110 }
3566 4111
3567 $NOW = $tick_start = Event::time; 4112 cf::one_tick; # one server iteration
3568 4113
3569 cf::server_tick; # one server iteration 4114 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3570 4115
3571 $RUNTIME += $TICK;
3572 $NEXT_TICK += $TICK;
3573
3574 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3575 $NEXT_RUNTIME_WRITE = $NOW + 10; 4117 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3576 Coro::async_pool { 4118 Coro::async_pool {
3577 $Coro::current->{desc} = "runtime saver"; 4119 $Coro::current->{desc} = "runtime saver";
3578 write_runtime 4120 write_runtime_sync
3579 or warn "ERROR: unable to write runtime file: $!"; 4121 or error "ERROR: unable to write runtime file: $!";
3580 };
3581 } 4122 };
4123 }
3582 4124
3583 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4125 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3584 $sig->send; 4126 $sig->send;
3585 } 4127 }
3586 while (my $sig = shift @WAIT_FOR_TICK) { 4128 $WAIT_FOR_TICK->broadcast;
3587 $sig->send;
3588 }
3589 4129
3590 $NOW = Event::time; 4130 $LOAD = ($NOW - $TICK_START) / $TICK;
3591
3592 # if we are delayed by four ticks or more, skip them all
3593 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3594
3595 $TICK_WATCHER->at ($NEXT_TICK);
3596 $TICK_WATCHER->start;
3597
3598 $LOAD = ($NOW - $tick_start) / $TICK;
3599 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4131 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3600 4132
3601 _post_tick; 4133 if (0) {
4134 if ($NEXT_TICK) {
4135 my $jitter = $TICK_START - $NEXT_TICK;
4136 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4137 debug "jitter $JITTER\n";#d#
4138 }
3602 }, 4139 }
3603); 4140}
3604 4141
3605{ 4142{
4143 # configure BDB
4144
3606 BDB::min_parallel 8; 4145 BDB::min_parallel 16;
3607 BDB::max_poll_time $TICK * 0.1; 4146 BDB::max_poll_reqs $TICK * 0.1;
3608 $BDB_POLL_WATCHER = Event->io ( 4147 #$AnyEvent::BDB::WATCHER->priority (1);
3609 reentrant => 0,
3610 fd => BDB::poll_fileno,
3611 poll => 'r',
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => \&BDB::poll_cb,
3615 );
3616
3617 BDB::set_sync_prepare {
3618 my $status;
3619 my $current = $Coro::current;
3620 (
3621 sub {
3622 $status = $!;
3623 $current->ready; undef $current;
3624 },
3625 sub {
3626 Coro::schedule while defined $current;
3627 $! = $status;
3628 },
3629 )
3630 };
3631 4148
3632 unless ($DB_ENV) { 4149 unless ($DB_ENV) {
3633 $DB_ENV = BDB::db_env_create; 4150 $DB_ENV = BDB::db_env_create;
3634 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4151 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3635 | BDB::LOG_AUTOREMOVE, 1); 4152 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4153 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3636 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4154 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3637 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4155 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3638 4156
3639 cf::sync_job { 4157 cf::sync_job {
3640 eval { 4158 eval {
3650 4168
3651 cf::cleanup "db_env_open(db): $@" if $@; 4169 cf::cleanup "db_env_open(db): $@" if $@;
3652 }; 4170 };
3653 } 4171 }
3654 4172
3655 $BDB_DEADLOCK_WATCHER = Event->timer ( 4173 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3656 after => 3,
3657 interval => 1,
3658 hard => 1,
3659 prio => 0,
3660 data => WF_AUTOCANCEL,
3661 cb => sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4174 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 },
3664 ); 4175 };
3665 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4176 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3666 after => 11,
3667 interval => 60,
3668 hard => 1,
3669 prio => 0,
3670 data => WF_AUTOCANCEL,
3671 cb => sub {
3672 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4177 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3673 },
3674 ); 4178 };
3675 $BDB_TRICKLE_WATCHER = Event->timer ( 4179 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3676 after => 5,
3677 interval => 10,
3678 hard => 1,
3679 prio => 0,
3680 data => WF_AUTOCANCEL,
3681 cb => sub {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4180 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 },
3684 ); 4181 };
3685} 4182}
3686 4183
3687{ 4184{
4185 # configure IO::AIO
4186
3688 IO::AIO::min_parallel 8; 4187 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4188 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = Event->io ( 4189 undef $AnyEvent::AIO::WATCHER;
3693 reentrant => 0,
3694 data => WF_AUTOCANCEL,
3695 fd => IO::AIO::poll_fileno,
3696 poll => 'r',
3697 prio => 0,
3698 cb => \&IO::AIO::poll_cb,
3699 );
3700} 4190}
3701 4191
3702my $_log_backtrace; 4192our $_log_backtrace;
4193our $_log_backtrace_last;
3703 4194
3704sub _log_backtrace { 4195sub _log_backtrace {
3705 my ($msg, @addr) = @_; 4196 my ($msg, @addr) = @_;
3706 4197
3707 $msg =~ s/\n//; 4198 $msg =~ s/\n$//;
3708 4199
4200 if ($_log_backtrace_last eq $msg) {
4201 LOG llevInfo, "[ABT] $msg\n";
4202 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3709 # limit the # of concurrent backtraces 4203 # limit the # of concurrent backtraces
3710 if ($_log_backtrace < 2) { 4204 } elsif ($_log_backtrace < 2) {
4205 $_log_backtrace_last = $msg;
3711 ++$_log_backtrace; 4206 ++$_log_backtrace;
4207 my $perl_bt = Carp::longmess $msg;
3712 async { 4208 async {
3713 $Coro::current->{desc} = "abt $msg"; 4209 $Coro::current->{desc} = "abt $msg";
3714 4210
3715 my @bt = fork_call { 4211 my @bt = fork_call {
3716 @addr = map { sprintf "%x", $_ } @addr; 4212 @addr = map { sprintf "%x", $_ } @addr;
3727 } 4223 }
3728 4224
3729 @funcs 4225 @funcs
3730 }; 4226 };
3731 4227
3732 LOG llevInfo, "[ABT] $msg\n"; 4228 LOG llevInfo, "[ABT] $perl_bt\n";
4229 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3733 LOG llevInfo, "[ABT] $_\n" for @bt; 4230 LOG llevInfo, "[ABT] $_\n" for @bt;
3734 --$_log_backtrace; 4231 --$_log_backtrace;
3735 }; 4232 };
3736 } else { 4233 } else {
3737 LOG llevInfo, "[ABT] $msg\n"; 4234 LOG llevInfo, "[ABT] $msg\n";
3738 LOG llevInfo, "[ABT] [suppressed]\n"; 4235 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3739 } 4236 }
3740} 4237}
3741 4238
3742# load additional modules 4239# load additional modules
3743use cf::pod; 4240require "cf/$_.pm" for @EXTRA_MODULES;
4241cf::_connect_to_perl_2;
3744 4242
3745END { cf::emergency_save } 4243END { cf::emergency_save }
3746 4244
37471 42451
3748 4246

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines