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.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 75
65$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" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
86our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
92our %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;
93 120
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 123our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
99 125
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 129our $DB_ENV;
105 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
106our %CFG; 133our %CFG;
107 134
108our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 136our $RUNTIME;
110our $NOW; 137our $NOW;
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 148our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
123 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 :)
155
124binmode STDOUT; 156binmode STDOUT;
125binmode STDERR; 157binmode STDERR;
126 158
127# read virtual server time, if available 159# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
132} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
133 167
134mkdir $_ 168mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 170
137our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
138 172
139sub 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::"} };
140 189
141############################################################################# 190#############################################################################
142 191
143=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
144 193
… …
186from wherever your confdir points to. 235from wherever your confdir points to.
187 236
188=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
189 238
190These 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
191returns 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
192per 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.
193 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
194=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
195 249
196This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 252that call.
199 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
200=back 260=back
201 261
202=cut 262=cut
203 263
204BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
205 *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 {
206 my $msg = join "", @_; 271 my $msg = join "", @_;
207 272
208 $msg .= "\n" 273 $msg .= "\n"
209 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
210 275
211 $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;
212 277
213 LOG llevError, $msg; 278 LOG llevWarn, $msg;
214 }; 279};
215}
216 280
217$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
219 283
220 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 288 return;#d#
223 }#d# 289 }#d#
224 290
225 # kill coroutine otherwise 291 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 292 Coro::terminate
228}; 293};
229
230$SIG{__DIE__} = sub { }; #d#?
231 294
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
242for my $pkg (qw( 305for my $pkg (qw(
243 cf::global cf::attachable 306 cf::global cf::attachable
244 cf::object cf::object::player 307 cf::object cf::object::player
245 cf::client cf::player 308 cf::client cf::player
246 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
247 cf::map cf::party cf::region 311 cf::party cf::region
248)) { 312)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 314}
252 315
253$EV::DIED = sub { 316$EV::DIED = sub {
254 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
255}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
256 324
257############################################################################# 325#############################################################################
258 326
259=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
260 328
… …
281 $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;
282 $d 350 $d
283 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
284} 352}
285 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
286=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
287 369
288Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
289 371
290=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
296our $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
297 379
298sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 445=item cf::lock_wait $string
302 446
303Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
304 448
305=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
306 450
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
310returned. 454returned.
311 455
312Locks 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
313deadlocked coro. 457deadlocked coro.
… …
319 463
320Return 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.
321 465
322=cut 466=cut
323 467
324our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 469
327sub lock_wait($) { 470sub lock_wait($) {
328 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 472}
341 473
342sub lock_acquire($) { 474sub lock_acquire($) {
343 my ($key) = @_; 475 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 476}
357 477
358sub lock_active($) { 478sub lock_active($) {
359 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 480}
363 481
364sub freeze_mainloop { 482sub freeze_mainloop {
365 tick_inhibit_inc; 483 tick_inhibit_inc;
366 484
367 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
368} 486}
369 487
370=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
371 489
372Like 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
373get spread over timer. 491get spread over time.
374 492
375=cut 493=cut
376 494
377sub periodic($$) { 495sub periodic($$) {
378 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
382 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
383} 501}
384 502
385=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
386 504
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
388This 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
389of 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.
390 512
391The 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
392used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
393 515
394Useful for short background jobs. 516Useful for short background jobs.
395 517
396=cut 518=cut
397 519
398our @SLOT_QUEUE; 520our @SLOT_QUEUE;
399our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
400 523
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
404 527
405 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
406 530
407 while () { 531 while () {
408 next_job: 532 next_job:
533
409 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 535
411 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 540 $job->[2]->send;
415 Coro::cede; 541 Coro::cede;
416 goto next_job; 542 goto next_job;
417 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 545 }
419 } 546 }
420 547
421 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 551 $signal->wait;
425 } else { 552 } else {
553 $busy = 0;
426 Coro::schedule; 554 Coro::schedule;
427 } 555 }
428 } 556 }
429}; 557};
430 558
431sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
432 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
433 563
434 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
435 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
436 567
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
… …
465=cut 596=cut
466 597
467sub sync_job(&) { 598sub sync_job(&) {
468 my ($job) = @_; 599 my ($job) = @_;
469 600
470 if ($Coro::current == $Coro::main) { 601 if (in_main) {
471 my $time = EV::time; 602 my $time = AE::time;
472 603
473 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
475 606
476 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
477 608
478 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
479 610
480 my $busy = 1; 611 my $busy = 1;
481 my @res; 612 my @res;
482 613
483 (async { 614 (async {
484 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 616 @res = eval { $job->() };
486 warn $@ if $@; 617 error $@ if $@;
487 undef $busy; 618 undef $busy;
488 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
489 620
490 while ($busy) { 621 while ($busy) {
491 if (Coro::nready) { 622 if (Coro::nready) {
… …
493 } else { 624 } else {
494 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
495 } 626 }
496 } 627 }
497 628
498 my $time = EV::time - $time; 629 my $time = AE::time - $time;
499 630
500 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
501 632
502 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
503 } else { 634 } else {
… …
525 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
526 657
527 $coro 658 $coro
528} 659}
529 660
530=item fork_call { }, $args 661=item fork_call { }, @args
531 662
532Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
533process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
534Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
535never block itself or use any form of event handling. 666never block itself or use any form of event handling.
536 667
537=cut 668=cut
538 669
670sub post_fork {
671 reset_signals;
672}
673
539sub fork_call(&@) { 674sub fork_call(&@) {
540 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
541 676
542 # 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,
543 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
544 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
545 680
546 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
547 reset_signals; 682 cf::post_fork;
548 &$cb 683 &$cb
549 }, @args; 684 } @args;
550 685
551 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 )
552} 698}
553 699
554=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
555 701
556=cut 702=cut
… …
593within each server. 739within each server.
594 740
595=cut 741=cut
596 742
597sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
598 my ($name) = @_; 747 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
600 749
601 eval { 750 eval {
602 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
612} 761}
613 762
614our $DB; 763our $DB;
615 764
616sub db_init { 765sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
619 };
620} 767}
621 768
622sub db_get($$) { 769sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
624 771
625 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
626 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
627 776
628 $! ? () 777 $! ? ()
629 : $data 778 : $data
630 }
631} 779}
632 780
633sub db_put($$$) { 781sub db_put($$$) {
634 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
663 811
664 my @data; 812 my @data;
665 my $md5; 813 my $md5;
666 814
667 for (0 .. $#$src) { 815 for (0 .. $#$src) {
668 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
669 or Carp::croak "$src->[$_]: $!";
670 } 817 }
671 818
672 # if processing is expensive, check 819 # if processing is expensive, check
673 # checksum first 820 # checksum first
674 if (1) { 821 if (1) {
… …
691 838
692 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
693 my $data = $process->(\@data); 840 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
695 842
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 844
698 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
701 848
… …
711 858
712=cut 859=cut
713 860
714sub datalog($@) { 861sub datalog($@) {
715 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 864}
718 865
719=back 866=back
720 867
721=cut 868=cut
722 869
723############################################################################# 870#############################################################################
724 871
725=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
726 873
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
730 877
731In 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>
732C<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
… …
782=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
783 930
784Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
786 933
787Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 936
790These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
791 938
792=over 4 939=over 4
… …
916 1063
917 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 1066
920 } elsif (ref $type) { 1067 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
922 1069
923 } else { 1070 } else {
924 shift @arg; 1071 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
926 } 1073 }
927 } 1074 }
928} 1075}
929 1076
930sub _object_attach { 1077sub _object_attach {
… …
940 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
941 } 1088 }
942 1089
943 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
944 } else { 1091 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1093 }
947 1094
948 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
949} 1096}
950 1097
… …
1009 1156
1010 for (@$callbacks) { 1157 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1012 1159
1013 if ($@) { 1160 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1162 override;
1017 } 1163 }
1018 1164
1019 return 1 if $override; 1165 return 1 if $override;
1020 } 1166 }
… …
1083 1229
1084sub reattach { 1230sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1232 my ($obj) = @_;
1087 1233
1234 # no longer needed after getting rid of delete_package?
1088 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
1089 1236
1090 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1091 1238
1092 @$registry = (); 1239 @$registry = ();
1093 1240
… …
1098 for (@$attach) { 1245 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1101 } 1248 }
1102 } else { 1249 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1251 }
1105 } 1252 }
1106} 1253}
1107 1254
1108cf::attachable->attach ( 1255cf::attachable->attach (
… …
1135 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1136 1283
1137 sync_job { 1284 sync_job {
1138 if (length $$rdata) { 1285 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1142 1290
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1298 aio_close $fh;
1148 1299
1149 if (@$objs) { 1300 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1309 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1311 }
1158 } else { 1312 } else {
1159 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1160 } 1314 }
1161 1315
1162 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1320 } else {
1164 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1165 } 1322 }
1166 } else { 1323 } else {
1167 aio_unlink $filename; 1324 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1169 } 1326 }
… …
1193 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1351 $av = $st->{objs};
1195 } 1352 }
1196 1353
1197 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1200 1358
1201 ($data, $av) 1359 ($data, $av)
1202} 1360}
1203 1361
1204=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1260 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1261 1419
1262 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1263} 1421}
1264 1422
1423use File::Glob ();
1424
1265cf::player->attach ( 1425cf::player->attach (
1266 on_command => sub { 1426 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1268 1428
1269 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1270 or return; 1430 or return;
1271 1431
… …
1294 1454
1295 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1296 if $reply; 1456 if $reply;
1297 1457
1298 } else { 1458 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1460 }
1301 1461
1302 cf::override; 1462 cf::override;
1303 }, 1463 },
1304); 1464);
1305 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
1306sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1307 cf::sync_job { 1482 cf::sync_job {
1308 my %todo; 1483 my %todo;
1309 1484
1310 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1486 next unless -r $path;
… …
1329 1504
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1507
1333 $ext{source} = 1508 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1336 . $source 1511 . $source
1337 . "\n};\n1"; 1512 . "\n};\n1";
1338 1513
1339 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1340 } 1515 }
1341 1516
1517 my $pass = 0;
1342 my %done; 1518 my %done;
1343 while (%todo) { 1519 while (%todo) {
1344 my $progress; 1520 my $progress;
1345 1521
1522 ++$pass;
1523
1524 ext:
1346 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1527 next ext
1349 unless exists $done{$_}; 1528 unless exists $done{$_};
1350 } 1529 }
1351 1530
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1532
1354 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1537
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1539 if exists $v->{meta}{mandatory};
1362 1540
1363 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1364 } 1550 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1551 }
1370 1552
1371 skip: 1553 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1563 }
1375 }; 1564 };
1376} 1565}
1377 1566
1378############################################################################# 1567#############################################################################
1379 1568
1380=back 1569=back
1381 1570
1382=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1383 1572
1384Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1385 1574
1386=cut 1575=cut
1387 1576
1388package cf::player; 1577package cf::player;
1389 1578
… …
1432 1621
1433sub exists($) { 1622sub exists($) {
1434 my ($login) = @_; 1623 my ($login) = @_;
1435 1624
1436 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1438} 1627}
1439 1628
1440sub find($) { 1629sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1631 my $login = $_[0];
… …
1454 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1644 or return;
1456 1645
1457 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1458 or return; 1647 or return;
1648
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1462 } 1652 }
1463 } 1653 }
1464} 1654}
1465 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
1466sub save($) { 1669sub save($) {
1467 my ($pl) = @_; 1670 my ($pl) = @_;
1468 1671
1469 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1470 1673
… …
1473 1676
1474 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1475 1678
1476 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1477 $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];
1478 1686
1479 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1688 cf::cede_to_tick;
1481} 1689}
1482 1690
… …
1514 my ($pl) = @_; 1722 my ($pl) = @_;
1515 1723
1516 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1517 1725
1518 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1519 $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
1520 1728
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1522 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1524 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1525 1737
1526 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1566 1778
1567 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1568 my $path = path $login; 1780 my $path = path $login;
1569 1781
1570 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1788 }
1576 1789
… …
1580 1793
1581 \@logins 1794 \@logins
1582} 1795}
1583 1796
1584=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1585 1800
1586Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1587player. May block. 1802player. May block.
1588 1803
1589=cut 1804=cut
… …
1607 } 1822 }
1608 1823
1609 \@paths 1824 \@paths
1610} 1825}
1611 1826
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1828
1614Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1830
1705=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1706 1832
1707Sends an ext reply to the player. 1833Sends an ext reply to the player.
1708 1834
… …
1740 1866
1741=cut 1867=cut
1742 1868
1743sub find_by_path($) { 1869sub find_by_path($) {
1744 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1745 1873
1746 my ($match, $specificity); 1874 my ($match, $specificity);
1747 1875
1748 for my $region (list) { 1876 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
… …
1775our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1777 1905
1778sub generate_random_map { 1906sub generate_random_map {
1779 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1780 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1781 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1789 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1790 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1791 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1792 (cf::region::find $rmp->{region}), $rmp->{custom}
1793 )
1794} 1912}
1795 1913
1796=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1797 1915
1798Register 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
… …
1803 1921
1804sub register { 1922sub register {
1805 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1806 my $pkg = caller; 1924 my $pkg = caller;
1807 1925
1808 no strict;
1809 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1810 1927
1811 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1812} 1929}
1813 1930
1814# also paths starting with '/' 1931# also paths starting with '/'
1815$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1816 1933
1817sub thawer_merge { 1934sub thawer_merge {
1818 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1819 1936
1820 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1825} 1942}
1826 1943
1827sub normalise { 1944sub normalise {
1828 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1829 1946
1830 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1831 1948
1832 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1833 1950
1834 # map plan: 1951 # map plan:
1835 # 1952 #
… …
1837 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1838 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1839 # ?random/... random maps 1956 # ?random/... random maps
1840 # /... normal maps 1957 # /... normal maps
1841 # ~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
1842 1960
1843 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1844 1962
1845 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1846 # something that looks reasonable 1964 # something that looks reasonable
1847 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1848 $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'";
1849 1967
1850 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1851 $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;
1852 } 1984 }
1853 1985
1854 for ($path) { 1986 for ($path) {
1855 redo if s{//}{/};
1856 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1857 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1858 } 1989 }
1859 1990
1860 $path 1991 $path
… …
1874 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1875 return $self; 2006 return $self;
1876 } 2007 }
1877 } 2008 }
1878 2009
1879 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1880 () 2011 ()
1881} 2012}
1882 2013
2014# may re-bless or do other evil things
1883sub init { 2015sub init {
1884 my ($self) = @_; 2016 my ($self) = @_;
1885 2017
1886 $self 2018 $self
1887} 2019}
… …
1906 2038
1907# the temporary/swap location 2039# the temporary/swap location
1908sub save_path { 2040sub save_path {
1909 my ($self) = @_; 2041 my ($self) = @_;
1910 2042
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1913} 2045}
1914 2046
1915# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1916sub uniq_path { 2048sub uniq_path {
1917 my ($self) = @_; 2049 my ($self) = @_;
1918 2050
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 2053}
1931 2054
1932sub decay_objects { 2055sub decay_objects {
1933 my ($self) = @_; 2056 my ($self) = @_;
1934 2057
… …
2016 2139
2017sub find; 2140sub find;
2018sub find { 2141sub find {
2019 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
2020 2143
2144 cf::cede_to_tick;
2145
2021 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
2022 2147
2023 cf::lock_wait "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2150
2026 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2152 my $map = new_from_path cf::map $path
2031 or return; 2153 or return;
2032 2154
2033 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
2034 2156
… …
2036 or return; 2158 or return;
2037 2159
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2160 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2161 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2162 #$cf::WAIT_FOR_TICK->wait;
2163 undef $guard2;
2041 undef $guard1; 2164 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2165 $map->reset;
2044 return find $path; 2166 return find $path;
2045 } 2167 }
2046 2168
2047 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
2048 } 2170 }
2049} 2171}
2050 2172
2051sub pre_load { } 2173sub pre_load { }
2052sub post_load { } 2174#sub post_load { } # XS
2053 2175
2054sub load { 2176sub load {
2055 my ($self) = @_; 2177 my ($self) = @_;
2056 2178
2057 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
… …
2069 $self->alloc; 2191 $self->alloc;
2070 2192
2071 $self->pre_load; 2193 $self->pre_load;
2072 cf::cede_to_tick; 2194 cf::cede_to_tick;
2073 2195
2196 if (exists $self->{load_path}) {
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2198 $f->skip_block;
2076 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2077 or return; 2200 or return;
2078 2201
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2202 $self->post_load_original
2080 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2081 2204
2082 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2206 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2085 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2086 $self->clear_unique_items; 2209 $self->clear_unique_items;
2087 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2088 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2089 } 2213 }
2090 } 2214 }
2091 }
2092 2215
2093 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2094 2218
2095 cf::cede_to_tick; 2219 cf::cede_to_tick;
2096 # now do the right thing for maps 2220 # now do the right thing for maps
2097 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2098 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
… …
2102 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2227 $self->decay_objects;
2104 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
2105 $self->update_buttons; 2229 $self->update_buttons;
2106 cf::cede_to_tick; 2230 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2231 $self->activate;
2110 } 2232 }
2111 2233
2112 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
2114 2236
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2237 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2238 }
2117 2239
2118 $self->post_load; 2240 $self->post_load;
2119}
2120 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
2121sub customise_for { 2248sub customise_for {
2122 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
2123 2250
2124 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2252 if $self->per_player;
… …
2141 or next; 2268 or next;
2142 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2143 or next; 2270 or next;
2144 $neigh->load; 2271 $neigh->load;
2145 2272
2273 # now find the diagonal neighbours
2146 push @neigh, 2274 push @neigh,
2147 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2148 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2149 } 2277 }
2150 2278
… …
2157} 2285}
2158 2286
2159sub find_sync { 2287sub find_sync {
2160 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2161 2289
2162 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
2163} 2294}
2164 2295
2165sub do_load_sync { 2296sub do_load_sync {
2166 my ($map) = @_; 2297 my ($map) = @_;
2167 2298
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2170 2301
2171 cf::sync_job { $map->load }; 2302 $map->load;
2172} 2303}
2173 2304
2174our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2175our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2176 2307
2177sub find_async { 2308sub find_async {
2178 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2179 2310
2180 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2181 2312
2182 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2315 }
2185 2316
2186 $MAP_PREFETCH{$path} |= $load; 2317 $MAP_PREFETCH{$path} |= $load;
2187 2318
2188 $MAP_PREFETCHER ||= cf::async { 2319 $MAP_PREFETCHER ||= cf::async {
… …
2202 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2203 2334
2204 () 2335 ()
2205} 2336}
2206 2337
2338# common code, used by both ->save and ->swapout
2207sub save { 2339sub _save {
2208 my ($self) = @_; 2340 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2341
2212 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2213 2343
2214 return unless $self->dirty; 2344 return unless $self->dirty;
2215 2345
… …
2224 2354
2225 cf::async { 2355 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2356 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2357 $_->contr->save for $self->players;
2228 }; 2358 };
2359
2360 cf::get_slot 0.02;
2229 2361
2230 if ($uniq) { 2362 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2363 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2364 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2365 } else {
2234 $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);
2235 } 2367 }
2236} 2368}
2237 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2238sub swap_out { 2378sub swap_out {
2239 my ($self) = @_; 2379 my ($self) = @_;
2240 2380
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2382
2383 return if $self->in_memory != cf::MAP_ACTIVE;
2384 return if $self->{deny_save};
2246 return if $self->players; 2385 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
2248 return if $self->{deny_save};
2249 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2250 $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};
2251 2437
2252 $self->deactivate; 2438 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2254 $self->clear; 2440 $self->clear;
2255}
2256
2257sub reset_at {
2258 my ($self) = @_;
2259
2260 # TODO: safety, remove and allow resettable per-player maps
2261 return 1e99 if $self->{deny_reset};
2262
2263 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2264 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2265
2266 $time + $to
2267}
2268
2269sub should_reset {
2270 my ($self) = @_;
2271
2272 $self->reset_at <= $cf::RUNTIME
2273}
2274
2275sub reset {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 return if $self->players;
2281
2282 warn "resetting map ", $self->path;
2283
2284 $self->in_memory (cf::MAP_SWAPPED);
2285
2286 # need to save uniques path
2287 unless ($self->{deny_save}) {
2288 my $uniq = $self->uniq_path; utf8::encode $uniq;
2289
2290 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2291 if $uniq;
2292 }
2293
2294 delete $cf::MAP{$self->path};
2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->clear;
2299 2441
2300 $self->unlink_save; 2442 $self->unlink_save;
2301 $self->destroy; 2443 $self->destroy;
2302} 2444}
2303 2445
… …
2311 2453
2312 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2313 2455
2314 $self->unlink_save; 2456 $self->unlink_save;
2315 2457
2316 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2317 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2318 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2319 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2321 2463
… …
2370 2512
2371sub unique_maps() { 2513sub unique_maps() {
2372 [ 2514 [
2373 map { 2515 map {
2374 utf8::decode $_; 2516 utf8::decode $_;
2375 /\.map$/ 2517 s/\.map$//; # TODO future compatibility hack
2518 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2519 ? ()
2376 ? normalise $_ 2520 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2522 ]
2380} 2523}
2381 2524
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}
2556
2382=back 2557=back
2383 2558
2384=head3 cf::object 2559=head3 cf::object
2385 2560
2386=cut 2561=cut
… …
2389 2564
2390=over 4 2565=over 4
2391 2566
2392=item $ob->inv_recursive 2567=item $ob->inv_recursive
2393 2568
2394Returns 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.
2395 2571
2396=cut 2572=cut
2397 2573
2398sub inv_recursive_; 2574sub inv_recursive_;
2399sub inv_recursive_ { 2575sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2580 inv_recursive_ inv $_[0]
2405} 2581}
2406 2582
2407=item $ref = $ob->ref 2583=item $ref = $ob->ref
2408 2584
2409creates 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.
2410 2586
2411=item $ob = cf::object::deref ($refstring) 2587=item $ob = cf::object::deref ($refstring)
2412 2588
2413returns 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,
2414even if the object actually exists. May block. 2590even if the object actually exists. May block.
… …
2446can 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
2447dialogue with the given NPC character. 2623dialogue with the given NPC character.
2448 2624
2449=cut 2625=cut
2450 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
2451# rough implementation of a future "reply" method that works 2641# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2642# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2644sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2645 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2656 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2658
2469 } else { 2659 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2660 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2661 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2662 }
2473 } 2663 }
2474} 2664}
2475 2665
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2666=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2501 2691
2502=item $player_object->enter_link 2692=item $player_object->enter_link
2503 2693
2504Freezes 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}>).
2505 2695
2506The 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.
2507I<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.
2508 2700
2509Will never block. 2701Will never block.
2510 2702
2511=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2512 2704
… …
2532sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2533 my ($self) = @_; 2725 my ($self) = @_;
2534 2726
2535 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2536 2728
2729 ++$self->{_link_recursion};
2730
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2732
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2541 2735
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2737}
2544 2738
2545sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2547 2741
… …
2564 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2566 2760
2567 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2570 2764
2571 $map->load; 2765 $map->load;
2572 $map->load_neighbours; 2766 $map->load_neighbours;
2573 2767
2574 return unless $self->contr->active; 2768 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2769
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2579} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2580 2777
2778}
2779
2581=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)]])
2582 2781
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be called at the end of this process. 2786be called at the end of this process.
2588 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
2589=cut 2791=cut
2590 2792
2591our $GOTOGEN; 2793our $GOTOGEN;
2592 2794
2593sub cf::object::player::goto { 2795sub cf::object::player::goto {
2594 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 }
2595 2803
2596 # 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
2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2598 2806
2599 $self->enter_link; 2807 $self->enter_link;
… …
2619 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2620 } 2828 }
2621 } 2829 }
2622 2830
2623 my $map = eval { 2831 my $map = eval {
2624 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2625 2833
2626 if ($map) { 2834 if ($map) {
2627 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2628 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2629 } else { 2837 } else {
2630 $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);
2631 } 2839 }
2632 2840
2633 $map 2841 $map
… …
2641 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2642 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2643 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2644 } 2852 }
2645 2853
2646 $done->() if $done; 2854 $done->($self) if $done;
2647 })->prio (1); 2855 })->prio (1);
2648} 2856}
2649 2857
2650=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2651 2859
… …
2671} 2879}
2672 2880
2673sub prepare_random_map { 2881sub prepare_random_map {
2674 my ($exit) = @_; 2882 my ($exit) = @_;
2675 2883
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2884 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2885 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2886 # that depends on the exit object
2681 2887
2682 my $rmp = parse_random_map_params $exit->msg; 2888 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2890 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2891 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2892 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2893 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2894 $rmp->{origin_y} = $exit->y;
2895
2896 $exit->map->touch;
2689 } 2897 }
2690 2898
2691 $rmp->{random_seed} ||= $exit->random_seed; 2899 $rmp->{random_seed} ||= $exit->random_seed;
2692 2900
2693 my $data = cf::encode_json $rmp; 2901 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2902 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2903 my $meta = "$RANDOMDIR/$md5.meta";
2696 2904
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2905 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2906 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2907 undef $fh;
2700 aio_rename "$meta~", $meta; 2908 aio_rename "$meta~", $meta;
2701 2909
2910 my $slaying = "?random/$md5";
2911
2912 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2913 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2914 $exit->msg (undef);
2915 }
2704 } 2916 }
2705} 2917}
2706 2918
2707sub cf::object::player::enter_exit { 2919sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2920 my ($self, $exit) = @_;
2709 2921
2710 return unless $self->type == cf::PLAYER; 2922 return unless $self->type == cf::PLAYER;
2711 2923
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2924 $self->enter_link;
2724 2925
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2926 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2927 $Coro::current->{desc} = "enter_exit";
2731 2928
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2944 $self->goto ($map, $x, $y);
2735 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
2736 1; 2950 1
2737 }) { 2951 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2956
2743 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2744 $self->leave_link; 2958 $self->leave_link;
2745 } 2959 }
2746 })->prio (1); 2960 })->prio (1);
2747} 2961}
2748 2962
… …
2760sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2762 2976
2763 utf8::encode $text; 2977 utf8::encode $text;
2764 $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);
2765} 3004}
2766 3005
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 3007
2769Send 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
… …
2773 3012
2774=cut 3013=cut
2775 3014
2776# non-persistent channels (usually the info channel) 3015# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2778 "c/identify" => { 3023 "c/identify" => {
2779 id => "infobox", 3024 id => "infobox",
2780 title => "Identify", 3025 title => "Identify",
2781 reply => undef, 3026 reply => undef,
2782 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
… …
2784 "c/examine" => { 3029 "c/examine" => {
2785 id => "infobox", 3030 id => "infobox",
2786 title => "Examine", 3031 title => "Examine",
2787 reply => undef, 3032 reply => undef,
2788 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",
2789 }, 3040 },
2790 "c/book" => { 3041 "c/book" => {
2791 id => "infobox", 3042 id => "infobox",
2792 title => "Book", 3043 title => "Book",
2793 reply => undef, 3044 reply => undef,
… …
2809 id => "infobox", 3060 id => "infobox",
2810 title => "Body Parts", 3061 title => "Body Parts",
2811 reply => undef, 3062 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 3063 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 3101 "c/uptime" => {
2815 id => "infobox", 3102 id => "infobox",
2816 title => "Uptime", 3103 title => "Uptime",
2817 reply => undef, 3104 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 3105 tooltip => "How long the server has been running since last restart",
… …
2821 id => "infobox", 3108 id => "infobox",
2822 title => "Map Info", 3109 title => "Map Info",
2823 reply => undef, 3110 reply => undef,
2824 tooltip => "Information related to the maps", 3111 tooltip => "Information related to the maps",
2825 }, 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,
2826); 3127);
2827 3128
2828sub cf::client::send_msg { 3129sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3131
2831 $msg = $self->pl->expand_cfpod ($msg); 3132 $msg = $self->pl->expand_cfpod ($msg)
3133 unless $color & cf::NDI_VERBATIM;
2832 3134
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3135 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3136
2835 # check predefined channels, for the benefit of C 3137 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3138 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3139 $channel = $CHANNEL{$channel};
2838 3140
2839 $self->ext_msg (channel_info => $channel) 3141 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3142 $channel = $channel->{id};
2843 3143
2844 } elsif (ref $channel) { 3144 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3149 }
2851 3150
2852 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2853 } 3152 }
2854 3153
2855 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2856 3155
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3156 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2861 3159
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3160 my $pkt = "msg "
3161 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3163 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3164
2876 $color &= cf::NDI_COLOR_MASK; 3165 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3166}
2890 3167
2891=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2892 3169
2893Sends an ext event to the client. 3170Sends an ext event to the client.
… …
2896 3173
2897sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2899 3176
2900 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3182 }
2906} 3183}
2907 3184
2908=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2909 3186
… …
2913 3190
2914sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2916 3193
2917 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3197 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3200 }
2924} 3201}
2925 3202
2926=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2927 3204
… …
2998 3275
2999 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3277 if $reply;
3001 3278
3002 } else { 3279 } else {
3003 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";
3004 } 3281 }
3005 3282
3006 cf::override; 3283 cf::override;
3007 }, 3284 },
3008); 3285);
… …
3028 3305
3029 $coro 3306 $coro
3030} 3307}
3031 3308
3032cf::client->attach ( 3309cf::client->attach (
3033 on_destroy => sub { 3310 on_client_destroy => sub {
3034 my ($ns) = @_; 3311 my ($ns) = @_;
3035 3312
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3314 },
3038); 3315);
… …
3054our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
3055 3332
3056$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
3057 3334
3058$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
3061 sort time 3338 sort time
3062)); 3339));
3063 3340
3064# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
… …
3067 3344
3068The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
3069 3346
3070 cf::object 3347 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3349 insert remove name archname title slaying race decrease split
3350 value
3073 3351
3074 cf::object::player 3352 cf::object::player
3075 player 3353 player
3076 3354
3077 cf::player 3355 cf::player
… …
3082 3360
3083=cut 3361=cut
3084 3362
3085for ( 3363for (
3086 ["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
3087 insert remove inv name archname title slaying race 3365 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3092) { 3370) {
3093 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 for @funs; 3373 for @funs;
3097} 3374}
3098 3375
… …
3113 3390
3114 my $qcode = $code; 3391 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
3117 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
3118 local $_; 3398 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3399
3121 my $eval = 3400 my $eval =
3122 "do {\n" 3401 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3404 . $code
3126 . "\n}" 3405 . "\n}"
3127 ; 3406 ;
3128 3407
3408 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 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 }
3132 3417
3133 if ($@) { 3418 if ($@) {
3134 warn "$@"; 3419 warn "$@",
3135 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3137 } 3422 }
3138 3423
3139 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3140} 3425}
3141 3426
… …
3155=cut 3440=cut
3156 3441
3157sub register_script_function { 3442sub register_script_function {
3158 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
3159 3444
3160 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
3162} 3447}
3163 3448
3164=back 3449=back
3165 3450
3166=cut 3451=cut
… …
3175 # for this (global event?) 3460 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3177 3462
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179 3464
3180 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3181 3466
3182 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3183 0 < aio_load $path, $facedata
3184 or die "$path: $!";
3185
3186 $facedata = Coro::Storable::thaw $facedata;
3187 3468
3188 $facedata->{version} == 2 3469 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3471
3191 # 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]);
3192 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3475 type => FT_RSRC,
3194 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),
3195 }; 3478 };
3196 cf::cede_to_tick; 3479 cf::cede_to_tick;
3197 3480
3198 { 3481 {
3199 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
… …
3201 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3486
3204 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 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} ;
3208 3492
3209 cf::cede_to_tick; 3493 cf::cede_to_tick;
3210 } 3494 }
3211 3495
3212 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
… …
3217 3501
3218 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3221 } else { 3505 } else {
3222 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3223 } 3507 }
3224 3508
3225 cf::cede_to_tick; 3509 cf::cede_to_tick;
3226 } 3510 }
3227 } 3511 }
… …
3236 3520
3237 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3238 } 3522 }
3239 3523
3240 { 3524 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3244 3526
3245 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3528 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3530
3250 if ($info->{type} & 1) { 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3532 cf::face::set_type $idx, $info->{type};
3265 } else { 3533 } else {
3266 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3267 } 3535 }
3268 3536
3269 cf::cede_to_tick; 3537 cf::cede_to_tick;
3270 } 3538 }
3271 } 3539 }
3272 3540
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274 3542
3275 1 3543 1
3276} 3544}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297 3545
3298register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_; 3547 my ($ns, $want) = @_;
3300 3548
3301 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3550 $ns->fx_want ($k, $v);
3303 } 3551 }
3304}; 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}
3305 3563
3306sub reload_regions { 3564sub reload_regions {
3307 # 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
3308 # for this (global event?) 3566 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3567 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3323} 3581}
3324 3582
3325sub reload_archetypes { 3583sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3584 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3585 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3586}
3334 3587
3335sub reload_treasures { 3588sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3338} 3591}
3339 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
3340sub reload_resources { 3613sub reload_resources {
3341 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3342 3615
3616 reload_exp_table;
3617 reload_materials;
3618 reload_facedata;
3619 reload_sound;
3620 reload_archetypes;
3343 reload_regions; 3621 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3622 reload_treasures;
3348 3623
3349 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3625}
3355 3626
3356sub reload_config { 3627sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3358 or return;
3359 3629
3360 local $/; 3630 my $config = load_file "$CONFDIR/config";
3361 *CFG = YAML::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3362 3633
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3364 3635
3365 $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};
3366 $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};
3367 3638
3368 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
… …
3372 }; 3643 };
3373 warn $@ if $@; 3644 warn $@ if $@;
3374 } 3645 }
3375} 3646}
3376 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
3377sub 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
3378 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3380 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#
3381 (async { 3689 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3690 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3691 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3692 })->prio (Coro::PRIO_MAX);
3385 }; 3693 };
3386 3694
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3695 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 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;
3707 reload_config;
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
3718 load_extensions;
3719
3720 utime time, time, $RUNTIMEFILE;
3721
3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3725
3726 cf::_post_init 0;
3727 };
3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3394} 3738}
3395 3739
3396############################################################################# 3740#############################################################################
3397# initialisation and cleanup 3741# initialisation and cleanup
3398 3742
3399# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3400BEGIN { 3744BEGIN {
3401 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3405 }; 3749 };
3406 } 3750 }
3407} 3751}
3408 3752
3409sub write_runtime { 3753sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3411 3755
3412 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3414 3758
3415 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3760
3417 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3418 3762
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3764 or return;
3421 3765
3422 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
… …
3434 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3435 3779
3436 close $fh 3780 close $fh
3437 or return; 3781 or return;
3438 3782
3439 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3784 and return;
3441 3785
3442 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3787
3444 1 3788 1
3445} 3789}
3446 3790
3447our $uuid_lock; 3791our $uuid_lock;
… …
3456 my $uuid = "$LOCALDIR/uuid"; 3800 my $uuid = "$LOCALDIR/uuid";
3457 3801
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3802 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3803 or return;
3460 3804
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 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;
3462 $uuid_skip = 0; 3813 $uuid_skip = 0;
3463 3814
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3815 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3816 and return;
3466 3817
… …
3472 or return; 3823 or return;
3473 3824
3474 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3475 and return; 3826 and return;
3476 3827
3477 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3478 3829
3479 1 3830 1
3480 3831
3481} 3832}
3482 3833
… …
3488} 3839}
3489 3840
3490sub emergency_save() { 3841sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3492 3843
3493 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;
3494 3850
3495 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3496 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3860 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3862 $pl->save;
3505 } 3863 }
3506 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3507 3865
3508 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";
3509 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3871 $map->valid or next;
3512 $map->save; 3872 $map->save;
3513 } 3873 }
3514 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3515 3875
3516 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";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3519 3881
3520 warn "begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3883 write_uuid_sync 1;
3522 warn "end write uuid\n"; 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
3523 }; 3904 };
3524 3905
3525 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3526} 3907}
3527 3908
3528sub post_cleanup { 3909sub post_cleanup {
3529 my ($make_core) = @_; 3910 my ($make_core) = @_;
3530 3911
3912 IO::AIO::flush;
3913
3531 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3532 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 }
3533} 3944}
3534 3945
3535sub do_reload_perl() { 3946sub do_reload_perl() {
3536 # can/must only be called in main 3947 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3538 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3539 return; 3950 return;
3540 } 3951 }
3541 3952
3542 warn "reloading..."; 3953 return if $RELOAD++;
3543 3954
3544 warn "entering sync_job"; 3955 my $t1 = AE::time;
3545 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
3546 cf::sync_job { 3963 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark
3548 cf::emergency_save; 3964 #cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark
3550 3965
3551 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV;
3553
3554 # if anything goes wrong in here, we should simply crash as we already saved
3555
3556 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs;
3562 warn "iterate...";
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = (); 3968 %EXT_CORO = ();
3570 3969
3571 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3572 %COMMAND = (); 3971 %COMMAND = ();
3573 3972
3574 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3575 %EXTCMD = (); 3974 %EXTCMD = ();
3576 %EXTICMD = (); 3975 %EXTICMD = ();
3577 3976
3578 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3579 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3581 3980
3582 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3583 eval { 3982 eval {
3584 $cb->($pkg); 3983 $cb->($pkg);
3585 1 3984 1
3586 } 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;
3587 } 3990 }
3588 3991
3589 warn "... nuking $pkg";
3590 Symbol::delete_package $pkg;
3591 }
3592
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3594 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3995
3597 warn "... unloading $k"; 3996 trace "... unloading $k";
3598 delete $INC{$k}; 3997 delete $INC{$k};
3599 3998
3600 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3602 4001
3603 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3604 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3605 } 4007 }
3606 4008
3607 Symbol::delete_package $k;
3608 }
3609
3610 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3612 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);
3613 4012
3614 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 4016
3618 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3619 # and global variables created in xs 4018 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3621 4020
3622 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3623 4022
3624 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3625 require cf; 4024 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3627 4026
3628 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3629 cf::reload_config; 4028 cf::reload_config;
3630 4029
3631 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3632 cf::load_extensions; 4031 cf::load_extensions;
3633 4032
4033 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3637 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3640 4041
3641 warn "leaving sync_job"; 4042 cf::_post_init 1;
3642 4043
4044 trace "perl_reload: leaving sync_job";
4045
3643 1 4046 1
3644 } or do { 4047 } or do {
3645 warn $@; 4048 error $@;
3646 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
4050 };
4051
4052 --$RELOAD;
3647 }; 4053 }
3648 4054
3649 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3650}; 4057};
3651 4058
3652our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3653 4060
3654sub reload_perl() { 4061sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3657 4064
4065 $RELOAD_WATCHER ||= cf::async {
4066 Coro::AIO::aio_wait cache_extensions;
4067
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 4069 do_reload_perl;
3660 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
4071 };
3661 }; 4072 };
3662} 4073}
3663 4074
3664register_command "reload" => sub { 4075register_command "reload" => sub {
3665 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
… …
3671 reload_perl; 4082 reload_perl;
3672 }; 4083 };
3673 } 4084 }
3674}; 4085};
3675 4086
3676unshift @INC, $LIBDIR; 4087#############################################################################
3677 4088
3678my $bug_warning = 0; 4089my $bug_warning = 0;
3679 4090
3680our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3682 4093
3683sub wait_for_tick { 4094sub wait_for_tick() {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3686 4096
3687 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 4099 $signal->wait;
3690} 4100}
3691 4101
3692sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3695 4104
3696 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 4107 $signal->wait;
3699} 4108}
… …
3705 return; 4114 return;
3706 } 4115 }
3707 4116
3708 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3709 4118
4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4120
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $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.;
3712 Coro::async_pool { 4123 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 4125 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3716 }; 4127 };
3717 } 4128 }
3718 4129
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3720 $sig->send; 4131 $sig->send;
… …
3728 4139
3729 if (0) { 4140 if (0) {
3730 if ($NEXT_TICK) { 4141 if ($NEXT_TICK) {
3731 my $jitter = $TICK_START - $NEXT_TICK; 4142 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d# 4144 debug "jitter $JITTER\n";#d#
3734 } 4145 }
3735 } 4146 }
3736} 4147}
3737 4148
3738{ 4149{
3739 # configure BDB 4150 # configure BDB
3740 4151
3741 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3742 BDB::max_poll_reqs $TICK * 0.1; 4153 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 4154 $AnyEvent::BDB::WATCHER->priority (1);
3744 4155
3745 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | 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;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4161 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4162 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 4163
3752 cf::sync_job { 4164 cf::sync_job {
3753 eval { 4165 eval {
… …
3779{ 4191{
3780 # configure IO::AIO 4192 # configure IO::AIO
3781 4193
3782 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 4196 undef $AnyEvent::AIO::WATCHER;
3785} 4197}
3786 4198
3787my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3788 4201
3789sub _log_backtrace { 4202sub _log_backtrace {
3790 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3791 4204
3792 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3793 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3794 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3796 ++$_log_backtrace; 4213 ++$_log_backtrace;
4214 my $perl_bt = Carp::longmess $msg;
3797 async { 4215 async {
3798 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
3799 4217
3800 my @bt = fork_call { 4218 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 4219 @addr = map { sprintf "%x", $_ } @addr;
… …
3812 } 4230 }
3813 4231
3814 @funcs 4232 @funcs
3815 }; 4233 };
3816 4234
3817 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $perl_bt\n";
4236 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 4238 --$_log_backtrace;
3820 }; 4239 };
3821 } else { 4240 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3824 } 4243 }
3825} 4244}
3826 4245
3827# load additional modules 4246# load additional modules
3828use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3829 4249
3830END { cf::emergency_save } 4250END { cf::emergency_save }
3831 4251
38321 42521
3833 4253

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines