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.409 by root, Mon Jan 14 11:41:48 2008 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 EV 1.86; 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.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
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;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 75
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 78
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
50 85
51our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
61our $DATADIR = datadir; 99our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
65our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
71our %RESOURCE; 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;
72 120
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 123our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
79 125
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 129our $DB_ENV;
85 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
86our %CFG; 133our %CFG;
87 134
88our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
90our $NOW; 138our $NOW;
91 139
92our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 146
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
101our $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;
102 159
103binmode STDOUT; 160binmode STDOUT;
104binmode STDERR; 161binmode STDERR;
105 162
106# read virtual server time, if available 163# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
111} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
112 171
113mkdir $_ 172mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 174
116our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
117 176
118sub cf::map::normalise; 177sub cf::map::normalise;
119 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
120############################################################################# 183#############################################################################
121 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
122=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
123 197
124=over 4 198=over 4
125 199
126=item $cf::UPTIME 200=item $cf::UPTIME
127 201
128The 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.
129 218
130=item $cf::RUNTIME 219=item $cf::RUNTIME
131 220
132The 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
133every server tick. 222every server tick.
139Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
140directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
142database environment. 231database environment.
143 232
144=item $cf::NOW
145
146The time of the last (current) server tick.
147
148=item $cf::TICK
149
150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG 233=item $cf::LOADAVG
153 234
154The 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
155(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
156objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
165from wherever your confdir points to. 246from wherever your confdir points to.
166 247
167=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
168 249
169These 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
170returns 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
171per 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.
172 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
173=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
174 272
175This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 275that call.
178 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
179=back 283=back
180 284
181=cut 285=cut
182 286
183BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 294 my $msg = join "", @_;
186 295
187 $msg .= "\n" 296 $msg .= "\n"
188 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
189 298
190 $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;
191 300
192 LOG llevError, $msg; 301 LOG llevWarn, $msg;
193 }; 302};
194}
195 303
196$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
305 return unless $^S eq 0; # "eq", not "=="
306
197 warn Carp::longmess $_[0]; 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
198 Coro::terminate; 315 Coro::terminate
199}; 316};
200 317
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
211for my $pkg (qw( 328for my $pkg (qw(
212 cf::global cf::attachable 329 cf::global cf::attachable
213 cf::object cf::object::player 330 cf::object cf::object::player
214 cf::client cf::player 331 cf::client cf::player
215 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
216 cf::map cf::party cf::region 334 cf::party cf::region
217)) { 335)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 337}
221 338
222$EV::DIED = sub { 339$EV::DIED = sub {
223 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
224}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
225 347
226############################################################################# 348#############################################################################
227 349
228=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
229 351
250 $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;
251 $d 373 $d
252 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
253} 375}
254 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
255=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
256 392
257Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
258 394
259=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
265our $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
266 402
267sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
269 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
467
270=item cf::lock_wait $string 468=item cf::lock_wait $string
271 469
272Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
273 471
274=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
275 473
276Wait 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
277a 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,
278for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
279returned. 477returned.
280 478
281Locks 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
282deadlocked coro. 480deadlocked coro.
288 486
289Return 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.
290 488
291=cut 489=cut
292 490
293our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 492
296sub lock_wait($) { 493sub lock_wait($) {
297 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
303
304 # wait for lock, if any
305 while ($LOCK{$key}) {
306 push @{ $LOCK{$key} }, $Coro::current;
307 Coro::schedule;
308 }
309} 495}
310 496
311sub lock_acquire($) { 497sub lock_acquire($) {
312 my ($key) = @_; 498 $LOCKS->guard ($_[0])
313
314 # wait, to be sure we are not locked
315 lock_wait $key;
316
317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
319
320 Coro::guard {
321 delete $LOCKER{$key};#d#
322 # wake up all waiters, to be on the safe side
323 $_->ready for @{ delete $LOCK{$key} };
324 }
325} 499}
326 500
327sub lock_active($) { 501sub lock_active($) {
328 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 503}
332 504
333sub freeze_mainloop { 505sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
335 507
336 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 509}
342 510
343=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
344 512
345Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer. 514get spread over time.
347 515
348=cut 516=cut
349 517
350sub periodic($$) { 518sub periodic($$) {
351 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
355 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
356} 524}
357 525
358=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
359 527
360Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
361This 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
362of 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.
363 535
364The 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
365used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
366 538
367Useful for short background jobs. 539Useful for short background jobs.
368 540
369=cut 541=cut
370 542
371our @SLOT_QUEUE; 543our @SLOT_QUEUE;
372our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
373 546
374$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
377 550
378 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
379 553
380 while () { 554 while () {
381 next_job: 555 next_job:
556
382 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
383 if ($avail > 0.01) { 558
384 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
386 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send; 563 $job->[2]->send;
388 Coro::cede; 564 Coro::cede;
389 goto next_job; 565 goto next_job;
390 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
391 } 568 }
392 } 569 }
393 570
394 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
395 # 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
396 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
397 $signal->wait;
398 } else { 574 } else {
575 $busy = 0;
399 Coro::schedule; 576 Coro::schedule;
400 } 577 }
401 } 578 }
402}; 579};
403 580
404sub get_slot($;$$) { 581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
405 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
406 585
407 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
408 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
409 589
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
438=cut 618=cut
439 619
440sub sync_job(&) { 620sub sync_job(&) {
441 my ($job) = @_; 621 my ($job) = @_;
442 622
443 if ($Coro::current == $Coro::main) { 623 if (in_main) {
444 my $time = EV::time; 624 my $time = AE::time;
445 625
446 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
448 628
449 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
450 630
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
454 632
455 my $busy = 1; 633 my $busy = 1;
456 my @res; 634 my @res;
457 635
458 (async { 636 (async {
459 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
460 @res = eval { $job->() }; 638 @res = eval { $job->() };
461 warn $@ if $@; 639 error $@ if $@;
462 undef $busy; 640 undef $busy;
463 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
464 642
465 while ($busy) { 643 while ($busy) {
466 if (Coro::nready) { 644 if (Coro::nready) {
468 } else { 646 } else {
469 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
470 } 648 }
471 } 649 }
472 650
473 $time = EV::time - $time; 651 my $time = AE::time - $time;
474 652
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
479 654
480 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
481 } else { 656 } else {
482 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
483 658
503 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
504 679
505 $coro 680 $coro
506} 681}
507 682
508=item fork_call { }, $args 683=item fork_call { }, @args
509 684
510Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
511process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
512Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
513never block itself or use any form of event handling. 688never block itself or use any form of event handling.
514 689
515=cut 690=cut
516 691
692sub post_fork {
693 reset_signals;
694}
695
517sub fork_call(&@) { 696sub fork_call(&@) {
518 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
519 698
520 # 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,
521 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
522 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
523 702
524 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
525 reset_signals; 704 cf::post_fork;
526 &$cb 705 &$cb
527 }, @args; 706 } @args;
528 707
529 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
530} 747}
531 748
532=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
533 750
534Returns a single value from the environment database. 751Returns a single value from the environment database.
544within each server. 761within each server.
545 762
546=cut 763=cut
547 764
548sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
549 my ($name) = @_; 769 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
551 771
552 eval { 772 eval {
553 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
563} 783}
564 784
565our $DB; 785our $DB;
566 786
567sub db_init { 787sub db_init {
568 cf::sync_job {
569 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
570 };
571} 789}
572 790
573sub db_get($$) { 791sub db_get($$) {
574 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
575 793
576 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
577 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
578 798
579 $! ? () 799 $! ? ()
580 : $data 800 : $data
581 }
582} 801}
583 802
584sub db_put($$$) { 803sub db_put($$$) {
585 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
586 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
614 833
615 my @data; 834 my @data;
616 my $md5; 835 my $md5;
617 836
618 for (0 .. $#$src) { 837 for (0 .. $#$src) {
619 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
620 or Carp::croak "$src->[$_]: $!";
621 } 839 }
622 840
623 # if processing is expensive, check 841 # if processing is expensive, check
624 # checksum first 842 # checksum first
625 if (1) { 843 if (1) {
642 860
643 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
644 my $data = $process->(\@data); 862 my $data = $process->(\@data);
645 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
646 864
647 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
648 866
649 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
650 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
651 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
652 870
662 880
663=cut 881=cut
664 882
665sub datalog($@) { 883sub datalog($@) {
666 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
667 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
668} 886}
669 887
670=back 888=back
671 889
672=cut 890=cut
673 891
674############################################################################# 892#############################################################################
675 893
676=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
677 895
678Many 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
679attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
681 899
682In 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>
683C<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
733=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
734 952
735Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
737 955
738Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
739that 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.
740 958
741These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
742 960
743=over 4 961=over 4
867 1085
868 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
869 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
870 1088
871 } elsif (ref $type) { 1089 } elsif (ref $type) {
872 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
873 1091
874 } else { 1092 } else {
875 shift @arg; 1093 shift @arg;
876 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
877 } 1095 }
878 } 1096 }
879} 1097}
880 1098
881sub _object_attach { 1099sub _object_attach {
891 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
892 } 1110 }
893 1111
894 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
895 } else { 1113 } else {
896 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
897 } 1115 }
898 1116
899 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
900} 1118}
901 1119
960 1178
961 for (@$callbacks) { 1179 for (@$callbacks) {
962 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
963 1181
964 if ($@) { 1182 if ($@) {
965 warn "$@";
966 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
967 override; 1184 override;
968 } 1185 }
969 1186
970 return 1 if $override; 1187 return 1 if $override;
971 } 1188 }
1034 1251
1035sub reattach { 1252sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1254 my ($obj) = @_;
1038 1255
1256 # no longer needed after getting rid of delete_package?
1039 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
1040 1258
1041 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1042 1260
1043 @$registry = (); 1261 @$registry = ();
1044 1262
1049 for (@$attach) { 1267 for (@$attach) {
1050 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1051 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1052 } 1270 }
1053 } else { 1271 } else {
1054 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1055 } 1273 }
1056 } 1274 }
1057} 1275}
1058 1276
1059cf::attachable->attach ( 1277cf::attachable->attach (
1086 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1087 1305
1088 sync_job { 1306 sync_job {
1089 if (length $$rdata) { 1307 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1093 1312
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 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 }
1098 close $fh; 1320 aio_close $fh;
1099 1321
1100 if (@$objs) { 1322 if (@$objs) {
1101 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) {
1102 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1105 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 }
1106 close $fh; 1331 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1333 }
1109 } else { 1334 } else {
1110 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1111 } 1336 }
1112 1337
1113 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1342 } else {
1115 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1116 } 1344 }
1117 } else { 1345 } else {
1118 aio_unlink $filename; 1346 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1120 } 1348 }
1144 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs}; 1373 $av = $st->{objs};
1146 } 1374 }
1147 1375
1148 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1149 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1150 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1151 1380
1152 ($data, $av) 1381 ($data, $av)
1153} 1382}
1154 1383
1155=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1211 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1212 1441
1213 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1214} 1443}
1215 1444
1445use File::Glob ();
1446
1216cf::player->attach ( 1447cf::player->attach (
1217 on_command => sub { 1448 on_unknown_command => sub {
1218 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1219 1450
1220 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1221 or return; 1452 or return;
1222 1453
1245 1476
1246 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1247 if $reply; 1478 if $reply;
1248 1479
1249 } else { 1480 } else {
1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1251 } 1482 }
1252 1483
1253 cf::override; 1484 cf::override;
1254 }, 1485 },
1255); 1486);
1256 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
1257sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1258 cf::sync_job { 1504 cf::sync_job {
1259 my %todo; 1505 my %todo;
1260 1506
1261 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1262 next unless -r $path; 1508 next unless -r $path;
1280 1526
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1529
1284 $ext{source} = 1530 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1286 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1287 . $source 1533 . $source
1288 . "\n};\n1"; 1534 . "\n};\n1";
1289 1535
1290 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1291 } 1537 }
1292 1538
1539 my $pass = 0;
1293 my %done; 1540 my %done;
1294 while (%todo) { 1541 while (%todo) {
1295 my $progress; 1542 my $progress;
1296 1543
1544 ++$pass;
1545
1546 ext:
1297 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip 1549 next ext
1300 unless exists $done{$_}; 1550 unless exists $done{$_};
1301 } 1551 }
1302 1552
1303 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1304 1554
1305 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1306 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1307 : "$v->{base}: extension inactive.\n";
1308 1559
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1309 if (exists $v->{meta}{mandatory}) { 1561 if exists $v->{meta}{mandatory};
1310 warn $msg; 1562
1311 warn "mandatory extension failed to load, exiting.\n"; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1312 exit 1; 1564 delete $todo{$k};
1313 } 1565 } else {
1314 1566 $done{$k} = delete $todo{$k};
1315 warn $msg; 1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1316 } 1572 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1573 }
1322 1574
1323 skip: 1575 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 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 }
1326 } 1585 }
1327 }; 1586 };
1328} 1587}
1329 1588
1330############################################################################# 1589#############################################################################
1331 1590
1332=back 1591=back
1333 1592
1334=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1335 1594
1336Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1337 1596
1338=cut 1597=cut
1339 1598
1340package cf::player; 1599package cf::player;
1341 1600
1384 1643
1385sub exists($) { 1644sub exists($) {
1386 my ($login) = @_; 1645 my ($login) = @_;
1387 1646
1388 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1390} 1649}
1391 1650
1392sub find($) { 1651sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1653 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1665 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1666 or return;
1408 1667
1409 my $pl = cf::player::load_pl $f 1668 my $pl = cf::player::load_pl $f
1410 or return; 1669 or return;
1670
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1671 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1672 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1414 } 1674 }
1415 } 1675 }
1416} 1676}
1417 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
1418sub save($) { 1691sub save($) {
1419 my ($pl) = @_; 1692 my ($pl) = @_;
1420 1693
1421 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1422 1695
1425 1698
1426 return if $pl->{deny_save}; 1699 return if $pl->{deny_save};
1427 1700
1428 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1429 $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];
1430 1708
1431 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1710 cf::cede_to_tick;
1433} 1711}
1434 1712
1466 my ($pl) = @_; 1744 my ($pl) = @_;
1467 1745
1468 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1469 1747
1470 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1471 $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
1472 1750
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1474 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1476 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1477 1759
1478 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1480 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1518 1800
1519 for my $login (@$dirs) { 1801 for my $login (@$dirs) {
1520 my $path = path $login; 1802 my $path = path $login;
1521 1803
1522 # a .pst is a dead give-away for a valid player 1804 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1805 # if no pst file found, open and chekc for blocked users
1806 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1807 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1808 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1809 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1810 }
1528 1811
1532 1815
1533 \@logins 1816 \@logins
1534} 1817}
1535 1818
1536=item $player->maps 1819=item $player->maps
1820
1821=item cf::player::maps $login
1537 1822
1538Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1539player. May block. 1824player. May block.
1540 1825
1541=cut 1826=cut
1559 } 1844 }
1560 1845
1561 \@paths 1846 \@paths
1562} 1847}
1563 1848
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1850
1566Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656 1852
1657=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1658 1854
1659Sends an ext reply to the player. 1855Sends an ext reply to the player.
1660 1856
1692 1888
1693=cut 1889=cut
1694 1890
1695sub find_by_path($) { 1891sub find_by_path($) {
1696 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1697 1895
1698 my ($match, $specificity); 1896 my ($match, $specificity);
1699 1897
1700 for my $region (list) { 1898 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1727our $MAX_RESET = 3600; 1925our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1926our $DEFAULT_RESET = 3000;
1729 1927
1730sub generate_random_map { 1928sub generate_random_map {
1731 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1732 # mit "rum" bekleckern, nicht 1930
1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1932
1733 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 1934}
1747 1935
1748=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1749 1937
1750Register 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
1755 1943
1756sub register { 1944sub register {
1757 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1946 my $pkg = caller;
1759 1947
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1949
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1951}
1765 1952
1766# also paths starting with '/' 1953# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1955
1769sub thawer_merge { 1956sub thawer_merge {
1770 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1771 1958
1772 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1777} 1964}
1778 1965
1779sub normalise { 1966sub normalise {
1780 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1781 1968
1782 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1783 1970
1784 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1785 1972
1786 # map plan: 1973 # map plan:
1787 # 1974 #
1802 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 1990 $path = "$base/$path";
1804 } 1991 }
1805 1992
1806 for ($path) { 1993 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1810 } 1996 }
1811 1997
1812 $path 1998 $path
1826 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1827 return $self; 2013 return $self;
1828 } 2014 }
1829 } 2015 }
1830 2016
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 2018 ()
1833} 2019}
1834 2020
2021# may re-bless or do other evil things
1835sub init { 2022sub init {
1836 my ($self) = @_; 2023 my ($self) = @_;
1837 2024
1838 $self 2025 $self
1839} 2026}
1858 2045
1859# the temporary/swap location 2046# the temporary/swap location
1860sub save_path { 2047sub save_path {
1861 my ($self) = @_; 2048 my ($self) = @_;
1862 2049
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1865} 2052}
1866 2053
1867# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1868sub uniq_path { 2055sub uniq_path {
1869 my ($self) = @_; 2056 my ($self) = @_;
1870 2057
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 2060}
1883 2061
1884sub decay_objects { 2062sub decay_objects {
1885 my ($self) = @_; 2063 my ($self) = @_;
1886 2064
1913 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1914 2092
1915 1 2093 1
1916} 2094}
1917 2095
2096# used to laod the header of an original map
1918sub load_header_orig { 2097sub load_header_orig {
1919 my ($self) = @_; 2098 my ($self) = @_;
1920 2099
1921 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1922} 2101}
1923 2102
2103# used to laod the header of an instantiated map
1924sub load_header_temp { 2104sub load_header_temp {
1925 my ($self) = @_; 2105 my ($self) = @_;
1926 2106
1927 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1928} 2108}
1929 2109
2110# called after loading the header from an instantiated map
1930sub prepare_temp { 2111sub prepare_temp {
1931 my ($self) = @_; 2112 my ($self) = @_;
1932 2113
1933 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1934 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1935 # safety 2116 # safety
1936 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1937 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1938} 2119}
1939 2120
2121# called after loading the header from an original map
1940sub prepare_orig { 2122sub prepare_orig {
1941 my ($self) = @_; 2123 my ($self) = @_;
1942 2124
1943 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1944 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1968 2150
1969sub find; 2151sub find;
1970sub find { 2152sub find {
1971 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1972 2154
2155 cf::cede_to_tick;
2156
1973 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1974 2158
1975 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2161
1978 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1982 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1983 or return; 2164 or return;
1984 2165
1985 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1986 2167
1988 or return; 2169 or return;
1989 2170
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
1993 undef $guard1; 2175 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2176 $map->reset;
1996 return find $path; 2177 return find $path;
1997 } 2178 }
1998 2179
1999 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2000 } 2181 }
2001} 2182}
2002 2183
2003sub pre_load { } 2184sub pre_load { }
2004sub post_load { } 2185#sub post_load { } # XS
2005 2186
2006sub load { 2187sub load {
2007 my ($self) = @_; 2188 my ($self) = @_;
2008 2189
2009 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2012 2193
2013 { 2194 {
2014 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2015 2196
2016 return unless $self->valid; 2197 return unless $self->valid;
2017 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2018
2019 $self->in_memory (cf::MAP_LOADING);
2020 2199
2021 $self->alloc; 2200 $self->alloc;
2022 2201
2023 $self->pre_load; 2202 $self->pre_load;
2024 cf::cede_to_tick; 2203 cf::cede_to_tick;
2025 2204
2205 if (exists $self->{load_path}) {
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2207 $f->skip_block;
2028 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2029 or return; 2209 or return;
2030 2210
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
2032 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2033 2213
2034 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2215 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2038 $self->clear_unique_items; 2218 $self->clear_unique_items;
2039 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2041 } 2222 }
2042 } 2223 }
2043 }
2044 2224
2045 $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);
2046 2232
2047 cf::cede_to_tick; 2233 cf::cede_to_tick;
2048 # now do the right thing for maps 2234 # now do the right thing for maps
2049 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2050 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2054 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2241 $self->decay_objects;
2056 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2057 $self->update_buttons; 2243 $self->update_buttons;
2058 cf::cede_to_tick; 2244 cf::cede_to_tick;
2059 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
2060 cf::cede_to_tick;
2061 $self->activate;
2062 } 2246 }
2063 2247
2064 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2066
2067 $self->in_memory (cf::MAP_IN_MEMORY);
2068 } 2250 }
2069 2251
2070 $self->post_load; 2252 $self->post_load;
2071}
2072 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
2073sub customise_for { 2260sub customise_for {
2074 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2075 2262
2076 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2264 if $self->per_player;
2080# if $self->per_party; 2267# if $self->per_party;
2081 2268
2082 $self 2269 $self
2083} 2270}
2084 2271
2085# find and load all maps in the 3x3 area around a map
2086sub load_neighbours {
2087 my ($map) = @_;
2088
2089 my @neigh; # diagonal neighbours
2090
2091 for (0 .. 3) {
2092 my $neigh = $map->tile_path ($_)
2093 or next;
2094 $neigh = find $neigh, $map
2095 or next;
2096 $neigh->load;
2097
2098 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 }
2102
2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
2105 my $neigh = find $path, $origin
2106 or next;
2107 $neigh->load;
2108 }
2109}
2110
2111sub find_sync { 2272sub find_sync {
2112 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2113 2274
2114 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
2115} 2280}
2116 2281
2117sub do_load_sync { 2282sub do_load_sync {
2118 my ($map) = @_; 2283 my ($map) = @_;
2119 2284
2285 # it's a bug to call this from the main context
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2122 2288
2123 cf::sync_job { $map->load }; 2289 $map->load;
2124} 2290}
2125 2291
2126our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2128 2294
2129sub find_async { 2295sub find_async {
2130 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2131 2297
2132 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2133 2299
2134 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2301 return $map if !$load || $map->linkable;
2136 } 2302 }
2137 2303
2138 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2139 2305
2140 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2155 2321
2156 () 2322 ()
2157} 2323}
2158 2324
2325# common code, used by both ->save and ->swapout
2159sub save { 2326sub _save {
2160 my ($self) = @_; 2327 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2328
2164 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2165 2330
2166 return unless $self->dirty; 2331 return unless $self->dirty;
2167 2332
2176 2341
2177 cf::async { 2342 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2343 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2344 $_->contr->save for $self->players;
2180 }; 2345 };
2346
2347 cf::get_slot 0.02;
2181 2348
2182 if ($uniq) { 2349 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2351 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2352 } else {
2186 $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);
2187 } 2354 }
2188} 2355}
2189 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2190sub swap_out { 2365sub swap_out {
2191 my ($self) = @_; 2366 my ($self) = @_;
2192 2367
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2198 return if $self->players; 2372 return if $self->players;
2199 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
2200 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2201 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
2202 $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};
2203 2424
2204 $self->deactivate; 2425 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2206 $self->clear; 2427 $self->clear;
2207}
2208
2209sub reset_at {
2210 my ($self) = @_;
2211
2212 # TODO: safety, remove and allow resettable per-player maps
2213 return 1e99 if $self->{deny_reset};
2214
2215 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2216 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2217
2218 $time + $to
2219}
2220
2221sub should_reset {
2222 my ($self) = @_;
2223
2224 $self->reset_at <= $cf::RUNTIME
2225}
2226
2227sub reset {
2228 my ($self) = @_;
2229
2230 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231
2232 return if $self->players;
2233
2234 warn "resetting map ", $self->path;
2235
2236 $self->in_memory (cf::MAP_SWAPPED);
2237
2238 # need to save uniques path
2239 unless ($self->{deny_save}) {
2240 my $uniq = $self->uniq_path; utf8::encode $uniq;
2241
2242 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2243 if $uniq;
2244 }
2245
2246 delete $cf::MAP{$self->path};
2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2250 $self->clear;
2251 2428
2252 $self->unlink_save; 2429 $self->unlink_save;
2253 $self->destroy; 2430 $self->destroy;
2254} 2431}
2255 2432
2263 2440
2264 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2265 2442
2266 $self->unlink_save; 2443 $self->unlink_save;
2267 2444
2268 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2269 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2270 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2271 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2273 2450
2322 2499
2323sub unique_maps() { 2500sub unique_maps() {
2324 [ 2501 [
2325 map { 2502 map {
2326 utf8::decode $_; 2503 utf8::decode $_;
2327 /\.map$/ 2504 s/\.map$//; # TODO future compatibility hack
2505 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2506 ? ()
2328 ? normalise $_ 2507 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2509 ]
2332} 2510}
2333 2511
2334package 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}
2335 2543
2336=back 2544=back
2337 2545
2338=head3 cf::object 2546=head3 cf::object
2339 2547
2343 2551
2344=over 4 2552=over 4
2345 2553
2346=item $ob->inv_recursive 2554=item $ob->inv_recursive
2347 2555
2348Returns 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.
2349 2558
2350=cut 2559=cut
2351 2560
2352sub inv_recursive_; 2561sub inv_recursive_;
2353sub inv_recursive_ { 2562sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2567 inv_recursive_ inv $_[0]
2359} 2568}
2360 2569
2361=item $ref = $ob->ref 2570=item $ref = $ob->ref
2362 2571
2363creates 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.
2364 2573
2365=item $ob = cf::object::deref ($refstring) 2574=item $ob = cf::object::deref ($refstring)
2366 2575
2367returns 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,
2368even if the object actually exists. May block. 2577even if the object actually exists. May block.
2400can 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
2401dialogue with the given NPC character. 2610dialogue with the given NPC character.
2402 2611
2403=cut 2612=cut
2404 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
2405# rough implementation of a future "reply" method that works 2628# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2629# with dialog boxes.
2407#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
2408sub cf::object::player::reply($$$;$) { 2631sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2632 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2643 my $dialog = $pl->{npc_dialog};
2421 $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));
2422 2645
2423 } else { 2646 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2647 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2648 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2649 }
2427 } 2650 }
2428} 2651}
2429 2652
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2653=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2678
2456=item $player_object->enter_link 2679=item $player_object->enter_link
2457 2680
2458Freezes 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}>).
2459 2682
2460The 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.
2461I<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.
2462 2687
2463Will never block. 2688Will never block.
2464 2689
2465=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2466 2691
2486sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2487 my ($self) = @_; 2712 my ($self) = @_;
2488 2713
2489 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2490 2715
2716 ++$self->{_link_recursion};
2717
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2719
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2495 2722
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2724}
2498 2725
2499sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2501 2728
2518 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2520 2747
2521 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2524 2751
2525 $map->load; 2752 $map->load;
2526 $map->load_neighbours;
2527 2753
2528 return unless $self->contr->active; 2754 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2755
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2533} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2534 2763
2764}
2765
2535=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)]])
2536 2767
2537Moves 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
2538her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2539that 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
2540the 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
2541be called at the end of this process. 2772be called at the end of this process.
2542 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
2543=cut 2777=cut
2544 2778
2545our $GOTOGEN; 2779our $GOTOGEN;
2546 2780
2547sub cf::object::player::goto { 2781sub cf::object::player::goto {
2548 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 }
2549 2789
2550 # 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
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2792
2553 $self->enter_link; 2793 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2574 } 2814 }
2575 } 2815 }
2576 2816
2577 my $map = eval { 2817 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2819
2580 if ($map) { 2820 if ($map) {
2581 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2823 } else {
2584 $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);
2585 } 2825 }
2586 2826
2587 $map 2827 $map
2595 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2598 } 2838 }
2599 2839
2600 $done->() if $done; 2840 $done->($self) if $done;
2601 })->prio (1); 2841 })->prio (1);
2602} 2842}
2603 2843
2604=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2605 2845
2625} 2865}
2626 2866
2627sub prepare_random_map { 2867sub prepare_random_map {
2628 my ($exit) = @_; 2868 my ($exit) = @_;
2629 2869
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2870 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2871 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2872 # that depends on the exit object
2635 2873
2636 my $rmp = parse_random_map_params $exit->msg; 2874 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2876 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2877 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2878 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2879 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2880 $rmp->{origin_y} = $exit->y;
2881
2882 $exit->map->touch;
2643 } 2883 }
2644 2884
2645 $rmp->{random_seed} ||= $exit->random_seed; 2885 $rmp->{random_seed} ||= $exit->random_seed;
2646 2886
2647 my $data = cf::encode_json $rmp; 2887 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2888 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2889 my $meta = "$RANDOMDIR/$md5.meta";
2650 2890
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2891 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2892 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2893 undef $fh;
2654 aio_rename "$meta~", $meta; 2894 aio_rename "$meta~", $meta;
2655 2895
2896 my $slaying = "?random/$md5";
2897
2898 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2899 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2900 $exit->msg (undef);
2901 }
2658 } 2902 }
2659} 2903}
2660 2904
2661sub cf::object::player::enter_exit { 2905sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2906 my ($self, $exit) = @_;
2663 2907
2664 return unless $self->type == cf::PLAYER; 2908 return unless $self->type == cf::PLAYER;
2665 2909
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2910 $self->enter_link;
2678 2911
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2912 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2913 $Coro::current->{desc} = "enter_exit";
2685 2914
2686 $self->deactivate_recursive; # just to be sure
2687 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
2688 $self->goto ($slaying, $hp, $sp); 2945 $self->goto ($map, $x, $y);
2689 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
2690 1; 2951 1
2691 }) { 2952 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "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. "
2694 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2957
2697 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2698 $self->leave_link; 2959 $self->leave_link;
2699 } 2960 }
2700 })->prio (1); 2961 })->prio (1);
2701} 2962}
2702 2963
2714sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2716 2977
2717 utf8::encode $text; 2978 utf8::encode $text;
2718 $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);
2719} 3005}
2720 3006
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 3008
2723Send 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
2727 3013
2728=cut 3014=cut
2729 3015
2730# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2732 "c/identify" => { 3024 "c/identify" => {
2733 id => "infobox", 3025 id => "infobox",
2734 title => "Identify", 3026 title => "Identify",
2735 reply => undef, 3027 reply => undef,
2736 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2738 "c/examine" => { 3030 "c/examine" => {
2739 id => "infobox", 3031 id => "infobox",
2740 title => "Examine", 3032 title => "Examine",
2741 reply => undef, 3033 reply => undef,
2742 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",
2743 }, 3041 },
2744 "c/book" => { 3042 "c/book" => {
2745 id => "infobox", 3043 id => "infobox",
2746 title => "Book", 3044 title => "Book",
2747 reply => undef, 3045 reply => undef,
2763 id => "infobox", 3061 id => "infobox",
2764 title => "Body Parts", 3062 title => "Body Parts",
2765 reply => undef, 3063 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 3064 tooltip => "Shows which body parts you posess and are available",
2767 }, 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 },
2768 "c/uptime" => { 3102 "c/uptime" => {
2769 id => "infobox", 3103 id => "infobox",
2770 title => "Uptime", 3104 title => "Uptime",
2771 reply => undef, 3105 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 3106 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 3109 id => "infobox",
2776 title => "Map Info", 3110 title => "Map Info",
2777 reply => undef, 3111 reply => undef,
2778 tooltip => "Information related to the maps", 3112 tooltip => "Information related to the maps",
2779 }, 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,
2780); 3128);
2781 3129
2782sub cf::client::send_msg { 3130sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3131 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3132
2785 $msg = $self->pl->expand_cfpod ($msg); 3133 $msg = $self->pl->expand_cfpod ($msg)
3134 unless $color & cf::NDI_VERBATIM;
2786 3135
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3136 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3137
2789 # check predefined channels, for the benefit of C 3138 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3139 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3140 $channel = $CHANNEL{$channel};
2792 3141
2793 $self->ext_msg (channel_info => $channel) 3142 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3143 $channel = $channel->{id};
2797 3144
2798 } elsif (ref $channel) { 3145 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3146 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3147 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3148 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3149 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3150 }
2805 3151
2806 $channel = $channel->{id}; 3152 $channel = $channel->{id};
2807 } 3153 }
2808 3154
2809 return unless @extra || length $msg; 3155 return unless @extra || length $msg;
2810 3156
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3157 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3158 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3159 if $color & cf::NDI_DEF;
2815 3160
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3161 my $pkt = "msg "
3162 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3164 );
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829 3165
2830 $color &= cf::NDI_COLOR_MASK; 3166 $self->send_big_packet ($pkt);
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843} 3167}
2844 3168
2845=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2846 3170
2847Sends an ext event to the client. 3171Sends an ext event to the client.
2850 3174
2851sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2853 3177
2854 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3183 }
2860} 3184}
2861 3185
2862=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2863 3187
2867 3191
2868sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2870 3194
2871 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3198 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3201 }
2878} 3202}
2879 3203
2880=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2881 3205
2952 3276
2953 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
2954 if $reply; 3278 if $reply;
2955 3279
2956 } else { 3280 } else {
2957 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";
2958 } 3282 }
2959 3283
2960 cf::override; 3284 cf::override;
2961 }, 3285 },
2962); 3286);
2982 3306
2983 $coro 3307 $coro
2984} 3308}
2985 3309
2986cf::client->attach ( 3310cf::client->attach (
2987 on_destroy => sub { 3311 on_client_destroy => sub {
2988 my ($ns) = @_; 3312 my ($ns) = @_;
2989 3313
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3315 },
2992); 3316);
3008our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3009 3333
3010$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3011 3335
3012$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3015 sort time 3339 sort time
3016)); 3340));
3017 3341
3018# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3021 3345
3022The following functions and methods are available within a safe environment: 3346The following functions and methods are available within a safe environment:
3023 3347
3024 cf::object 3348 cf::object
3025 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
3026 insert remove name archname title slaying race decrease_ob_nr 3350 insert remove name archname title slaying race decrease split
3351 value
3027 3352
3028 cf::object::player 3353 cf::object::player
3029 player 3354 player
3030 3355
3031 cf::player 3356 cf::player
3036 3361
3037=cut 3362=cut
3038 3363
3039for ( 3364for (
3040 ["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
3041 insert remove inv name archname title slaying race 3366 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3369 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3046) { 3371) {
3047 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 for @funs; 3374 for @funs;
3051} 3375}
3052 3376
3067 3391
3068 my $qcode = $code; 3392 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3071 3395
3396 %vars = (_dummy => 0) unless %vars;
3397
3398 my @res;
3072 local $_; 3399 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3400
3075 my $eval = 3401 my $eval =
3076 "do {\n" 3402 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3405 . $code
3080 . "\n}" 3406 . "\n}"
3081 ; 3407 ;
3082 3408
3409 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 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 }
3086 3418
3087 if ($@) { 3419 if ($@) {
3088 warn "$@"; 3420 warn "$@",
3089 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3091 } 3423 }
3092 3424
3093 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3094} 3426}
3095 3427
3109=cut 3441=cut
3110 3442
3111sub register_script_function { 3443sub register_script_function {
3112 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3113 3445
3114 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3116} 3448}
3117 3449
3118=back 3450=back
3119 3451
3120=cut 3452=cut
3129 # for this (global event?) 3461 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3131 3463
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133 3465
3134 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3135 3467
3136 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3137 0 < aio_load $path, $facedata
3138 or die "$path: $!";
3139
3140 $facedata = Coro::Storable::thaw $facedata;
3141 3469
3142 $facedata->{version} == 2 3470 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3472
3145 # 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]);
3146 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3476 type => FT_RSRC,
3148 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),
3149 }; 3479 };
3150 cf::cede_to_tick; 3480 cf::cede_to_tick;
3151 3481
3152 { 3482 {
3153 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3487
3158 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 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} ;
3162 3493
3163 cf::cede_to_tick; 3494 cf::cede_to_tick;
3164 } 3495 }
3165 3496
3166 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3171 3502
3172 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3175 } else { 3506 } else {
3176 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3177 } 3508 }
3178 3509
3179 cf::cede_to_tick; 3510 cf::cede_to_tick;
3180 } 3511 }
3181 } 3512 }
3190 3521
3191 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3192 } 3523 }
3193 3524
3194 { 3525 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3198 3527
3199 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3529 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3531
3204 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3219 } else { 3534 } else {
3220 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3221 } 3536 }
3222 3537
3223 cf::cede_to_tick; 3538 cf::cede_to_tick;
3224 } 3539 }
3225 } 3540 }
3226 3541
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228 3543
3229 1 3544 1
3230} 3545}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3251 3546
3252register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3254 3549
3255 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3551 $ns->fx_want ($k, $v);
3257 } 3552 }
3258}; 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}
3259 3564
3260sub reload_regions { 3565sub reload_regions {
3261 # 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
3262 # for this (global event?) 3567 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3568 %ext::player_env::MUSIC_FACE_CACHE = ();
3277} 3582}
3278 3583
3279sub reload_archetypes { 3584sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3585 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3586 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3587}
3288 3588
3289sub reload_treasures { 3589sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3292} 3592}
3293 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
3294sub reload_resources { 3614sub reload_resources {
3295 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3296 3616
3617 reload_exp_table;
3618 reload_materials;
3619 reload_facedata;
3620 reload_sound;
3621 reload_archetypes;
3297 reload_regions; 3622 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3623 reload_treasures;
3302 3624
3303 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3626}
3309 3627
3310sub reload_config { 3628sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3312 or return;
3313 3630
3314 local $/; 3631 my $config = load_file "$CONFDIR/config";
3315 *CFG = YAML::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3316 3634
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3318 3636
3319 $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};
3320 $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};
3321 3639
3322 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3326 }; 3644 };
3327 warn $@ if $@; 3645 warn $@ if $@;
3328 } 3646 }
3329} 3647}
3330 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
3331sub 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
3332 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3334 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#
3335 (async { 3690 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3691 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3692 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3693 })->prio (Coro::PRIO_MAX);
3339 }; 3694 };
3340 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;
3341 reload_config; 3708 reload_config;
3342 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
3343 load_extensions; 3719 load_extensions;
3344 3720
3345 $TICK_WATCHER->start; 3721 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3722
3347 EV::loop; 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;
3348} 3738}
3349 3739
3350############################################################################# 3740#############################################################################
3351# initialisation and cleanup 3741# initialisation and cleanup
3352 3742
3353# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3354BEGIN { 3744BEGIN {
3355 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3359 }; 3749 };
3360 } 3750 }
3361} 3751}
3362 3752
3363sub write_runtime { 3753sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3365 3755
3366 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3368 3758
3369 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3760
3371 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3372 3762
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3764 or return;
3375 3765
3376 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3389 3779
3390 close $fh 3780 close $fh
3391 or return; 3781 or return;
3392 3782
3393 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3784 and return;
3395 3785
3396 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3787
3398 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 };
3399} 3839}
3400 3840
3401sub emergency_save() { 3841sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3403 3843
3404 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;
3405 3850
3406 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3407 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3860 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3862 $pl->save;
3416 } 3863 }
3417 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3418 3865
3419 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";
3420 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3871 $map->valid or next;
3423 $map->save; 3872 $map->save;
3424 } 3873 }
3425 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3426 3875
3427 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";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3429 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
3430 }; 3904 };
3431 3905
3432 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3433} 3907}
3434 3908
3435sub post_cleanup { 3909sub post_cleanup {
3436 my ($make_core) = @_; 3910 my ($make_core) = @_;
3437 3911
3912 IO::AIO::flush;
3913
3438 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3439 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 }
3440} 3944}
3441 3945
3442sub do_reload_perl() { 3946sub do_reload_perl() {
3443 # can/must only be called in main 3947 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3445 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3446 return; 3950 return;
3447 } 3951 }
3448 3952
3449 warn "reloading..."; 3953 return if $RELOAD++;
3450 3954
3451 warn "entering sync_job"; 3955 my $t1 = AE::time;
3452 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
3453 cf::sync_job { 3963 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark
3455 cf::emergency_save; 3964 #cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark
3457 3965
3458 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV;
3460
3461 # if anything goes wrong in here, we should simply crash as we already saved
3462
3463 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs;
3469 warn "iterate...";
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = (); 3968 %EXT_CORO = ();
3477 3969
3478 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3479 %COMMAND = (); 3971 %COMMAND = ();
3480 3972
3481 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3482 %EXTCMD = (); 3974 %EXTCMD = ();
3483 %EXTICMD = (); 3975 %EXTICMD = ();
3484 3976
3485 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3486 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3488 3980
3489 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3490 eval { 3982 eval {
3491 $cb->($pkg); 3983 $cb->($pkg);
3492 1 3984 1
3493 } 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;
3494 } 3990 }
3495 3991
3496 warn "... nuking $pkg";
3497 Symbol::delete_package $pkg;
3498 }
3499
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3501 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3995
3504 warn "... unloading $k"; 3996 trace "... unloading $k";
3505 delete $INC{$k}; 3997 delete $INC{$k};
3506 3998
3507 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3509 4001
3510 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3511 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3512 } 4007 }
3513 4008
3514 Symbol::delete_package $k;
3515 }
3516
3517 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3519 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);
3520 4012
3521 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 4016
3525 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3526 # and global variables created in xs 4018 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3528 4020
3529 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3530 4022
3531 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3532 require cf; 4024 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3534 4026
3535 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3536 cf::reload_config; 4028 cf::reload_config;
3537 4029
3538 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3539 cf::load_extensions; 4031 cf::load_extensions;
3540 4032
4033 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3544 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3547 4041
3548 warn "leaving sync_job"; 4042 cf::_post_init 1;
3549 4043
4044 trace "perl_reload: leaving sync_job";
4045
3550 1 4046 1
3551 } or do { 4047 } or do {
3552 warn $@; 4048 error $@;
3553 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3554 exit 1; 4050 };
4051
4052 --$RELOAD;
3555 }; 4053 }
3556 4054
3557 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3558}; 4057};
3559 4058
3560our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3561 4060
3562sub reload_perl() { 4061sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3565 4064
4065 $RELOAD_WATCHER ||= cf::async {
4066 Coro::AIO::aio_wait cache_extensions;
4067
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3567 do_reload_perl; 4069 do_reload_perl;
3568 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
4071 };
3569 }; 4072 };
3570} 4073}
3571 4074
3572register_command "reload" => sub { 4075register_command "reload" => sub {
3573 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3579 reload_perl; 4082 reload_perl;
3580 }; 4083 };
3581 } 4084 }
3582}; 4085};
3583 4086
3584unshift @INC, $LIBDIR; 4087#############################################################################
3585 4088
3586my $bug_warning = 0; 4089my $bug_warning = 0;
3587 4090
3588our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN;
3590
3591sub wait_for_tick { 4091sub wait_for_tick() {
3592 return unless $TICK_WATCHER->is_active; 4092 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3593 return if $Coro::current == $Coro::main;
3594 4093
3595 my $signal = new Coro::Signal; 4094 $WAIT_FOR_TICK->wait;
3596 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait;
3598} 4095}
3599 4096
3600sub wait_for_tick_begin { 4097sub wait_for_tick_begin() {
3601 return unless $TICK_WATCHER->is_active; 4098 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3602 return if $Coro::current == $Coro::main;
3603 4099
3604 my $signal = new Coro::Signal; 4100 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 4101 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 4102 $signal->wait;
3607} 4103}
3608 4104
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4105sub tick {
3610 if ($Coro::current != $Coro::main) { 4106 if ($Coro::current != $Coro::main) {
3611 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"
3612 unless ++$bug_warning > 10; 4108 unless ++$bug_warning > 10;
3613 return; 4109 return;
3614 } 4110 }
3615 4111
3616 $NOW = $tick_start = EV::now; 4112 cf::one_tick; # one server iteration
3617 4113
3618 cf::server_tick; # one server iteration 4114 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 4115
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4117 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 4118 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 4119 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 4120 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 4121 or error "ERROR: unable to write runtime file: $!";
3629 }; 4122 };
3630 } 4123 }
3631 4124
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4125 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send; 4126 $sig->send;
3634 } 4127 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 4128 $WAIT_FOR_TICK->broadcast;
3636 $sig->send;
3637 }
3638 4129
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4130 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4131 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4132
3642 _post_tick; 4133 if (0) {
3643}; 4134 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4135 my $jitter = $TICK_START - $NEXT_TICK;
4136 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4137 debug "jitter $JITTER\n";#d#
4138 }
4139 }
4140}
3645 4141
3646{ 4142{
3647 # configure BDB 4143 # configure BDB
3648 4144
3649 BDB::min_parallel 8; 4145 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4146 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4147 #$AnyEvent::BDB::WATCHER->priority (1);
3652 4148
3653 unless ($DB_ENV) { 4149 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4150 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4151 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | 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;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4154 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4155 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4156
3660 cf::sync_job { 4157 cf::sync_job {
3661 eval { 4158 eval {
3687{ 4184{
3688 # configure IO::AIO 4185 # configure IO::AIO
3689 4186
3690 IO::AIO::min_parallel 8; 4187 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4188 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4189 undef $AnyEvent::AIO::WATCHER;
3693} 4190}
3694 4191
3695my $_log_backtrace; 4192our $_log_backtrace;
4193our $_log_backtrace_last;
3696 4194
3697sub _log_backtrace { 4195sub _log_backtrace {
3698 my ($msg, @addr) = @_; 4196 my ($msg, @addr) = @_;
3699 4197
3700 $msg =~ s/\n//; 4198 $msg =~ s/\n$//;
3701 4199
4200 if ($_log_backtrace_last eq $msg) {
4201 LOG llevInfo, "[ABT] $msg\n";
4202 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3702 # limit the # of concurrent backtraces 4203 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4204 } elsif ($_log_backtrace < 2) {
4205 $_log_backtrace_last = $msg;
3704 ++$_log_backtrace; 4206 ++$_log_backtrace;
4207 my $perl_bt = Carp::longmess $msg;
3705 async { 4208 async {
3706 $Coro::current->{desc} = "abt $msg"; 4209 $Coro::current->{desc} = "abt $msg";
3707 4210
3708 my @bt = fork_call { 4211 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4212 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4223 }
3721 4224
3722 @funcs 4225 @funcs
3723 }; 4226 };
3724 4227
3725 LOG llevInfo, "[ABT] $msg\n"; 4228 LOG llevInfo, "[ABT] $perl_bt\n";
4229 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4230 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4231 --$_log_backtrace;
3728 }; 4232 };
3729 } else { 4233 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4234 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4235 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3732 } 4236 }
3733} 4237}
3734 4238
3735# load additional modules 4239# load additional modules
3736use cf::pod; 4240require "cf/$_.pm" for @EXTRA_MODULES;
4241cf::_connect_to_perl_2;
3737 4242
3738END { cf::emergency_save } 4243END { cf::emergency_save }
3739 4244
37401 42451
3741 4246

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines