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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines