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.367 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 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 Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
69our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
75 120
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 123our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
83 125
84our $BDB_POLL_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 129our $DB_ENV;
88 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
89our %CFG; 133our %CFG;
90 134
91our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 136our $RUNTIME;
137our $NOW;
93 138
94our (%PLAYER, %PLAYER_LOADING); # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 140our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
97 142
98# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 145
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
104 155
105binmode STDOUT; 156binmode STDOUT;
106binmode STDERR; 157binmode STDERR;
107 158
108# read virtual server time, if available 159# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
113} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
114 167
115mkdir $_ 168mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 170
118our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
119 172
120sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
121 189
122############################################################################# 190#############################################################################
123 191
124=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
125 193
161 229
162The raw value load value from the last tick. 230The raw value load value from the last tick.
163 231
164=item %cf::CFG 232=item %cf::CFG
165 233
166Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 235from wherever your confdir points to.
168 236
169=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
170 238
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
172returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
173per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
174 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
175=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
176 249
177This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call. 252that call.
180 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
181=back 260=back
182 261
183=cut 262=cut
184 263
185BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
186 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
187 my $msg = join "", @_; 271 my $msg = join "", @_;
188 272
189 $msg .= "\n" 273 $msg .= "\n"
190 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
191 275
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 277
194 LOG llevError, $msg; 278 LOG llevWarn, $msg;
195 }; 279};
196} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
197 294
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 305for my $pkg (qw(
209 cf::global cf::attachable 306 cf::global cf::attachable
210 cf::object cf::object::player 307 cf::object cf::object::player
211 cf::client cf::player 308 cf::client cf::player
212 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
213 cf::map cf::party cf::region 311 cf::party cf::region
214)) { 312)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 314}
218 315
219$Event::DIED = sub { 316$EV::DIED = sub {
220 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
221}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
222 324
223############################################################################# 325#############################################################################
224 326
225=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
226 328
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 350 $d
249 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
250} 352}
251 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
252=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
253 369
254Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
255 371
256=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
257 373
258Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
259 375
260=cut 376=cut
261 377
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 379
264sub to_json ($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
266 444
267=item cf::lock_wait $string 445=item cf::lock_wait $string
268 446
269Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
270 448
271=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
272 450
273Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
276returned. 454returned.
277 455
278Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 457deadlocked coro.
285 463
286Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
287 465
288=cut 466=cut
289 467
290our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 469
293sub lock_wait($) { 470sub lock_wait($) {
294 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 472}
307 473
308sub lock_acquire($) { 474sub lock_acquire($) {
309 my ($key) = @_; 475 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 476}
323 477
324sub lock_active($) { 478sub lock_active($) {
325 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 480}
329 481
330sub freeze_mainloop { 482sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
332 484
333 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 486}
335 }; 487
336 $TICK_WATCHER->stop; 488=item cf::periodic $interval, $cb
337 $guard 489
490Like EV::periodic, but randomly selects a starting point so that the actions
491get spread over time.
492
493=cut
494
495sub periodic($$) {
496 my ($interval, $cb) = @_;
497
498 my $start = rand List::Util::min 180, $interval;
499
500 EV::periodic $start, $interval, 0, $cb
338} 501}
339 502
340=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
341 504
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
343This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
344of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
345 512
346The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
347used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
348 515
349Useful for short background jobs. 516Useful for short background jobs.
350 517
351=cut 518=cut
352 519
353our @SLOT_QUEUE; 520our @SLOT_QUEUE;
354our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
355 523
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
358 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
359 530
360 while () { 531 while () {
361 next_job: 532 next_job:
533
362 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
363 if ($avail > 0.01) { 535
364 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
366 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send; 540 $job->[2]->send;
368 Coro::cede; 541 Coro::cede;
369 goto next_job; 542 goto next_job;
370 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
371 } 545 }
372 } 546 }
373 547
374 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 551 $signal->wait;
378 } else { 552 } else {
553 $busy = 0;
379 Coro::schedule; 554 Coro::schedule;
380 } 555 }
381 } 556 }
382}; 557};
383 558
384sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
385 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
386 563
387 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
388 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
389 567
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
403 581
404BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
405 583
406=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
407 585
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 589acceptable.
412 590
413If it must be done, put the blocking parts into C<sync_job>. This will run 591If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
418=cut 596=cut
419 597
420sub sync_job(&) { 598sub sync_job(&) {
421 my ($job) = @_; 599 my ($job) = @_;
422 600
423 if ($Coro::current == $Coro::main) { 601 if (in_main) {
424 my $time = Event::time; 602 my $time = AE::time;
425 603
426 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
428 606
429 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 608
431 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
432 610
433 my $busy = 1; 611 my $busy = 1;
434 my @res; 612 my @res;
435 613
436 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 616 @res = eval { $job->() };
438 warn $@ if $@; 617 error $@ if $@;
439 undef $busy; 618 undef $busy;
440 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
441 620
442 while ($busy) { 621 while ($busy) {
443 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
444 } 626 }
627 }
445 628
446 $time = Event::time - $time; 629 my $time = AE::time - $time;
447 630
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
452 632
453 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
454 } else { 634 } else {
455 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
456 636
476 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
477 657
478 $coro 658 $coro
479} 659}
480 660
481=item fork_call { }, $args 661=item fork_call { }, @args
482 662
483Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
487 667
488=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
489 673
490sub fork_call(&@) { 674sub fork_call(&@) {
491 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
492 676
493 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
494 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
495 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
496 680
497 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
498 reset_signals; 682 cf::post_fork;
499 &$cb 683 &$cb
500 }, @args; 684 } @args;
501 685
502 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
698}
699
700=item $coin = coin_from_name $name
701
702=cut
703
704our %coin_alias = (
705 "silver" => "silvercoin",
706 "silvercoin" => "silvercoin",
707 "silvercoins" => "silvercoin",
708 "gold" => "goldcoin",
709 "goldcoin" => "goldcoin",
710 "goldcoins" => "goldcoin",
711 "platinum" => "platinacoin",
712 "platinumcoin" => "platinacoin",
713 "platinumcoins" => "platinacoin",
714 "platina" => "platinacoin",
715 "platinacoin" => "platinacoin",
716 "platinacoins" => "platinacoin",
717 "royalty" => "royalty",
718 "royalties" => "royalty",
719);
720
721sub coin_from_name($) {
722 $coin_alias{$_[0]}
723 ? cf::arch::find $coin_alias{$_[0]}
724 : undef
503} 725}
504 726
505=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
506 728
507Returns a single value from the environment database. 729Returns a single value from the environment database.
517within each server. 739within each server.
518 740
519=cut 741=cut
520 742
521sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
522 my ($name) = @_; 747 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
524 749
525 eval { 750 eval {
526 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
536} 761}
537 762
538our $DB; 763our $DB;
539 764
540sub db_init { 765sub db_init {
541 cf::sync_job {
542 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
543 };
544} 767}
545 768
546sub db_get($$) { 769sub db_get($$) {
547 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
548 771
549 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
550 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
551 776
552 $! ? () 777 $! ? ()
553 : $data 778 : $data
554 }
555} 779}
556 780
557sub db_put($$$) { 781sub db_put($$$) {
558 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
559 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
587 811
588 my @data; 812 my @data;
589 my $md5; 813 my $md5;
590 814
591 for (0 .. $#$src) { 815 for (0 .. $#$src) {
592 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
593 or Carp::croak "$src->[$_]: $!";
594 } 817 }
595 818
596 # if processing is expensive, check 819 # if processing is expensive, check
597 # checksum first 820 # checksum first
598 if (1) { 821 if (1) {
615 838
616 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
617 my $data = $process->(\@data); 840 my $data = $process->(\@data);
618 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
619 842
620 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
621 844
622 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
623 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
624 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
625 848
635 858
636=cut 859=cut
637 860
638sub datalog($@) { 861sub datalog($@) {
639 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
640 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
641} 864}
642 865
643=back 866=back
644 867
645=cut 868=cut
646 869
647############################################################################# 870#############################################################################
648 871
649=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
650 873
651Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
654 877
655In the following description, CLASS can be any of C<global>, C<object> 878In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 879C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 880Deliantra).
658 881
659=over 4 882=over 4
660 883
661=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
662 885
706=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
707 930
708Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
710 933
711Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
713 936
714These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
715 938
716=over 4 939=over 4
840 1063
841 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
842 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
843 1066
844 } elsif (ref $type) { 1067 } elsif (ref $type) {
845 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
846 1069
847 } else { 1070 } else {
848 shift @arg; 1071 shift @arg;
849 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
850 } 1073 }
851 } 1074 }
852} 1075}
853 1076
854sub _object_attach { 1077sub _object_attach {
864 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
865 } 1088 }
866 1089
867 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
868 } else { 1091 } else {
869 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
870 } 1093 }
871 1094
872 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
873} 1096}
874 1097
933 1156
934 for (@$callbacks) { 1157 for (@$callbacks) {
935 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
936 1159
937 if ($@) { 1160 if ($@) {
938 warn "$@";
939 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
940 override; 1162 override;
941 } 1163 }
942 1164
943 return 1 if $override; 1165 return 1 if $override;
944 } 1166 }
945 1167
946 0 1168 0
947} 1169}
948 1170
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1172
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1174
953Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
954 1176
960 1182
961=cut 1183=cut
962 1184
963############################################################################# 1185#############################################################################
964# object support 1186# object support
965#
966 1187
1188sub _object_equal($$);
1189sub _object_equal($$) {
1190 my ($a, $b) = @_;
1191
1192 return 0 unless (ref $a) eq (ref $b);
1193
1194 if ("HASH" eq ref $a) {
1195 my @ka = keys %$a;
1196 my @kb = keys %$b;
1197
1198 return 0 if @ka != @kb;
1199
1200 for (0 .. $#ka) {
1201 return 0 unless $ka[$_] eq $kb[$_];
1202 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1203 }
1204
1205 } elsif ("ARRAY" eq ref $a) {
1206
1207 return 0 if @$a != @$b;
1208
1209 for (0 .. $#$a) {
1210 return 0 unless _object_equal $a->[$_], $b->[$_];
1211 }
1212
1213 } elsif ($a ne $b) {
1214 return 0;
1215 }
1216
1217 1
1218}
1219
1220our $SLOW_MERGES;#d#
967sub _can_merge { 1221sub _can_merge {
968 my ($ob1, $ob2) = @_; 1222 my ($ob1, $ob2) = @_;
969 1223
970 local $Storable::canonical = 1; 1224 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1225
974 $fob1 eq $fob2 1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
975} 1228}
976 1229
977sub reattach { 1230sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1232 my ($obj) = @_;
980 1233
1234 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1236
983 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
984 1238
985 @$registry = (); 1239 @$registry = ();
986 1240
991 for (@$attach) { 1245 for (@$attach) {
992 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
993 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
994 } 1248 }
995 } else { 1249 } else {
996 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
997 } 1251 }
998 } 1252 }
999} 1253}
1000 1254
1001cf::attachable->attach ( 1255cf::attachable->attach (
1002 prio => -1000000, 1256 prio => -1000000,
1003 on_instantiate => sub { 1257 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
1005 1259
1006 $data = from_json $data; 1260 $data = decode_json $data;
1007 1261
1008 for (@$data) { 1262 for (@$data) {
1009 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
1010 1264
1011 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1025); 1279);
1026 1280
1027sub object_freezer_save { 1281sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1029 1283
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1284 sync_job {
1033 if (length $$rdata) { 1285 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1037 1290
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
1042 close $fh; 1298 aio_close $fh;
1043 1299
1044 if (@$objs) { 1300 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
1050 close $fh; 1309 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1311 }
1053 } else { 1312 } else {
1054 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1055 } 1314 }
1056 1315
1057 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1320 } else {
1059 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1060 } 1322 }
1061 } else { 1323 } else {
1062 aio_unlink $filename; 1324 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1064 } 1326 }
1065 }; 1327 };
1066
1067 undef $guard;
1068} 1328}
1069 1329
1070sub object_freezer_as_string { 1330sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
1072 1332
1077 1337
1078sub object_thawer_load { 1338sub object_thawer_load {
1079 my ($filename) = @_; 1339 my ($filename) = @_;
1080 1340
1081 my ($data, $av); 1341 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1342
1085 (aio_load $filename, $data) >= 0 1343 (aio_load $filename, $data) >= 0
1086 or return; 1344 or return;
1087 1345
1088 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1348 or return;
1091 1349
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1094 } 1352 }
1095 1353
1096 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1099 1358
1100 ($data, $av) 1359 ($data, $av)
1101} 1360}
1102 1361
1103=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1159 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1160 1419
1161 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1162} 1421}
1163 1422
1423use File::Glob ();
1424
1164cf::player->attach ( 1425cf::player->attach (
1165 on_command => sub { 1426 on_unknown_command => sub {
1166 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1167 1428
1168 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1169 or return; 1430 or return;
1170 1431
1193 1454
1194 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1195 if $reply; 1456 if $reply;
1196 1457
1197 } else { 1458 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1460 }
1200 1461
1201 cf::override; 1462 cf::override;
1202 }, 1463 },
1203); 1464);
1204 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1205sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1206 cf::sync_job { 1482 cf::sync_job {
1207 my %todo; 1483 my %todo;
1208 1484
1209 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1210 next unless -r $path; 1486 next unless -r $path;
1228 1504
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1507
1232 $ext{source} = 1508 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1234 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1235 . $source 1511 . $source
1236 . "\n};\n1"; 1512 . "\n};\n1";
1237 1513
1238 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1239 } 1515 }
1240 1516
1517 my $pass = 0;
1241 my %done; 1518 my %done;
1242 while (%todo) { 1519 while (%todo) {
1243 my $progress; 1520 my $progress;
1244 1521
1522 ++$pass;
1523
1524 ext:
1245 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1527 next ext
1248 unless exists $done{$_}; 1528 unless exists $done{$_};
1249 } 1529 }
1250 1530
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1532
1253 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n";
1256 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1258 warn $msg; 1540
1259 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1260 exit 1; 1542 delete $todo{$k};
1261 } 1543 } else {
1262 1544 $done{$k} = delete $todo{$k};
1263 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1264 } 1550 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1551 }
1270 1552
1271 skip: 1553 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1274 } 1563 }
1275 }; 1564 };
1276} 1565}
1277 1566
1278############################################################################# 1567#############################################################################
1279 1568
1280=back 1569=back
1281 1570
1282=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1283 1572
1284Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1285 1574
1286=cut 1575=cut
1287 1576
1288package cf::player; 1577package cf::player;
1289 1578
1332 1621
1333sub exists($) { 1622sub exists($) {
1334 my ($login) = @_; 1623 my ($login) = @_;
1335 1624
1336 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1338} 1627}
1339 1628
1340sub find($) { 1629sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1631 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1642
1354 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1644 or return;
1356 1645
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1359 or return; 1647 or return;
1648
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1363 } 1652 }
1364 } 1653 }
1365} 1654}
1366 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1367sub save($) { 1669sub save($) {
1368 my ($pl) = @_; 1670 my ($pl) = @_;
1369 1671
1370 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1371 1673
1374 1676
1375 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1376 1678
1377 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379 1686
1380 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1688 cf::cede_to_tick;
1382} 1689}
1383 1690
1415 my ($pl) = @_; 1722 my ($pl) = @_;
1416 1723
1417 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1418 1725
1419 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1728
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1423 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1425 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1426 1737
1427 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1429 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1467 1778
1468 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1469 my $path = path $login; 1780 my $path = path $login;
1470 1781
1471 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1788 }
1477 1789
1481 1793
1482 \@logins 1794 \@logins
1483} 1795}
1484 1796
1485=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1486 1800
1487Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1488player. May block. 1802player. May block.
1489 1803
1490=cut 1804=cut
1508 } 1822 }
1509 1823
1510 \@paths 1824 \@paths
1511} 1825}
1512 1826
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1828
1515Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1830
1564=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1565 1832
1566Sends an ext reply to the player. 1833Sends an ext reply to the player.
1567 1834
1599 1866
1600=cut 1867=cut
1601 1868
1602sub find_by_path($) { 1869sub find_by_path($) {
1603 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1604 1873
1605 my ($match, $specificity); 1874 my ($match, $specificity);
1606 1875
1607 for my $region (list) { 1876 for my $region (list) {
1608 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1634our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1636 1905
1637sub generate_random_map { 1906sub generate_random_map {
1638 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1639 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1640 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1648 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1649 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1650 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1651 (cf::region::find $rmp->{region}), $rmp->{custom}
1652 )
1653} 1912}
1654 1913
1655=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1656 1915
1657Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1662 1921
1663sub register { 1922sub register {
1664 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1665 my $pkg = caller; 1924 my $pkg = caller;
1666 1925
1667 no strict;
1668 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1669 1927
1670 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1671} 1929}
1672 1930
1673# also paths starting with '/' 1931# also paths starting with '/'
1674$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1675 1933
1676sub thawer_merge { 1934sub thawer_merge {
1677 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1678 1936
1679 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1684} 1942}
1685 1943
1686sub normalise { 1944sub normalise {
1687 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1688 1946
1689 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1690 1948
1691 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1692 1950
1693 # map plan: 1951 # map plan:
1694 # 1952 #
1696 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1697 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1698 # ?random/... random maps 1956 # ?random/... random maps
1699 # /... normal maps 1957 # /... normal maps
1700 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1701 1960
1702 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1703 1962
1704 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1705 # something that looks reasonable 1964 # something that looks reasonable
1706 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1707 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1708 1967
1709 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1710 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1711 } 1984 }
1712 1985
1713 for ($path) { 1986 for ($path) {
1714 redo if s{//}{/};
1715 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1716 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1717 } 1989 }
1718 1990
1719 $path 1991 $path
1733 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1734 return $self; 2006 return $self;
1735 } 2007 }
1736 } 2008 }
1737 2009
1738 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1739 () 2011 ()
1740} 2012}
1741 2013
2014# may re-bless or do other evil things
1742sub init { 2015sub init {
1743 my ($self) = @_; 2016 my ($self) = @_;
1744 2017
1745 $self 2018 $self
1746} 2019}
1765 2038
1766# the temporary/swap location 2039# the temporary/swap location
1767sub save_path { 2040sub save_path {
1768 my ($self) = @_; 2041 my ($self) = @_;
1769 2042
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1772} 2045}
1773 2046
1774# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1775sub uniq_path { 2048sub uniq_path {
1776 my ($self) = @_; 2049 my ($self) = @_;
1777 2050
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 2053}
1790 2054
1791sub decay_objects { 2055sub decay_objects {
1792 my ($self) = @_; 2056 my ($self) = @_;
1793 2057
1875 2139
1876sub find; 2140sub find;
1877sub find { 2141sub find {
1878 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1879 2143
2144 cf::cede_to_tick;
2145
1880 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1881 2147
1882 cf::lock_wait "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2150
1885 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2152 my $map = new_from_path cf::map $path
1890 or return; 2153 or return;
1891 2154
1892 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
1893 2156
1895 or return; 2158 or return;
1896 2159
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2160 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2161 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2162 #$cf::WAIT_FOR_TICK->wait;
2163 undef $guard2;
1900 undef $guard1; 2164 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2165 $map->reset;
1903 return find $path; 2166 return find $path;
1904 } 2167 }
1905 2168
1906 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1907 } 2170 }
1908} 2171}
1909 2172
1910sub pre_load { } 2173sub pre_load { }
1911sub post_load { } 2174#sub post_load { } # XS
1912 2175
1913sub load { 2176sub load {
1914 my ($self) = @_; 2177 my ($self) = @_;
1915 2178
1916 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
1928 $self->alloc; 2191 $self->alloc;
1929 2192
1930 $self->pre_load; 2193 $self->pre_load;
1931 cf::cede_to_tick; 2194 cf::cede_to_tick;
1932 2195
2196 if (exists $self->{load_path}) {
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2198 $f->skip_block;
1935 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
1936 or return; 2200 or return;
1937 2201
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2202 $self->post_load_original
1939 if delete $self->{load_original}; 2203 if delete $self->{load_original};
1940 2204
1941 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2206 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
1945 $self->clear_unique_items; 2209 $self->clear_unique_items;
1946 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
1948 } 2213 }
1949 } 2214 }
1950 }
1951 2215
1952 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
1953 2218
1954 cf::cede_to_tick; 2219 cf::cede_to_tick;
1955 # now do the right thing for maps 2220 # now do the right thing for maps
1956 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
1957 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
1961 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2227 $self->decay_objects;
1963 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
1964 $self->update_buttons; 2229 $self->update_buttons;
1965 cf::cede_to_tick; 2230 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2231 $self->activate;
1969 } 2232 }
1970 2233
1971 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
1973 2236
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2237 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2238 }
1976 2239
1977 $self->post_load; 2240 $self->post_load;
1978}
1979 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
1980sub customise_for { 2248sub customise_for {
1981 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
1982 2250
1983 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2252 if $self->per_player;
2000 or next; 2268 or next;
2001 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2002 or next; 2270 or next;
2003 $neigh->load; 2271 $neigh->load;
2004 2272
2273 # now find the diagonal neighbours
2005 push @neigh, 2274 push @neigh,
2006 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2007 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2008 } 2277 }
2009 2278
2016} 2285}
2017 2286
2018sub find_sync { 2287sub find_sync {
2019 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2020 2289
2021 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2022} 2294}
2023 2295
2024sub do_load_sync { 2296sub do_load_sync {
2025 my ($map) = @_; 2297 my ($map) = @_;
2026 2298
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2029 2301
2030 cf::sync_job { $map->load }; 2302 $map->load;
2031} 2303}
2032 2304
2033our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2034our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2035 2307
2036sub find_async { 2308sub find_async {
2037 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2038 2310
2039 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2040 2312
2041 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2315 }
2044 2316
2045 $MAP_PREFETCH{$path} |= $load; 2317 $MAP_PREFETCH{$path} |= $load;
2046 2318
2047 $MAP_PREFETCHER ||= cf::async { 2319 $MAP_PREFETCHER ||= cf::async {
2320 $Coro::current->{desc} = "map prefetcher";
2321
2048 while (%MAP_PREFETCH) { 2322 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2323 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2324 if (my $map = find $k) {
2051 $map->load if $v; 2325 $map->load if $v;
2052 } 2326 }
2059 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2060 2334
2061 () 2335 ()
2062} 2336}
2063 2337
2338# common code, used by both ->save and ->swapout
2064sub save { 2339sub _save {
2065 my ($self) = @_; 2340 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2341
2069 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2070 2343
2071 return unless $self->dirty; 2344 return unless $self->dirty;
2072 2345
2078 return if $self->{deny_save}; 2351 return if $self->{deny_save};
2079 2352
2080 local $self->{last_access} = $self->last_access;#d# 2353 local $self->{last_access} = $self->last_access;#d#
2081 2354
2082 cf::async { 2355 cf::async {
2356 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2357 $_->contr->save for $self->players;
2084 }; 2358 };
2359
2360 cf::get_slot 0.02;
2085 2361
2086 if ($uniq) { 2362 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2363 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2364 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2365 } else {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091 } 2367 }
2092} 2368}
2093 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2094sub swap_out { 2378sub swap_out {
2095 my ($self) = @_; 2379 my ($self) = @_;
2096 2380
2097 # save first because save cedes
2098 $self->save;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2382
2383 return if $self->in_memory != cf::MAP_ACTIVE;
2384 return if $self->{deny_save};
2102 return if $self->players; 2385 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2104 return if $self->{deny_save};
2105 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2106 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2107 2437
2108 $self->deactivate; 2438 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2110 $self->clear; 2440 $self->clear;
2111}
2112
2113sub reset_at {
2114 my ($self) = @_;
2115
2116 # TODO: safety, remove and allow resettable per-player maps
2117 return 1e99 if $self->{deny_reset};
2118
2119 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2120 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2121
2122 $time + $to
2123}
2124
2125sub should_reset {
2126 my ($self) = @_;
2127
2128 $self->reset_at <= $cf::RUNTIME
2129}
2130
2131sub reset {
2132 my ($self) = @_;
2133
2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135
2136 return if $self->players;
2137
2138 warn "resetting map ", $self->path;
2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 # need to save uniques path
2143 unless ($self->{deny_save}) {
2144 my $uniq = $self->uniq_path; utf8::encode $uniq;
2145
2146 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2147 if $uniq;
2148 }
2149
2150 delete $cf::MAP{$self->path};
2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2154 $self->clear;
2155 2441
2156 $self->unlink_save; 2442 $self->unlink_save;
2157 $self->destroy; 2443 $self->destroy;
2158} 2444}
2159 2445
2167 2453
2168 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2169 2455
2170 $self->unlink_save; 2456 $self->unlink_save;
2171 2457
2172 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2173 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2174 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2175 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2177 2463
2226 2512
2227sub unique_maps() { 2513sub unique_maps() {
2228 [ 2514 [
2229 map { 2515 map {
2230 utf8::decode $_; 2516 utf8::decode $_;
2231 /\.map$/ 2517 s/\.map$//; # TODO future compatibility hack
2518 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2519 ? ()
2232 ? normalise $_ 2520 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2522 ]
2236} 2523}
2237 2524
2238package cf; 2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2239 2556
2240=back 2557=back
2241 2558
2242=head3 cf::object 2559=head3 cf::object
2243 2560
2247 2564
2248=over 4 2565=over 4
2249 2566
2250=item $ob->inv_recursive 2567=item $ob->inv_recursive
2251 2568
2252Returns the inventory of the object _and_ their inventories, recursively. 2569Returns the inventory of the object I<and> their inventories, recursively,
2570but I<not> the object itself.
2253 2571
2254=cut 2572=cut
2255 2573
2256sub inv_recursive_; 2574sub inv_recursive_;
2257sub inv_recursive_ { 2575sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2580 inv_recursive_ inv $_[0]
2263} 2581}
2264 2582
2265=item $ref = $ob->ref 2583=item $ref = $ob->ref
2266 2584
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2585Creates and returns a persistent reference to an object that can be stored as a string.
2268 2586
2269=item $ob = cf::object::deref ($refstring) 2587=item $ob = cf::object::deref ($refstring)
2270 2588
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2589returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2590even if the object actually exists. May block.
2274=cut 2592=cut
2275 2593
2276sub deref { 2594sub deref {
2277 my ($ref) = @_; 2595 my ($ref) = @_;
2278 2596
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2597 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2598 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2599 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2600 or return;
2286 $pl->ob->uuid eq $uuid 2601 $pl->ob->uuid eq $uuid
2287 or return; 2602 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2622can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2623dialogue with the given NPC character.
2309 2624
2310=cut 2625=cut
2311 2626
2627our $SAY_CHANNEL = {
2628 id => "say",
2629 title => "Map",
2630 reply => "say ",
2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2632};
2633
2634our $CHAT_CHANNEL = {
2635 id => "chat",
2636 title => "Chat",
2637 reply => "chat ",
2638 tooltip => "Player chat and shouts, global to the server.",
2639};
2640
2312# rough implementation of a future "reply" method that works 2641# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2642# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2643#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2644sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2645 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2656 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2657 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2658
2330 } else { 2659 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2660 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2661 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2662 }
2334 } 2663 }
2335} 2664}
2336 2665
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2666=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2691
2363=item $player_object->enter_link 2692=item $player_object->enter_link
2364 2693
2365Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2366 2695
2367The player should be reasonably safe there for short amounts of time. You 2696The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2698though, as the player cannot control the character while it is on the link
2699map.
2369 2700
2370Will never block. 2701Will never block.
2371 2702
2372=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2373 2704
2393sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2394 my ($self) = @_; 2725 my ($self) = @_;
2395 2726
2396 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2397 2728
2729 ++$self->{_link_recursion};
2730
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2732
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2402 2735
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2737}
2405 2738
2406sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2408 2741
2425 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2427 2760
2428 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2431 2764
2432 $map->load; 2765 $map->load;
2433 $map->load_neighbours; 2766 $map->load_neighbours;
2434 2767
2435 return unless $self->contr->active; 2768 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2769
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2440} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2441 2777
2778}
2779
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2443 2781
2444Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2785the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2786be called at the end of this process.
2449 2787
2788Note that $check will be called with a potentially non-loaded map, so if
2789it needs a loaded map it has to call C<< ->load >>.
2790
2450=cut 2791=cut
2451 2792
2452our $GOTOGEN; 2793our $GOTOGEN;
2453 2794
2454sub cf::object::player::goto { 2795sub cf::object::player::goto {
2455 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2456 2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2803
2457 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2806
2460 $self->enter_link; 2807 $self->enter_link;
2461 2808
2462 (async { 2809 (async {
2810 $Coro::current->{desc} = "player::goto $path $x $y";
2811
2463 # *tag paths override both path and x|y 2812 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2813 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2814 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2815 my $ob = $obs[rand @obs];
2467 2816
2468 # see if we actually can go there 2817 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2818 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2819 $ob = $obs[rand @obs];
2820 } else {
2821 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2822 }
2823 # else put us there anyways for now #d#
2471 2824
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2825 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2826 } else {
2827 ($path, $x, $y) = (undef, undef, undef);
2473 } 2828 }
2474 } 2829 }
2475 2830
2476 my $map = eval { 2831 my $map = eval {
2477 my $map = cf::map::find $path; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2478 2833
2479 if ($map) { 2834 if ($map) {
2480 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2482 } else { 2837 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2839 }
2485 2840
2486 $map 2841 $map
2487 }; 2842 };
2488 2843
2494 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2495 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2496 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2497 } 2852 }
2498 2853
2499 $done->() if $done; 2854 $done->($self) if $done;
2500 })->prio (1); 2855 })->prio (1);
2501} 2856}
2502 2857
2503=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2504 2859
2524} 2879}
2525 2880
2526sub prepare_random_map { 2881sub prepare_random_map {
2527 my ($exit) = @_; 2882 my ($exit) = @_;
2528 2883
2529 my $guard = cf::lock_acquire "exit_prepare:$exit";
2530
2531 # all this does is basically replace the /! path by 2884 # all this does is basically replace the /! path by
2532 # a new random map path (?random/...) with a seed 2885 # a new random map path (?random/...) with a seed
2533 # that depends on the exit object 2886 # that depends on the exit object
2534 2887
2535 my $rmp = parse_random_map_params $exit->msg; 2888 my $rmp = parse_random_map_params $exit->msg;
2537 if ($exit->map) { 2890 if ($exit->map) {
2538 $rmp->{region} = $exit->region->name; 2891 $rmp->{region} = $exit->region->name;
2539 $rmp->{origin_map} = $exit->map->path; 2892 $rmp->{origin_map} = $exit->map->path;
2540 $rmp->{origin_x} = $exit->x; 2893 $rmp->{origin_x} = $exit->x;
2541 $rmp->{origin_y} = $exit->y; 2894 $rmp->{origin_y} = $exit->y;
2895
2896 $exit->map->touch;
2542 } 2897 }
2543 2898
2544 $rmp->{random_seed} ||= $exit->random_seed; 2899 $rmp->{random_seed} ||= $exit->random_seed;
2545 2900
2546 my $data = cf::to_json $rmp; 2901 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2547 my $md5 = Digest::MD5::md5_hex $data; 2902 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta"; 2903 my $meta = "$RANDOMDIR/$md5.meta";
2549 2904
2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2905 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2551 aio_write $fh, 0, (length $data), $data, 0; 2906 aio_write $fh, 0, (length $data), $data, 0;
2552 undef $fh; 2907 undef $fh;
2553 aio_rename "$meta~", $meta; 2908 aio_rename "$meta~", $meta;
2554 2909
2910 my $slaying = "?random/$md5";
2911
2912 if ($exit->valid) {
2555 $exit->slaying ("?random/$md5"); 2913 $exit->slaying ("?random/$md5");
2556 $exit->msg (undef); 2914 $exit->msg (undef);
2915 }
2557 } 2916 }
2558} 2917}
2559 2918
2560sub cf::object::player::enter_exit { 2919sub cf::object::player::enter_exit {
2561 my ($self, $exit) = @_; 2920 my ($self, $exit) = @_;
2562 2921
2563 return unless $self->type == cf::PLAYER; 2922 return unless $self->type == cf::PLAYER;
2564 2923
2565 if ($exit->slaying eq "/!") {
2566 #TODO: this should de-fi-ni-te-ly not be a sync-job
2567 # the problem is that $exit might not survive long enough
2568 # so it needs to be done right now, right here
2569 cf::sync_job { prepare_random_map $exit };
2570 }
2571
2572 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2573 my $hp = $exit->stats->hp;
2574 my $sp = $exit->stats->sp;
2575
2576 $self->enter_link; 2924 $self->enter_link;
2577 2925
2578 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED);
2581
2582 (async { 2926 (async {
2583 $self->deactivate_recursive; # just to be sure 2927 $Coro::current->{desc} = "enter_exit";
2928
2584 unless (eval { 2929 unless (eval {
2930 $self->deactivate_recursive; # just to be sure
2931
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp;
2942 my $y = $exit->stats->sp;
2943
2585 $self->goto ($slaying, $hp, $sp); 2944 $self->goto ($map, $x, $y);
2586 2945
2946 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y)
2948 if $exit->flag (cf::FLAG_DAMNED);
2949
2587 1; 2950 1
2588 }) { 2951 }) {
2589 $self->message ("Something went wrong deep within the crossfire server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2590 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2591 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2592 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2593 2956
2594 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2595 $self->leave_link; 2958 $self->leave_link;
2596 } 2959 }
2597 })->prio (1); 2960 })->prio (1);
2598} 2961}
2599 2962
2611sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2612 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2613 2976
2614 utf8::encode $text; 2977 utf8::encode $text;
2615 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2616} 3004}
2617 3005
2618=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2619 3007
2620Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
2622the message, with C<log> being the default. If C<$color> is negative, suppress 3010the message, with C<log> being the default. If C<$color> is negative, suppress
2623the message unless the client supports the msg packet. 3011the message unless the client supports the msg packet.
2624 3012
2625=cut 3013=cut
2626 3014
3015# non-persistent channels (usually the info channel)
2627our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2628 "c/identify" => { 3023 "c/identify" => {
2629 id => "identify", 3024 id => "infobox",
2630 title => "Identify", 3025 title => "Identify",
2631 reply => undef, 3026 reply => undef,
2632 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
2633 }, 3028 },
2634 "c/examine" => { 3029 "c/examine" => {
2635 id => "examine", 3030 id => "infobox",
2636 title => "Examine", 3031 title => "Examine",
2637 reply => undef, 3032 reply => undef,
2638 tooltip => "Signs and other items you examined", 3033 tooltip => "Signs and other items you examined",
2639 }, 3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
3040 },
3041 "c/book" => {
3042 id => "infobox",
3043 title => "Book",
3044 reply => undef,
3045 tooltip => "The contents of a note or book",
3046 },
3047 "c/lookat" => {
3048 id => "infobox",
3049 title => "Look",
3050 reply => undef,
3051 tooltip => "What you saw there",
3052 },
3053 "c/who" => {
3054 id => "infobox",
3055 title => "Players",
3056 reply => undef,
3057 tooltip => "Shows players who are currently online",
3058 },
3059 "c/body" => {
3060 id => "infobox",
3061 title => "Body Parts",
3062 reply => undef,
3063 tooltip => "Shows which body parts you posess and are available",
3064 },
3065 "c/statistics" => {
3066 id => "infobox",
3067 title => "Statistics",
3068 reply => undef,
3069 tooltip => "Shows your primary statistics",
3070 },
3071 "c/skills" => {
3072 id => "infobox",
3073 title => "Skills",
3074 reply => undef,
3075 tooltip => "Shows your experience per skill and item power",
3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
3083 "c/resistances" => {
3084 id => "infobox",
3085 title => "Resistances",
3086 reply => undef,
3087 tooltip => "Shows your resistances",
3088 },
3089 "c/pets" => {
3090 id => "infobox",
3091 title => "Pets",
3092 reply => undef,
3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
3100 },
3101 "c/uptime" => {
3102 id => "infobox",
3103 title => "Uptime",
3104 reply => undef,
3105 tooltip => "How long the server has been running since last restart",
3106 },
3107 "c/mapinfo" => {
3108 id => "infobox",
3109 title => "Map Info",
3110 reply => undef,
3111 tooltip => "Information related to the maps",
3112 },
3113 "c/party" => {
3114 id => "party",
3115 title => "Party",
3116 reply => "gsay ",
3117 tooltip => "Messages and chat related to your party",
3118 },
3119 "c/death" => {
3120 id => "death",
3121 title => "Death",
3122 reply => undef,
3123 tooltip => "Reason for and more info about your most recent death",
3124 },
3125 "c/say" => $SAY_CHANNEL,
3126 "c/chat" => $CHAT_CHANNEL,
2640); 3127);
2641 3128
2642sub cf::client::send_msg { 3129sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2644 3131
2645 $msg = $self->pl->expand_cfpod ($msg); 3132 $msg = $self->pl->expand_cfpod ($msg)
3133 unless $color & cf::NDI_VERBATIM;
2646 3134
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 3135 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 3136
2649 # check predefined channels, for the benefit of C 3137 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3138 if ($CHANNEL{$channel}) {
3139 $channel = $CHANNEL{$channel};
2651 3140
3141 $self->ext_msg (channel_info => $channel);
3142 $channel = $channel->{id};
3143
2652 if (ref $channel) { 3144 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2657 if $self->can_msg;
2658 } 3149 }
2659 3150
2660 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2661 } 3152 }
2662 3153
2663 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2664 3155
2665 if ($self->can_msg) {
2666 # default colour, mask it out 3156 # default colour, mask it out
2667 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2668 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2669 3159
2670 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3160 my $pkt = "msg "
3161 . $self->{json_coder}->encode (
2671 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2672 } else { 3163 );
2673 if ($color >= 0) {
2674 # replace some tags by gcfclient-compatible ones
2675 for ($msg) {
2676 1 while
2677 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2678 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2679 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2680 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2681 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2682 }
2683 3164
2684 $color &= cf::NDI_COLOR_MASK; 3165 $self->send_big_packet ($pkt);
2685
2686 utf8::encode $msg;
2687
2688 if (0 && $msg =~ /\[/) {
2689 # COMMAND/INFO
2690 $self->send_packet ("drawextinfo $color 10 8 $msg")
2691 } else {
2692 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2693 $self->send_packet ("drawinfo $color $msg")
2694 }
2695 }
2696 }
2697} 3166}
2698 3167
2699=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2700 3169
2701Sends an ext event to the client. 3170Sends an ext event to the client.
2704 3173
2705sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2706 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2707 3176
2708 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2709 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2710 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2711 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2712 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2713 } 3182 }
2714} 3183}
2715 3184
2716=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2717 3186
2721 3190
2722sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2723 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2724 3193
2725 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2726 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2727 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2728 #TODO: version 1, remove 3197 #TODO: version 1, remove
2729 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 } 3200 }
2732} 3201}
2733 3202
2734=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2735 3204
2806 3275
2807 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
2808 if $reply; 3277 if $reply;
2809 3278
2810 } else { 3279 } else {
2811 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2812 } 3281 }
2813 3282
2814 cf::override; 3283 cf::override;
2815 }, 3284 },
2816); 3285);
2836 3305
2837 $coro 3306 $coro
2838} 3307}
2839 3308
2840cf::client->attach ( 3309cf::client->attach (
2841 on_destroy => sub { 3310 on_client_destroy => sub {
2842 my ($ns) = @_; 3311 my ($ns) = @_;
2843 3312
2844 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2845 }, 3314 },
2846); 3315);
2862our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
2863 3332
2864$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
2865 3334
2866$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
2867 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
2868 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
2869 sort time 3338 sort time
2870)); 3339));
2871 3340
2872# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
2874=pod 3343=pod
2875 3344
2876The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
2877 3346
2878 cf::object 3347 cf::object
2879 contr pay_amount pay_player map x y force_find force_add 3348 contr pay_amount pay_player map x y force_find force_add destroy
2880 insert remove name archname title slaying race decrease_ob_nr 3349 insert remove name archname title slaying race decrease split
3350 value
2881 3351
2882 cf::object::player 3352 cf::object::player
2883 player 3353 player
2884 3354
2885 cf::player 3355 cf::player
2890 3360
2891=cut 3361=cut
2892 3362
2893for ( 3363for (
2894 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3364 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2895 insert remove inv name archname title slaying race 3365 insert remove inv nrof name archname title slaying race
2896 decrease_ob_nr)], 3366 decrease split destroy change_exp value msg lore send_msg)],
2897 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
2899 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
2900) { 3370) {
2901 no strict 'refs';
2902 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
2903 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2904 for @funs; 3373 for @funs;
2905} 3374}
2906 3375
2921 3390
2922 my $qcode = $code; 3391 my $qcode = $code;
2923 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2924 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
2925 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
2926 local $_; 3398 local $_;
2927 local @safe::cf::_safe_eval_args = values %vars;
2928 3399
2929 my $eval = 3400 my $eval =
2930 "do {\n" 3401 "do {\n"
2931 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2932 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
2933 . $code 3404 . $code
2934 . "\n}" 3405 . "\n}"
2935 ; 3406 ;
2936 3407
3408 if ($CFG{safe_eval}) {
2937 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
2938 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2939 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
2940 3417
2941 if ($@) { 3418 if ($@) {
2942 warn "$@"; 3419 warn "$@",
2943 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
2944 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
2945 } 3422 }
2946 3423
2947 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
2948} 3425}
2949 3426
2963=cut 3440=cut
2964 3441
2965sub register_script_function { 3442sub register_script_function {
2966 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
2967 3444
2968 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
2969 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
2970} 3447}
2971 3448
2972=back 3449=back
2973 3450
2974=cut 3451=cut
2983 # for this (global event?) 3460 # for this (global event?)
2984 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
2985 3462
2986 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2987 3464
2988 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
2989 3466
2990 my $facedata; 3467 my $facedata = decode_storable load_file $path;
2991 0 < aio_load $path, $facedata
2992 or die "$path: $!";
2993
2994 $facedata = Coro::Storable::thaw $facedata;
2995 3468
2996 $facedata->{version} == 2 3469 $facedata->{version} == 2
2997 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
2998 3471
2999 # patch in the exptable 3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3000 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
3001 type => FT_RSRC, 3475 type => FT_RSRC,
3002 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3003 }; 3478 };
3004 cf::cede_to_tick; 3479 cf::cede_to_tick;
3005 3480
3006 { 3481 {
3007 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
3008 3483
3009 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
3010 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3486
3011 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3012 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3013 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3014 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3015 3492
3016 cf::cede_to_tick; 3493 cf::cede_to_tick;
3017 } 3494 }
3018 3495
3019 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
3020 next unless $info->{smooth}; 3497 next unless $info->{smooth};
3498
3021 my $idx = cf::face::find $face 3499 my $idx = cf::face::find $face
3022 or next; 3500 or next;
3501
3023 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else { 3505 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3028 } 3507 }
3029 3508
3030 cf::cede_to_tick; 3509 cf::cede_to_tick;
3031 } 3510 }
3032 } 3511 }
3041 3520
3042 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3043 } 3522 }
3044 3523
3045 { 3524 {
3046 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3049 3526
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3528 if (defined $info->{type}) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data;
3055 3530
3056 if ($info->{type} & 1) { 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3057 # prepend meta info 3532 cf::face::set_type $idx, $info->{type};
3058
3059 my $meta = $enc->encode ({
3060 name => $name,
3061 %{ $info->{meta} || {} },
3062 });
3063
3064 $data = pack "(w/a*)*", $meta, $info->{data};
3065 } else { 3533 } else {
3066 $data = $info->{data}; 3534 $RESOURCE{$name} = $info; # unused
3067 } 3535 }
3068 3536
3069 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3070 cf::face::set_type $idx, $info->{type};
3071
3072 cf::cede_to_tick; 3537 cf::cede_to_tick;
3073 } 3538 }
3074
3075 if ($soundconf) {
3076 $soundconf = $enc->decode (delete $soundconf->{data});
3077
3078 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3079 my $sound = $soundconf->{compat}[$_]
3080 or next;
3081
3082 my $face = cf::face::find "sound/$sound->[1]";
3083 cf::sound::set $sound->[0] => $face;
3084 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3085 }
3086
3087 while (my ($k, $v) = each %{$soundconf->{event}}) {
3088 my $face = cf::face::find "sound/$v";
3089 cf::sound::set $k => $face;
3090 }
3091 }
3092 } 3539 }
3540
3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3093 3542
3094 1 3543 1
3095} 3544}
3096 3545
3097register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3099 3548
3100 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3101 $ns->fx_want ($k, $v); 3550 $ns->fx_want ($k, $v);
3102 } 3551 }
3103}; 3552};
3553
3554sub load_resource_file($) {
3555 my $guard = lock_acquire "load_resource_file";
3556
3557 my $status = load_resource_file_ $_[0];
3558 get_slot 0.1, 100;
3559 cf::arch::commit_load;
3560
3561 $status
3562}
3104 3563
3105sub reload_regions { 3564sub reload_regions {
3106 # HACK to clear player env face cache, we need some signal framework 3565 # HACK to clear player env face cache, we need some signal framework
3107 # for this (global event?) 3566 # for this (global event?)
3108 %ext::player_env::MUSIC_FACE_CACHE = (); 3567 %ext::player_env::MUSIC_FACE_CACHE = ();
3122} 3581}
3123 3582
3124sub reload_archetypes { 3583sub reload_archetypes {
3125 load_resource_file "$DATADIR/archetypes" 3584 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n"; 3585 or die "unable to load archetypes\n";
3127 #d# NEED to laod twice to resolve forward references
3128 # this really needs to be done in an extra post-pass
3129 # (which needs to be synchronous, so solve it differently)
3130 load_resource_file "$DATADIR/archetypes"
3131 or die "unable to load archetypes\n";
3132} 3586}
3133 3587
3134sub reload_treasures { 3588sub reload_treasures {
3135 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3136 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3137} 3591}
3138 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3139sub reload_resources { 3613sub reload_resources {
3140 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3141 3615
3616 reload_exp_table;
3617 reload_materials;
3618 reload_facedata;
3619 reload_sound;
3620 reload_archetypes;
3142 reload_regions; 3621 reload_regions;
3143 reload_facedata;
3144 #reload_archetypes;#d#
3145 reload_archetypes;
3146 reload_treasures; 3622 reload_treasures;
3147 3623
3148 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3149}
3150
3151sub init {
3152 reload_resources;
3153} 3625}
3154 3626
3155sub reload_config { 3627sub reload_config {
3156 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3157 or return;
3158 3629
3159 local $/; 3630 my $config = load_file "$CONFDIR/config";
3160 *CFG = YAML::Syck::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3161 3633
3162 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3163 3635
3164 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3165 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3166 3638
3167 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3171 }; 3643 };
3172 warn $@ if $@; 3644 warn $@ if $@;
3173 } 3645 }
3174} 3646}
3175 3647
3648sub pidfile() {
3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3650 or die "$PIDFILE: $!";
3651 flock $fh, &Fcntl::LOCK_EX
3652 or die "$PIDFILE: flock: $!";
3653 $fh
3654}
3655
3656# make sure only one server instance is running at any one time
3657sub atomic {
3658 my $fh = pidfile;
3659
3660 my $pid = <$fh>;
3661 kill 9, $pid if $pid > 0;
3662
3663 seek $fh, 0, 0;
3664 print $fh $$;
3665}
3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
3176sub main { 3676sub main {
3677 cf::init_globals; # initialise logging
3678
3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3683
3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3685
3177 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3179 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3688 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3180 (async { 3689 (async {
3181 Event::one_event; 3690 $Coro::current->{desc} = "IDLE BUG HANDLER";
3691 EV::loop EV::LOOP_ONESHOT;
3182 })->prio (Coro::PRIO_MAX); 3692 })->prio (Coro::PRIO_MAX);
3183 }; 3693 };
3184 3694
3695 evthread_start IO::AIO::poll_fileno;
3696
3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3706 reload_resources;
3185 reload_config; 3707 reload_config;
3186 db_init; 3708 db_init;
3709
3710 cf::init_uuid;
3711 cf::init_signals;
3712 cf::init_skills;
3713
3714 cf::init_beforeplay;
3715
3716 atomic;
3717
3187 load_extensions; 3718 load_extensions;
3188 3719
3189 $TICK_WATCHER->start; 3720 utime time, time, $RUNTIMEFILE;
3190 Event::loop; 3721
3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3725
3726 cf::_post_init 0;
3727 };
3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3191} 3738}
3192 3739
3193############################################################################# 3740#############################################################################
3194# initialisation and cleanup 3741# initialisation and cleanup
3195 3742
3196# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3197BEGIN { 3744BEGIN {
3745 our %SIGWATCHER = ();
3198 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3199 Event->signal ( 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3200 reentrant => 0,
3201 data => WF_AUTOCANCEL,
3202 signal => $signal,
3203 prio => 0,
3204 cb => sub {
3205 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3206 },
3207 ); 3749 };
3208 } 3750 }
3209} 3751}
3210 3752
3211sub write_runtime { 3753sub write_runtime_sync {
3212 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3213 3755
3214 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3215 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3216 3758
3217 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3218 3760
3219 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3220 3762
3221 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3222 or return; 3764 or return;
3223 3765
3224 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3225 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3226 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3236 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3237 3779
3238 close $fh 3780 close $fh
3239 or return; 3781 or return;
3240 3782
3241 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3242 and return; 3784 and return;
3243 3785
3244 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3245 3787
3246 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 };
3247} 3839}
3248 3840
3249sub emergency_save() { 3841sub emergency_save() {
3250 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3251 3843
3252 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;
3253 3850
3254 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3255 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3256 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3257 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3259 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3860 $pl->valid or next;
3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3862 $pl->save;
3263 } 3863 }
3264 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3265 3865
3266 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";
3267 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3268 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3269 $map->valid or next; 3871 $map->valid or next;
3270 $map->save; 3872 $map->save;
3271 } 3873 }
3272 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3273 3875
3274 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";
3275 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3276 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::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3277 }; 3904 };
3278 3905
3279 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3280} 3907}
3281 3908
3282sub post_cleanup { 3909sub post_cleanup {
3283 my ($make_core) = @_; 3910 my ($make_core) = @_;
3284 3911
3912 IO::AIO::flush;
3913
3285 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3286 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 }
3287} 3944}
3288 3945
3289sub do_reload_perl() { 3946sub do_reload_perl() {
3290 # can/must only be called in main 3947 # can/must only be called in main
3291 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3292 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3293 return; 3950 return;
3294 } 3951 }
3295 3952
3296 warn "reloading..."; 3953 return if $RELOAD++;
3297 3954
3298 warn "entering sync_job"; 3955 my $t1 = AE::time;
3299 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
3300 cf::sync_job { 3963 cf::sync_job {
3301 cf::write_runtime; # external watchdog should not bark
3302 cf::emergency_save; 3964 #cf::emergency_save;
3303 cf::write_runtime; # external watchdog should not bark
3304 3965
3305 warn "syncing database to disk";
3306 BDB::db_env_txn_checkpoint $DB_ENV;
3307
3308 # if anything goes wrong in here, we should simply crash as we already saved
3309
3310 warn "cancelling all WF_AUTOCANCEL watchers";
3311 for (Event::all_watchers) {
3312 $_->cancel if $_->data & WF_AUTOCANCEL;
3313 }
3314
3315 warn "flushing outstanding aio requests";
3316 for (;;) {
3317 BDB::flush;
3318 IO::AIO::flush;
3319 Coro::cede;
3320 last unless IO::AIO::nreqs || BDB::nreqs;
3321 warn "iterate...";
3322 }
3323
3324 ++$RELOAD;
3325
3326 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3327 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3328 %EXT_CORO = (); 3968 %EXT_CORO = ();
3329 3969
3330 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3331 %COMMAND = (); 3971 %COMMAND = ();
3332 3972
3333 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3334 %EXTCMD = (); 3974 %EXTCMD = ();
3335 %EXTICMD = (); 3975 %EXTICMD = ();
3336 3976
3337 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3338 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3339 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3340 3980
3341 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3342 eval { 3982 eval {
3343 $cb->($pkg); 3983 $cb->($pkg);
3344 1 3984 1
3345 } 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;
3346 } 3990 }
3347 3991
3348 warn "... nuking $pkg";
3349 Symbol::delete_package $pkg;
3350 }
3351
3352 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3353 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3354 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3355 3995
3356 warn "... unloading $k"; 3996 trace "... unloading $k";
3357 delete $INC{$k}; 3997 delete $INC{$k};
3358 3998
3359 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3360 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3361 4001
3362 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3363 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3364 } 4007 }
3365 4008
3366 Symbol::delete_package $k;
3367 }
3368
3369 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3370 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3371 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);
3372 4012
3373 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3374 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3375 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3376 4016
3377 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3378 # and global variables created in xs 4018 # and global variables created in xs
3379 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3380 4020
3381 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3382 4022
3383 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3384 require cf; 4024 require cf;
3385 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3386 4026
3387 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3388 cf::reload_config; 4028 cf::reload_config;
3389 4029
3390 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3391 cf::load_extensions; 4031 cf::load_extensions;
3392 4032
4033 if ($REATTACH_ON_RELOAD) {
3393 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3394 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3395 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3396 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3397 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3398 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3399 4041
3400 warn "leaving sync_job"; 4042 cf::_post_init 1;
3401 4043
4044 trace "perl_reload: leaving sync_job";
4045
3402 1 4046 1
3403 } or do { 4047 } or do {
3404 warn $@; 4048 error $@;
3405 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3406 exit 1; 4050 };
4051
4052 --$RELOAD;
3407 }; 4053 }
3408 4054
3409 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3410}; 4057};
3411 4058
3412our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3413 4060
3414sub reload_perl() { 4061sub reload_perl() {
3415 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3417 4064
3418 $RELOAD_WATCHER ||= Event->timer ( 4065 $RELOAD_WATCHER ||= cf::async {
3419 reentrant => 0, 4066 Coro::AIO::aio_wait cache_extensions;
3420 after => 0, 4067
3421 data => WF_AUTOCANCEL, 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3422 cb => sub {
3423 do_reload_perl; 4069 do_reload_perl;
3424 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3425 }, 4071 };
3426 ); 4072 };
3427} 4073}
3428 4074
3429register_command "reload" => sub { 4075register_command "reload" => sub {
3430 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3431 4077
3432 if ($who->flag (FLAG_WIZ)) { 4078 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 4079 $who->message ("reloading server.");
4080 async {
4081 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 4082 reload_perl;
4083 };
3435 } 4084 }
3436}; 4085};
3437 4086
3438unshift @INC, $LIBDIR; 4087#############################################################################
3439 4088
3440my $bug_warning = 0; 4089my $bug_warning = 0;
3441 4090
3442our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3443our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3444 4093
3445sub wait_for_tick { 4094sub wait_for_tick() {
3446 return unless $TICK_WATCHER->is_active;
3447 return if $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3448 4096
3449 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3450 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3451 $signal->wait; 4099 $signal->wait;
3452} 4100}
3453 4101
3454sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3455 return unless $TICK_WATCHER->is_active;
3456 return if $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3457 4104
3458 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 4107 $signal->wait;
3461} 4108}
3462 4109
3463our $stat_fh; 4110sub tick {
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465
3466$TICK_WATCHER = Event->timer (
3467 reentrant => 0,
3468 parked => 1,
3469 prio => 0,
3470 at => $NEXT_TICK || $TICK,
3471 data => WF_AUTOCANCEL,
3472 cb => sub {
3473 if ($Coro::current != $Coro::main) { 4111 if ($Coro::current != $Coro::main) {
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4112 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 4113 unless ++$bug_warning > 10;
3476 return; 4114 return;
3477 } 4115 }
3478 4116
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time;
3482
3483 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3484 4118
3485 $RUNTIME += $TICK; 4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3486 $NEXT_TICK += $TICK;
3487 4120
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3490 Coro::async_pool { 4123 Coro::async_pool {
4124 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 4125 write_runtime_sync
3492 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3493 };
3494 } 4127 };
4128 }
3495 4129
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 4131 $sig->send;
3501 } 4132 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 4133 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 4134 $sig->send;
3504 } 4135 }
3505 4136
3506 $NOW = Event::time; 4137 $LOAD = ($NOW - $TICK_START) / $TICK;
3507
3508 # if we are delayed by four ticks or more, skip them all
3509 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3510
3511 $TICK_WATCHER->at ($NEXT_TICK);
3512 $TICK_WATCHER->start;
3513
3514 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 4139
3517 _post_tick; 4140 if (0) {
3518 4141 if ($NEXT_TICK) {
3519 # gather some statistics#d# 4142 my $jitter = $TICK_START - $NEXT_TICK;
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 4144 debug "jitter $JITTER\n";#d#
4145 }
3522 }, 4146 }
3523); 4147}
3524 4148
3525{ 4149{
4150 # configure BDB
4151
3526 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3527 BDB::max_poll_time $TICK * 0.1; 4153 BDB::max_poll_reqs $TICK * 0.1;
3528 $BDB_POLL_WATCHER = Event->io ( 4154 $AnyEvent::BDB::WATCHER->priority (1);
3529 reentrant => 0,
3530 fd => BDB::poll_fileno,
3531 poll => 'r',
3532 prio => 0,
3533 data => WF_AUTOCANCEL,
3534 cb => \&BDB::poll_cb,
3535 );
3536
3537 BDB::set_sync_prepare {
3538 my $status;
3539 my $current = $Coro::current;
3540 (
3541 sub {
3542 $status = $!;
3543 $current->ready; undef $current;
3544 },
3545 sub {
3546 Coro::schedule while defined $current;
3547 $! = $status;
3548 },
3549 )
3550 };
3551 4155
3552 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4159 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4160 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4161 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4162 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 4163
3555 cf::sync_job { 4164 cf::sync_job {
3556 eval { 4165 eval {
3557 BDB::db_env_open 4166 BDB::db_env_open
3558 $DB_ENV, 4167 $DB_ENV,
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4169 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4170 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 4171 0666;
3563 4172
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4173 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 4174 };
3570 4175
3571 cf::cleanup "db_env_open(db): $@" if $@; 4176 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 4177 };
3573 } 4178 }
3574 4179
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4180 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3576 after => 11, 4181 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 interval => 60, 4182 };
3578 hard => 1, 4183 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => sub {
3582 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4184 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3583 },
3584 ); 4185 };
3585 $BDB_TRICKLE_WATCHER = Event->timer ( 4186 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3586 after => 5,
3587 interval => 10,
3588 hard => 1,
3589 prio => 0,
3590 data => WF_AUTOCANCEL,
3591 cb => sub {
3592 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4187 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 ); 4188 };
3595} 4189}
3596 4190
3597{ 4191{
4192 # configure IO::AIO
4193
3598 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io ( 4196 undef $AnyEvent::AIO::WATCHER;
3603 reentrant => 0,
3604 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno,
3606 poll => 'r',
3607 prio => 6,
3608 cb => \&IO::AIO::poll_cb,
3609 );
3610} 4197}
3611 4198
3612my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3613 4201
3614sub _log_backtrace { 4202sub _log_backtrace {
3615 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3616 4204
3617 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3618 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3619 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3621 ++$_log_backtrace; 4213 ++$_log_backtrace;
4214 my $perl_bt = Carp::longmess $msg;
3622 async { 4215 async {
4216 $Coro::current->{desc} = "abt $msg";
4217
3623 my @bt = fork_call { 4218 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 4219 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4220 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4221 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3627 or die "addr2line: $!"; 4222 or die "addr2line: $!";
3635 } 4230 }
3636 4231
3637 @funcs 4232 @funcs
3638 }; 4233 };
3639 4234
3640 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $perl_bt\n";
4236 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3641 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3642 --$_log_backtrace; 4238 --$_log_backtrace;
3643 }; 4239 };
3644 } else { 4240 } else {
3645 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3646 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3647 } 4243 }
3648} 4244}
3649 4245
3650# load additional modules 4246# load additional modules
3651use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3652 4249
3653END { cf::emergency_save } 4250END { cf::emergency_save }
3654 4251
36551 42521
3656 4253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines