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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines