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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines