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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines