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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 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 )
698}
699
700=item $coin = coin_from_name $name
701
702=cut
703
704our %coin_alias = (
705 "silver" => "silvercoin",
706 "silvercoin" => "silvercoin",
707 "silvercoins" => "silvercoin",
708 "gold" => "goldcoin",
709 "goldcoin" => "goldcoin",
710 "goldcoins" => "goldcoin",
711 "platinum" => "platinacoin",
712 "platinumcoin" => "platinacoin",
713 "platinumcoins" => "platinacoin",
714 "platina" => "platinacoin",
715 "platinacoin" => "platinacoin",
716 "platinacoins" => "platinacoin",
717 "royalty" => "royalty",
718 "royalties" => "royalty",
719);
720
721sub coin_from_name($) {
722 $coin_alias{$_[0]}
723 ? cf::arch::find $coin_alias{$_[0]}
724 : undef
552} 725}
553 726
554=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
555 728
556Returns a single value from the environment database. 729Returns a single value from the environment database.
566within each server. 739within each server.
567 740
568=cut 741=cut
569 742
570sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
571 my ($name) = @_; 747 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
573 749
574 eval { 750 eval {
575 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
585} 761}
586 762
587our $DB; 763our $DB;
588 764
589sub db_init { 765sub db_init {
590 cf::sync_job {
591 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
592 };
593} 767}
594 768
595sub db_get($$) { 769sub db_get($$) {
596 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
597 771
598 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
599 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
600 776
601 $! ? () 777 $! ? ()
602 : $data 778 : $data
603 }
604} 779}
605 780
606sub db_put($$$) { 781sub db_put($$$) {
607 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
608 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
636 811
637 my @data; 812 my @data;
638 my $md5; 813 my $md5;
639 814
640 for (0 .. $#$src) { 815 for (0 .. $#$src) {
641 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
642 or Carp::croak "$src->[$_]: $!";
643 } 817 }
644 818
645 # if processing is expensive, check 819 # if processing is expensive, check
646 # checksum first 820 # checksum first
647 if (1) { 821 if (1) {
664 838
665 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
666 my $data = $process->(\@data); 840 my $data = $process->(\@data);
667 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
668 842
669 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
670 844
671 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
672 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
673 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
674 848
684 858
685=cut 859=cut
686 860
687sub datalog($@) { 861sub datalog($@) {
688 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
689 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
690} 864}
691 865
692=back 866=back
693 867
694=cut 868=cut
695 869
696############################################################################# 870#############################################################################
697 871
698=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
699 873
700Many 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
701attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
703 877
704In 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>
705C<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
755=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
756 930
757Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
759 933
760Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
761that 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.
762 936
763These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
764 938
765=over 4 939=over 4
889 1063
890 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
891 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
892 1066
893 } elsif (ref $type) { 1067 } elsif (ref $type) {
894 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
895 1069
896 } else { 1070 } else {
897 shift @arg; 1071 shift @arg;
898 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
899 } 1073 }
900 } 1074 }
901} 1075}
902 1076
903sub _object_attach { 1077sub _object_attach {
913 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
914 } 1088 }
915 1089
916 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
917 } else { 1091 } else {
918 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
919 } 1093 }
920 1094
921 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
922} 1096}
923 1097
982 1156
983 for (@$callbacks) { 1157 for (@$callbacks) {
984 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
985 1159
986 if ($@) { 1160 if ($@) {
987 warn "$@";
988 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
989 override; 1162 override;
990 } 1163 }
991 1164
992 return 1 if $override; 1165 return 1 if $override;
993 } 1166 }
1056 1229
1057sub reattach { 1230sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1232 my ($obj) = @_;
1060 1233
1234 # no longer needed after getting rid of delete_package?
1061 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
1062 1236
1063 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1064 1238
1065 @$registry = (); 1239 @$registry = ();
1066 1240
1071 for (@$attach) { 1245 for (@$attach) {
1072 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1073 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1074 } 1248 }
1075 } else { 1249 } else {
1076 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1077 } 1251 }
1078 } 1252 }
1079} 1253}
1080 1254
1081cf::attachable->attach ( 1255cf::attachable->attach (
1108 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1109 1283
1110 sync_job { 1284 sync_job {
1111 if (length $$rdata) { 1285 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1115 1290
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 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 }
1120 close $fh; 1298 aio_close $fh;
1121 1299
1122 if (@$objs) { 1300 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1127 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 }
1128 close $fh; 1309 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1311 }
1131 } else { 1312 } else {
1132 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1133 } 1314 }
1134 1315
1135 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1320 } else {
1137 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1138 } 1322 }
1139 } else { 1323 } else {
1140 aio_unlink $filename; 1324 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1142 } 1326 }
1166 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs}; 1351 $av = $st->{objs};
1168 } 1352 }
1169 1353
1170 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1171 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1172 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1173 1358
1174 ($data, $av) 1359 ($data, $av)
1175} 1360}
1176 1361
1177=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1233 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1234 1419
1235 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1236} 1421}
1237 1422
1423use File::Glob ();
1424
1238cf::player->attach ( 1425cf::player->attach (
1239 on_command => sub { 1426 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1241 1428
1242 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1243 or return; 1430 or return;
1244 1431
1267 1454
1268 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1269 if $reply; 1456 if $reply;
1270 1457
1271 } else { 1458 } else {
1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1273 } 1460 }
1274 1461
1275 cf::override; 1462 cf::override;
1276 }, 1463 },
1277); 1464);
1278 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
1279sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1280 cf::sync_job { 1482 cf::sync_job {
1281 my %todo; 1483 my %todo;
1282 1484
1283 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1284 next unless -r $path; 1486 next unless -r $path;
1302 1504
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1507
1306 $ext{source} = 1508 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1308 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1309 . $source 1511 . $source
1310 . "\n};\n1"; 1512 . "\n};\n1";
1311 1513
1312 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1313 } 1515 }
1314 1516
1517 my $pass = 0;
1315 my %done; 1518 my %done;
1316 while (%todo) { 1519 while (%todo) {
1317 my $progress; 1520 my $progress;
1318 1521
1522 ++$pass;
1523
1524 ext:
1319 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1527 next ext
1322 unless exists $done{$_}; 1528 unless exists $done{$_};
1323 } 1529 }
1324 1530
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1532
1327 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1537
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1539 if exists $v->{meta}{mandatory};
1335 1540
1336 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;
1337 } 1550 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1551 }
1343 1552
1344 skip: 1553 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 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 }
1347 } 1563 }
1348 }; 1564 };
1349} 1565}
1350 1566
1351############################################################################# 1567#############################################################################
1352 1568
1353=back 1569=back
1354 1570
1355=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1356 1572
1357Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1358 1574
1359=cut 1575=cut
1360 1576
1361package cf::player; 1577package cf::player;
1362 1578
1405 1621
1406sub exists($) { 1622sub exists($) {
1407 my ($login) = @_; 1623 my ($login) = @_;
1408 1624
1409 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1411} 1627}
1412 1628
1413sub find($) { 1629sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1631 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1644 or return;
1429 1645
1430 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1431 or return; 1647 or return;
1648
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1435 } 1652 }
1436 } 1653 }
1437} 1654}
1438 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
1439sub save($) { 1669sub save($) {
1440 my ($pl) = @_; 1670 my ($pl) = @_;
1441 1671
1442 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1443 1673
1446 1676
1447 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1448 1678
1449 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1450 $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];
1451 1686
1452 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1688 cf::cede_to_tick;
1454} 1689}
1455 1690
1487 my ($pl) = @_; 1722 my ($pl) = @_;
1488 1723
1489 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1490 1725
1491 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1492 $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
1493 1728
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1495 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1497 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1498 1737
1499 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1539 1778
1540 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1541 my $path = path $login; 1780 my $path = path $login;
1542 1781
1543 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1788 }
1549 1789
1553 1793
1554 \@logins 1794 \@logins
1555} 1795}
1556 1796
1557=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1558 1800
1559Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1560player. May block. 1802player. May block.
1561 1803
1562=cut 1804=cut
1580 } 1822 }
1581 1823
1582 \@paths 1824 \@paths
1583} 1825}
1584 1826
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1828
1587Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1830
1678=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1679 1832
1680Sends an ext reply to the player. 1833Sends an ext reply to the player.
1681 1834
1713 1866
1714=cut 1867=cut
1715 1868
1716sub find_by_path($) { 1869sub find_by_path($) {
1717 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1718 1873
1719 my ($match, $specificity); 1874 my ($match, $specificity);
1720 1875
1721 for my $region (list) { 1876 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1748our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1750 1905
1751sub generate_random_map { 1906sub generate_random_map {
1752 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1753 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1754 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1762 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1763 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1764 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1765 (cf::region::find $rmp->{region}), $rmp->{custom}
1766 )
1767} 1912}
1768 1913
1769=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1770 1915
1771Register 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
1776 1921
1777sub register { 1922sub register {
1778 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1779 my $pkg = caller; 1924 my $pkg = caller;
1780 1925
1781 no strict;
1782 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1783 1927
1784 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1785} 1929}
1786 1930
1787# also paths starting with '/' 1931# also paths starting with '/'
1788$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1789 1933
1790sub thawer_merge { 1934sub thawer_merge {
1791 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1792 1936
1793 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1798} 1942}
1799 1943
1800sub normalise { 1944sub normalise {
1801 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1802 1946
1803 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1804 1948
1805 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1806 1950
1807 # map plan: 1951 # map plan:
1808 # 1952 #
1823 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1824 $path = "$base/$path"; 1968 $path = "$base/$path";
1825 } 1969 }
1826 1970
1827 for ($path) { 1971 for ($path) {
1828 redo if s{//}{/};
1829 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1830 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1831 } 1974 }
1832 1975
1833 $path 1976 $path
1847 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1848 return $self; 1991 return $self;
1849 } 1992 }
1850 } 1993 }
1851 1994
1852 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1853 () 1996 ()
1854} 1997}
1855 1998
1999# may re-bless or do other evil things
1856sub init { 2000sub init {
1857 my ($self) = @_; 2001 my ($self) = @_;
1858 2002
1859 $self 2003 $self
1860} 2004}
1879 2023
1880# the temporary/swap location 2024# the temporary/swap location
1881sub save_path { 2025sub save_path {
1882 my ($self) = @_; 2026 my ($self) = @_;
1883 2027
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2028 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 2029 "$TMPDIR/$path.map"
1886} 2030}
1887 2031
1888# the unique path, undef == no special unique path 2032# the unique path, undef == no special unique path
1889sub uniq_path { 2033sub uniq_path {
1890 my ($self) = @_; 2034 my ($self) = @_;
1891 2035
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 2038}
1904 2039
1905sub decay_objects { 2040sub decay_objects {
1906 my ($self) = @_; 2041 my ($self) = @_;
1907 2042
1934 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1935 2070
1936 1 2071 1
1937} 2072}
1938 2073
2074# used to laod the header of an original map
1939sub load_header_orig { 2075sub load_header_orig {
1940 my ($self) = @_; 2076 my ($self) = @_;
1941 2077
1942 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1943} 2079}
1944 2080
2081# used to laod the header of an instantiated map
1945sub load_header_temp { 2082sub load_header_temp {
1946 my ($self) = @_; 2083 my ($self) = @_;
1947 2084
1948 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1949} 2086}
1950 2087
2088# called after loading the header from an instantiated map
1951sub prepare_temp { 2089sub prepare_temp {
1952 my ($self) = @_; 2090 my ($self) = @_;
1953 2091
1954 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1956 # safety 2094 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2097}
1960 2098
2099# called after loading the header from an original map
1961sub prepare_orig { 2100sub prepare_orig {
1962 my ($self) = @_; 2101 my ($self) = @_;
1963 2102
1964 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1989 2128
1990sub find; 2129sub find;
1991sub find { 2130sub find {
1992 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1993 2132
2133 cf::cede_to_tick;
2134
1994 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1995 2136
1996 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2139
1999 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
2004 or return; 2142 or return;
2005 2143
2006 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
2007 2145
2009 or return; 2147 or return;
2010 2148
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2149 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2150 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2151 #$cf::WAIT_FOR_TICK->wait;
2152 undef $guard2;
2014 undef $guard1; 2153 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2154 $map->reset;
2017 return find $path; 2155 return find $path;
2018 } 2156 }
2019 2157
2020 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
2021 } 2159 }
2022} 2160}
2023 2161
2024sub pre_load { } 2162sub pre_load { }
2025sub post_load { } 2163#sub post_load { } # XS
2026 2164
2027sub load { 2165sub load {
2028 my ($self) = @_; 2166 my ($self) = @_;
2029 2167
2030 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
2042 $self->alloc; 2180 $self->alloc;
2043 2181
2044 $self->pre_load; 2182 $self->pre_load;
2045 cf::cede_to_tick; 2183 cf::cede_to_tick;
2046 2184
2185 if (exists $self->{load_path}) {
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2187 $f->skip_block;
2049 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
2050 or return; 2189 or return;
2051 2190
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2191 $self->post_load_original
2053 if delete $self->{load_original}; 2192 if delete $self->{load_original};
2054 2193
2055 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2195 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
2059 $self->clear_unique_items; 2198 $self->clear_unique_items;
2060 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
2062 } 2202 }
2063 } 2203 }
2064 }
2065 2204
2066 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2067 2210
2068 cf::cede_to_tick; 2211 cf::cede_to_tick;
2069 # now do the right thing for maps 2212 # now do the right thing for maps
2070 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2071 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
2075 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2219 $self->decay_objects;
2077 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2078 $self->update_buttons; 2221 $self->update_buttons;
2079 cf::cede_to_tick; 2222 cf::cede_to_tick;
2080 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
2081 cf::cede_to_tick;
2082 $self->activate;
2083 } 2224 }
2084 2225
2085 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2087 2228
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2229 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2230 }
2090 2231
2091 $self->post_load; 2232 $self->post_load;
2092}
2093 2233
2234 1
2235}
2236
2237# customize the map for a given player, i.e.
2238# return the _real_ map. used by e.g. per-player
2239# maps to change the path to ~playername/mappath
2094sub customise_for { 2240sub customise_for {
2095 my ($self, $ob) = @_; 2241 my ($self, $ob) = @_;
2096 2242
2097 return find "~" . $ob->name . "/" . $self->{path} 2243 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2244 if $self->per_player;
2114 or next; 2260 or next;
2115 $neigh = find $neigh, $map 2261 $neigh = find $neigh, $map
2116 or next; 2262 or next;
2117 $neigh->load; 2263 $neigh->load;
2118 2264
2265 # now find the diagonal neighbours
2119 push @neigh, 2266 push @neigh,
2120 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2267 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2121 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2268 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2122 } 2269 }
2123 2270
2130} 2277}
2131 2278
2132sub find_sync { 2279sub find_sync {
2133 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
2134 2281
2135 cf::sync_job { find $path, $origin } 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 find $path, $origin
2136} 2286}
2137 2287
2138sub do_load_sync { 2288sub do_load_sync {
2139 my ($map) = @_; 2289 my ($map) = @_;
2140 2290
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2143 2293
2144 cf::sync_job { $map->load }; 2294 $map->load;
2145} 2295}
2146 2296
2147our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2148our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2149 2299
2150sub find_async { 2300sub find_async {
2151 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2152 2302
2153 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2154 2304
2155 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2307 }
2158 2308
2159 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2160 2310
2161 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2175 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2176 2326
2177 () 2327 ()
2178} 2328}
2179 2329
2330# common code, used by both ->save and ->swapout
2180sub save { 2331sub _save {
2181 my ($self) = @_; 2332 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2333
2185 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2186 2335
2187 return unless $self->dirty; 2336 return unless $self->dirty;
2188 2337
2197 2346
2198 cf::async { 2347 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2348 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2349 $_->contr->save for $self->players;
2201 }; 2350 };
2351
2352 cf::get_slot 0.02;
2202 2353
2203 if ($uniq) { 2354 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2355 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2356 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2357 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2208 } 2359 }
2209} 2360}
2210 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2211sub swap_out { 2370sub swap_out {
2212 my ($self) = @_; 2371 my ($self) = @_;
2213 2372
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2374
2375 return if $self->in_memory != cf::MAP_ACTIVE;
2376 return if $self->{deny_save};
2219 return if $self->players; 2377 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2221 return if $self->{deny_save};
2222 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2223 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2224 2429
2225 $self->deactivate; 2430 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2227 $self->clear; 2432 $self->clear;
2228}
2229
2230sub reset_at {
2231 my ($self) = @_;
2232
2233 # TODO: safety, remove and allow resettable per-player maps
2234 return 1e99 if $self->{deny_reset};
2235
2236 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2237 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2238
2239 $time + $to
2240}
2241
2242sub should_reset {
2243 my ($self) = @_;
2244
2245 $self->reset_at <= $cf::RUNTIME
2246}
2247
2248sub reset {
2249 my ($self) = @_;
2250
2251 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252
2253 return if $self->players;
2254
2255 warn "resetting map ", $self->path;
2256
2257 $self->in_memory (cf::MAP_SWAPPED);
2258
2259 # need to save uniques path
2260 unless ($self->{deny_save}) {
2261 my $uniq = $self->uniq_path; utf8::encode $uniq;
2262
2263 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2264 if $uniq;
2265 }
2266
2267 delete $cf::MAP{$self->path};
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear;
2272 2433
2273 $self->unlink_save; 2434 $self->unlink_save;
2274 $self->destroy; 2435 $self->destroy;
2275} 2436}
2276 2437
2284 2445
2285 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2286 2447
2287 $self->unlink_save; 2448 $self->unlink_save;
2288 2449
2289 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2290 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2291 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2292 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2294 2455
2343 2504
2344sub unique_maps() { 2505sub unique_maps() {
2345 [ 2506 [
2346 map { 2507 map {
2347 utf8::decode $_; 2508 utf8::decode $_;
2348 /\.map$/ 2509 s/\.map$//; # TODO future compatibility hack
2510 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2511 ? ()
2349 ? normalise $_ 2512 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2514 ]
2353} 2515}
2354 2516
2355package cf; 2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2356 2548
2357=back 2549=back
2358 2550
2359=head3 cf::object 2551=head3 cf::object
2360 2552
2364 2556
2365=over 4 2557=over 4
2366 2558
2367=item $ob->inv_recursive 2559=item $ob->inv_recursive
2368 2560
2369Returns the inventory of the object _and_ their inventories, recursively. 2561Returns the inventory of the object I<and> their inventories, recursively,
2562but I<not> the object itself.
2370 2563
2371=cut 2564=cut
2372 2565
2373sub inv_recursive_; 2566sub inv_recursive_;
2374sub inv_recursive_ { 2567sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2572 inv_recursive_ inv $_[0]
2380} 2573}
2381 2574
2382=item $ref = $ob->ref 2575=item $ref = $ob->ref
2383 2576
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2577Creates and returns a persistent reference to an object that can be stored as a string.
2385 2578
2386=item $ob = cf::object::deref ($refstring) 2579=item $ob = cf::object::deref ($refstring)
2387 2580
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2581returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2582even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2614can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2615dialogue with the given NPC character.
2423 2616
2424=cut 2617=cut
2425 2618
2619our $SAY_CHANNEL = {
2620 id => "say",
2621 title => "Map",
2622 reply => "say ",
2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2624};
2625
2626our $CHAT_CHANNEL = {
2627 id => "chat",
2628 title => "Chat",
2629 reply => "chat ",
2630 tooltip => "Player chat and shouts, global to the server.",
2631};
2632
2426# rough implementation of a future "reply" method that works 2633# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2634# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2635#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2636sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2637 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2648 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2649 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2650
2444 } else { 2651 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2652 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2653 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2654 }
2448 } 2655 }
2449} 2656}
2450 2657
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2658=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2683
2477=item $player_object->enter_link 2684=item $player_object->enter_link
2478 2685
2479Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2480 2687
2481The player should be reasonably safe there for short amounts of time. You 2688The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2690though, as the player cannot control the character while it is on the link
2691map.
2483 2692
2484Will never block. 2693Will never block.
2485 2694
2486=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2487 2696
2507sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2508 my ($self) = @_; 2717 my ($self) = @_;
2509 2718
2510 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2511 2720
2721 ++$self->{_link_recursion};
2722
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2724
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2516 2727
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2729}
2519 2730
2520sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2522 2733
2539 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2541 2752
2542 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2545 2756
2546 $map->load; 2757 $map->load;
2547 $map->load_neighbours; 2758 $map->load_neighbours;
2548 2759
2549 return unless $self->contr->active; 2760 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2761
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2554} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2555 2769
2770}
2771
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2557 2773
2558Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2778be called at the end of this process.
2563 2779
2780Note that $check will be called with a potentially non-loaded map, so if
2781it needs a loaded map it has to call C<< ->load >>.
2782
2564=cut 2783=cut
2565 2784
2566our $GOTOGEN; 2785our $GOTOGEN;
2567 2786
2568sub cf::object::player::goto { 2787sub cf::object::player::goto {
2569 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2570 2795
2571 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2573 2798
2574 $self->enter_link; 2799 $self->enter_link;
2594 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2595 } 2820 }
2596 } 2821 }
2597 2822
2598 my $map = eval { 2823 my $map = eval {
2599 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2600 2825
2601 if ($map) { 2826 if ($map) {
2602 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2603 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2604 } else { 2829 } else {
2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2606 } 2831 }
2607 2832
2608 $map 2833 $map
2616 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2617 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2618 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2619 } 2844 }
2620 2845
2621 $done->() if $done; 2846 $done->($self) if $done;
2622 })->prio (1); 2847 })->prio (1);
2623} 2848}
2624 2849
2625=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2626 2851
2646} 2871}
2647 2872
2648sub prepare_random_map { 2873sub prepare_random_map {
2649 my ($exit) = @_; 2874 my ($exit) = @_;
2650 2875
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2876 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2877 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2878 # that depends on the exit object
2656 2879
2657 my $rmp = parse_random_map_params $exit->msg; 2880 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2882 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2883 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2884 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2885 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2886 $rmp->{origin_y} = $exit->y;
2887
2888 $exit->map->touch;
2664 } 2889 }
2665 2890
2666 $rmp->{random_seed} ||= $exit->random_seed; 2891 $rmp->{random_seed} ||= $exit->random_seed;
2667 2892
2668 my $data = cf::encode_json $rmp; 2893 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2894 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2895 my $meta = "$RANDOMDIR/$md5.meta";
2671 2896
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2897 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2898 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2899 undef $fh;
2675 aio_rename "$meta~", $meta; 2900 aio_rename "$meta~", $meta;
2676 2901
2902 my $slaying = "?random/$md5";
2903
2904 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2905 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2906 $exit->msg (undef);
2907 }
2679 } 2908 }
2680} 2909}
2681 2910
2682sub cf::object::player::enter_exit { 2911sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2912 my ($self, $exit) = @_;
2684 2913
2685 return unless $self->type == cf::PLAYER; 2914 return unless $self->type == cf::PLAYER;
2686 2915
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2916 $self->enter_link;
2699 2917
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2918 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2919 $Coro::current->{desc} = "enter_exit";
2706 2920
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2921 unless (eval {
2922 $self->deactivate_recursive; # just to be sure
2923
2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2925 my $x = $exit->stats->hp;
2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2948
2709 $self->goto ($slaying, $hp, $sp); 2949 $self->goto ($map, $x, $y);
2710 2950
2951 # if exit is damned, update players death & WoR home-position
2952 $self->contr->savebed ($map, $x, $y)
2953 if $exit->flag (cf::FLAG_DAMNED);
2954
2711 1; 2955 1
2712 }) { 2956 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2958 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2961
2718 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2963 $self->leave_link;
2720 } 2964 }
2721 })->prio (1); 2965 })->prio (1);
2722} 2966}
2723 2967
2735sub cf::client::send_drawinfo { 2979sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2980 my ($self, $text, $flags) = @_;
2737 2981
2738 utf8::encode $text; 2982 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2983 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2984}
2985
2986=item $client->send_big_packet ($pkt)
2987
2988Like C<send_packet>, but tries to compress large packets, and fragments
2989them as required.
2990
2991=cut
2992
2993our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2994
2995sub cf::client::send_big_packet {
2996 my ($self, $pkt) = @_;
2997
2998 # try lzf for large packets
2999 $pkt = "lzf " . Compress::LZF::compress $pkt
3000 if 1024 <= length $pkt and $self->{can_lzf};
3001
3002 # split very large packets
3003 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3004 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3005 $pkt = "frag";
3006 }
3007
3008 $self->send_packet ($pkt);
2740} 3009}
2741 3010
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3011=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3012
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3013Send a drawinfo or msg packet to the client, formatting the msg for the
2748 3017
2749=cut 3018=cut
2750 3019
2751# non-persistent channels (usually the info channel) 3020# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3021our %CHANNEL = (
3022 "c/motd" => {
3023 id => "infobox",
3024 title => "MOTD",
3025 reply => undef,
3026 tooltip => "The message of the day",
3027 },
2753 "c/identify" => { 3028 "c/identify" => {
2754 id => "infobox", 3029 id => "infobox",
2755 title => "Identify", 3030 title => "Identify",
2756 reply => undef, 3031 reply => undef,
2757 tooltip => "Items recently identified", 3032 tooltip => "Items recently identified",
2759 "c/examine" => { 3034 "c/examine" => {
2760 id => "infobox", 3035 id => "infobox",
2761 title => "Examine", 3036 title => "Examine",
2762 reply => undef, 3037 reply => undef,
2763 tooltip => "Signs and other items you examined", 3038 tooltip => "Signs and other items you examined",
3039 },
3040 "c/shopinfo" => {
3041 id => "infobox",
3042 title => "Shop Info",
3043 reply => undef,
3044 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3045 },
2765 "c/book" => { 3046 "c/book" => {
2766 id => "infobox", 3047 id => "infobox",
2767 title => "Book", 3048 title => "Book",
2768 reply => undef, 3049 reply => undef,
2784 id => "infobox", 3065 id => "infobox",
2785 title => "Body Parts", 3066 title => "Body Parts",
2786 reply => undef, 3067 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 3068 tooltip => "Shows which body parts you posess and are available",
2788 }, 3069 },
3070 "c/statistics" => {
3071 id => "infobox",
3072 title => "Statistics",
3073 reply => undef,
3074 tooltip => "Shows your primary statistics",
3075 },
3076 "c/skills" => {
3077 id => "infobox",
3078 title => "Skills",
3079 reply => undef,
3080 tooltip => "Shows your experience per skill and item power",
3081 },
3082 "c/shopitems" => {
3083 id => "infobox",
3084 title => "Shop Items",
3085 reply => undef,
3086 tooltip => "Shows the items currently for sale in this shop",
3087 },
3088 "c/resistances" => {
3089 id => "infobox",
3090 title => "Resistances",
3091 reply => undef,
3092 tooltip => "Shows your resistances",
3093 },
3094 "c/pets" => {
3095 id => "infobox",
3096 title => "Pets",
3097 reply => undef,
3098 tooltip => "Shows information abotu your pets/a specific pet",
3099 },
3100 "c/perceiveself" => {
3101 id => "infobox",
3102 title => "Perceive Self",
3103 reply => undef,
3104 tooltip => "You gained detailed knowledge about yourself",
3105 },
2789 "c/uptime" => { 3106 "c/uptime" => {
2790 id => "infobox", 3107 id => "infobox",
2791 title => "Uptime", 3108 title => "Uptime",
2792 reply => undef, 3109 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3110 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 3113 id => "infobox",
2797 title => "Map Info", 3114 title => "Map Info",
2798 reply => undef, 3115 reply => undef,
2799 tooltip => "Information related to the maps", 3116 tooltip => "Information related to the maps",
2800 }, 3117 },
3118 "c/party" => {
3119 id => "party",
3120 title => "Party",
3121 reply => "gsay ",
3122 tooltip => "Messages and chat related to your party",
3123 },
3124 "c/death" => {
3125 id => "death",
3126 title => "Death",
3127 reply => undef,
3128 tooltip => "Reason for and more info about your most recent death",
3129 },
3130 "c/say" => $SAY_CHANNEL,
3131 "c/chat" => $CHAT_CHANNEL,
2801); 3132);
2802 3133
2803sub cf::client::send_msg { 3134sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3135 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3136
2806 $msg = $self->pl->expand_cfpod ($msg); 3137 $msg = $self->pl->expand_cfpod ($msg)
3138 unless $color & cf::NDI_VERBATIM;
2807 3139
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3140 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3141
2810 # check predefined channels, for the benefit of C 3142 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3143 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3144 $channel = $CHANNEL{$channel};
2813 3145
2814 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3147 $channel = $channel->{id};
2818 3148
2819 } elsif (ref $channel) { 3149 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3150 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3151 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3152 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3153 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3154 }
2826 3155
2827 $channel = $channel->{id}; 3156 $channel = $channel->{id};
2828 } 3157 }
2829 3158
2830 return unless @extra || length $msg; 3159 return unless @extra || length $msg;
2831 3160
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3161 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3162 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3163 if $color & cf::NDI_DEF;
2836 3164
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3165 my $pkt = "msg "
3166 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3167 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3168 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3169
2851 $color &= cf::NDI_COLOR_MASK; 3170 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3171}
2865 3172
2866=item $client->ext_msg ($type, @msg) 3173=item $client->ext_msg ($type, @msg)
2867 3174
2868Sends an ext event to the client. 3175Sends an ext event to the client.
2871 3178
2872sub cf::client::ext_msg($$@) { 3179sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3180 my ($self, $type, @msg) = @_;
2874 3181
2875 if ($self->extcmd == 2) { 3182 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3183 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove 3184 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type"; 3185 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3186 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3187 }
2881} 3188}
2882 3189
2883=item $client->ext_reply ($msgid, @msg) 3190=item $client->ext_reply ($msgid, @msg)
2884 3191
2888 3195
2889sub cf::client::ext_reply($$@) { 3196sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_; 3197 my ($self, $id, @msg) = @_;
2891 3198
2892 if ($self->extcmd == 2) { 3199 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) { 3201 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove 3202 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id; 3203 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3204 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 } 3205 }
2899} 3206}
2900 3207
2901=item $success = $client->query ($flags, "text", \&cb) 3208=item $success = $client->query ($flags, "text", \&cb)
2902 3209
2973 3280
2974 $ns->ext_reply ($reply, @reply) 3281 $ns->ext_reply ($reply, @reply)
2975 if $reply; 3282 if $reply;
2976 3283
2977 } else { 3284 } else {
2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3285 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2979 } 3286 }
2980 3287
2981 cf::override; 3288 cf::override;
2982 }, 3289 },
2983); 3290);
3003 3310
3004 $coro 3311 $coro
3005} 3312}
3006 3313
3007cf::client->attach ( 3314cf::client->attach (
3008 on_destroy => sub { 3315 on_client_destroy => sub {
3009 my ($ns) = @_; 3316 my ($ns) = @_;
3010 3317
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3318 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3319 },
3013); 3320);
3029our $safe_hole = new Safe::Hole; 3336our $safe_hole = new Safe::Hole;
3030 3337
3031$SIG{FPE} = 'IGNORE'; 3338$SIG{FPE} = 'IGNORE';
3032 3339
3033$safe->permit_only (Opcode::opset qw( 3340$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3341 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3342 grepstart grepwhile mapstart mapwhile
3036 sort time 3343 sort time
3037)); 3344));
3038 3345
3039# here we export the classes and methods available to script code 3346# here we export the classes and methods available to script code
3042 3349
3043The following functions and methods are available within a safe environment: 3350The following functions and methods are available within a safe environment:
3044 3351
3045 cf::object 3352 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3353 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3354 insert remove name archname title slaying race decrease split
3355 value
3048 3356
3049 cf::object::player 3357 cf::object::player
3050 player 3358 player
3051 3359
3052 cf::player 3360 cf::player
3057 3365
3058=cut 3366=cut
3059 3367
3060for ( 3368for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3369 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3370 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3371 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3373 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
3067) { 3375) {
3068 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3071 for @funs; 3378 for @funs;
3072} 3379}
3073 3380
3088 3395
3089 my $qcode = $code; 3396 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3397 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3398 $qcode =~ s/\n/\\n/g;
3092 3399
3400 %vars = (_dummy => 0) unless %vars;
3401
3402 my @res;
3093 local $_; 3403 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3404
3096 my $eval = 3405 my $eval =
3097 "do {\n" 3406 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3407 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3408 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3409 . $code
3101 . "\n}" 3410 . "\n}"
3102 ; 3411 ;
3103 3412
3413 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3414 sub_generation_inc;
3415 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3416 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3417 sub_generation_inc;
3418 } else {
3419 local @cf::_safe_eval_args = values %vars;
3420 @res = wantarray ? eval eval : scalar eval $eval;
3421 }
3107 3422
3108 if ($@) { 3423 if ($@) {
3109 warn "$@"; 3424 warn "$@",
3110 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
3112 } 3427 }
3113 3428
3114 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
3115} 3430}
3116 3431
3130=cut 3445=cut
3131 3446
3132sub register_script_function { 3447sub register_script_function {
3133 my ($fun, $cb) = @_; 3448 my ($fun, $cb) = @_;
3134 3449
3135 no strict 'refs'; 3450 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3451 *$fun = $safe_hole->wrap ($cb);
3137} 3452}
3138 3453
3139=back 3454=back
3140 3455
3141=cut 3456=cut
3150 # for this (global event?) 3465 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3152 3467
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154 3469
3155 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3156 3471
3157 my $facedata; 3472 my $facedata = decode_storable load_file $path;
3158 0 < aio_load $path, $facedata
3159 or die "$path: $!";
3160
3161 $facedata = Coro::Storable::thaw $facedata;
3162 3473
3163 $facedata->{version} == 2 3474 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3165 3476
3166 # patch in the exptable 3477 # patch in the exptable
3478 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3167 $facedata->{resource}{"res/exp_table"} = { 3479 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC, 3480 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3481 data => $exp_table,
3482 hash => (Digest::MD5::md5 $exp_table),
3170 }; 3483 };
3171 cf::cede_to_tick; 3484 cf::cede_to_tick;
3172 3485
3173 { 3486 {
3174 my $faces = $facedata->{faceinfo}; 3487 my $faces = $facedata->{faceinfo};
3176 while (my ($face, $info) = each %$faces) { 3489 while (my ($face, $info) = each %$faces) {
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3490 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3491
3179 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3183 3497
3184 cf::cede_to_tick; 3498 cf::cede_to_tick;
3185 } 3499 }
3186 3500
3187 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
3192 3506
3193 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3196 } else { 3510 } else {
3197 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
3198 } 3512 }
3199 3513
3200 cf::cede_to_tick; 3514 cf::cede_to_tick;
3201 } 3515 }
3202 } 3516 }
3211 3525
3212 cf::anim::invalidate_all; # d'oh 3526 cf::anim::invalidate_all; # d'oh
3213 } 3527 }
3214 3528
3215 { 3529 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3530 my $res = $facedata->{resource};
3219 3531
3220 while (my ($name, $info) = each %$res) { 3532 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3533 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3535
3225 if ($info->{type} & 1) { 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3537 cf::face::set_type $idx, $info->{type};
3240 } else { 3538 } else {
3241 $RESOURCE{$name} = $info; 3539 $RESOURCE{$name} = $info; # unused
3242 } 3540 }
3243 3541
3244 cf::cede_to_tick; 3542 cf::cede_to_tick;
3245 } 3543 }
3246 } 3544 }
3247 3545
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249 3547
3250 1 3548 1
3251} 3549}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272 3550
3273register_exticmd fx_want => sub { 3551register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_; 3552 my ($ns, $want) = @_;
3275 3553
3276 while (my ($k, $v) = each %$want) { 3554 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3555 $ns->fx_want ($k, $v);
3278 } 3556 }
3279}; 3557};
3558
3559sub load_resource_file($) {
3560 my $guard = lock_acquire "load_resource_file";
3561
3562 my $status = load_resource_file_ $_[0];
3563 get_slot 0.1, 100;
3564 cf::arch::commit_load;
3565
3566 $status
3567}
3280 3568
3281sub reload_regions { 3569sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3570 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3571 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3572 %ext::player_env::MUSIC_FACE_CACHE = ();
3298} 3586}
3299 3587
3300sub reload_archetypes { 3588sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3589 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3590 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3591}
3309 3592
3310sub reload_treasures { 3593sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
3313} 3596}
3314 3597
3598sub reload_sound {
3599 trace "loading sound config from $DATADIR/sound\n";
3600
3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3602
3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3604 my $sound = $soundconf->{compat}[$_]
3605 or next;
3606
3607 my $face = cf::face::find "sound/$sound->[1]";
3608 cf::sound::set $sound->[0] => $face;
3609 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3610 }
3611
3612 while (my ($k, $v) = each %{$soundconf->{event}}) {
3613 my $face = cf::face::find "sound/$v";
3614 cf::sound::set $k => $face;
3615 }
3616}
3617
3315sub reload_resources { 3618sub reload_resources {
3316 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3317 3620
3621 reload_exp_table;
3622 reload_materials;
3623 reload_facedata;
3624 reload_sound;
3625 reload_archetypes;
3318 reload_regions; 3626 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3627 reload_treasures;
3323 3628
3324 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3630}
3330 3631
3331sub reload_config { 3632sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3633 trace "reloading config file...\n";
3333 or return;
3334 3634
3335 local $/; 3635 my $config = load_file "$CONFDIR/config";
3336 *CFG = YAML::Load <$fh>; 3636 utf8::decode $config;
3637 *CFG = decode_yaml $config;
3337 3638
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3339 3640
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3342 3643
3343 if (exists $CFG{mlockall}) { 3644 if (exists $CFG{mlockall}) {
3347 }; 3648 };
3348 warn $@ if $@; 3649 warn $@ if $@;
3349 } 3650 }
3350} 3651}
3351 3652
3653sub pidfile() {
3654 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3655 or die "$PIDFILE: $!";
3656 flock $fh, &Fcntl::LOCK_EX
3657 or die "$PIDFILE: flock: $!";
3658 $fh
3659}
3660
3661# make sure only one server instance is running at any one time
3662sub atomic {
3663 my $fh = pidfile;
3664
3665 my $pid = <$fh>;
3666 kill 9, $pid if $pid > 0;
3667
3668 seek $fh, 0, 0;
3669 print $fh $$;
3670}
3671
3672sub main_loop {
3673 trace "EV::loop starting\n";
3674 if (1) {
3675 EV::loop;
3676 }
3677 trace "EV::loop returned\n";
3678 goto &main_loop unless $REALLY_UNLOOP;
3679}
3680
3352sub main { 3681sub main {
3682 cf::init_globals; # initialise logging
3683
3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3688
3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3690
3353 # we must not ever block the main coroutine 3691 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3692 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3693 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3694 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3695 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3696 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3697 })->prio (Coro::PRIO_MAX);
3360 }; 3698 };
3361 3699
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3700 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 3701
3702 cf::sync_job {
3703 cf::incloader::init ();
3704
3705 cf::init_anim;
3706 cf::init_attackmess;
3707 cf::init_dynamic;
3708
3709 cf::load_settings;
3710
3711 reload_resources;
3712 reload_config;
3713 db_init;
3714
3715 cf::init_uuid;
3716 cf::init_signals;
3717 cf::init_skills;
3718
3719 cf::init_beforeplay;
3720
3721 atomic;
3722
3723 load_extensions;
3724
3725 utime time, time, $RUNTIMEFILE;
3726
3727 # no (long-running) fork's whatsoever before this point(!)
3728 use POSIX ();
3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3730
3731 cf::_post_init 0;
3732 };
3733
3734 cf::object::thawer::errors_are_fatal 0;
3735 info "parse errors in files are no longer fatal from this point on.\n";
3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3742 goto &main_loop;
3369} 3743}
3370 3744
3371############################################################################# 3745#############################################################################
3372# initialisation and cleanup 3746# initialisation and cleanup
3373 3747
3374# install some emergency cleanup handlers 3748# install some emergency cleanup handlers
3375BEGIN { 3749BEGIN {
3376 our %SIGWATCHER = (); 3750 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 3751 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3752 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 3753 cf::cleanup "SIG$signal";
3380 }; 3754 };
3381 } 3755 }
3382} 3756}
3383 3757
3384sub write_runtime { 3758sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3759 my $t0 = AE::time;
3386 3760
3387 # first touch the runtime file to show we are still running: 3761 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3762 # the fsync below can take a very very long time.
3389 3763
3390 IO::AIO::aio_utime $runtime, undef, undef; 3764 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3765
3392 my $guard = cf::lock_acquire "write_runtime"; 3766 my $guard = cf::lock_acquire "write_runtime";
3393 3767
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3768 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 3769 or return;
3396 3770
3397 my $value = $cf::RUNTIME + 90 + 10; 3771 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3772 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3773 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3783 aio_utime $fh, undef, undef;
3410 3784
3411 close $fh 3785 close $fh
3412 or return; 3786 or return;
3413 3787
3414 aio_rename "$runtime~", $runtime 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3789 and return;
3416 3790
3417 warn "runtime file written.\n"; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 3792
3419 1 3793 1
3794}
3795
3796our $uuid_lock;
3797our $uuid_skip;
3798
3799sub write_uuid_sync($) {
3800 $uuid_skip ||= $_[0];
3801
3802 return if $uuid_lock;
3803 local $uuid_lock = 1;
3804
3805 my $uuid = "$LOCALDIR/uuid";
3806
3807 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3808 or return;
3809
3810 my $value = uuid_seq uuid_cur;
3811
3812 unless ($value) {
3813 info "cowardly refusing to write zero uuid value!\n";
3814 return;
3815 }
3816
3817 my $value = uuid_str $value + $uuid_skip;
3818 $uuid_skip = 0;
3819
3820 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3821 and return;
3822
3823 # always fsync - this file is important
3824 aio_fsync $fh
3825 and return;
3826
3827 close $fh
3828 or return;
3829
3830 aio_rename "$uuid~", $uuid
3831 and return;
3832
3833 trace "uuid file written ($value).\n";
3834
3835 1
3836
3837}
3838
3839sub write_uuid($$) {
3840 my ($skip, $sync) = @_;
3841
3842 $sync ? write_uuid_sync $skip
3843 : async { write_uuid_sync $skip };
3420} 3844}
3421 3845
3422sub emergency_save() { 3846sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3424 3848
3425 warn "enter emergency perl save\n"; 3849 info "emergency_perl_save: enter\n";
3850
3851 # this is a trade-off: we want to be very quick here, so
3852 # save all maps without fsync, and later call a global sync
3853 # (which in turn might be very very slow)
3854 local $USE_FSYNC = 0;
3426 3855
3427 cf::sync_job { 3856 cf::sync_job {
3857 cf::write_runtime_sync; # external watchdog should not bark
3858
3428 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3862 info "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3865 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3867 $pl->save;
3437 } 3868 }
3438 warn "end emergency player save\n"; 3869 info "emergency_perl_save: end player save\n";
3439 3870
3440 warn "begin emergency map save\n"; 3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 info "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3876 $map->valid or next;
3444 $map->save; 3877 $map->save;
3445 } 3878 }
3446 warn "end emergency map save\n"; 3879 info "emergency_perl_save: end map save\n";
3447 3880
3448 warn "begin emergency database checkpoint\n"; 3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 info "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3886
3887 info "emergency_perl_save: begin write uuid\n";
3888 write_uuid_sync 1;
3889 info "emergency_perl_save: end write uuid\n";
3890
3891 cf::write_runtime_sync; # external watchdog should not bark
3892
3893 trace "emergency_perl_save: syncing database to disk";
3894 BDB::db_env_txn_checkpoint $DB_ENV;
3895
3896 info "emergency_perl_save: starting sync\n";
3897 IO::AIO::aio_sync sub {
3898 info "emergency_perl_save: finished sync\n";
3899 };
3900
3901 cf::write_runtime_sync; # external watchdog should not bark
3902
3903 trace "emergency_perl_save: flushing outstanding aio requests";
3904 while (IO::AIO::nreqs || BDB::nreqs) {
3905 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3906 }
3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3451 }; 3909 };
3452 3910
3453 warn "leave emergency perl save\n"; 3911 info "emergency_perl_save: leave\n";
3454} 3912}
3455 3913
3456sub post_cleanup { 3914sub post_cleanup {
3457 my ($make_core) = @_; 3915 my ($make_core) = @_;
3458 3916
3917 IO::AIO::flush;
3918
3459 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3920 if $make_core;
3921
3922 my $fh = pidfile;
3923 unlink $PIDFILE if <$fh> == $$;
3924}
3925
3926# a safer delete_package, copied from Symbol
3927sub clear_package($) {
3928 my $pkg = shift;
3929
3930 # expand to full symbol table name if needed
3931 unless ($pkg =~ /^main::.*::$/) {
3932 $pkg = "main$pkg" if $pkg =~ /^::/;
3933 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3934 $pkg .= '::' unless $pkg =~ /::$/;
3935 }
3936
3937 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3938 my $stem_symtab = *{$stem}{HASH};
3939
3940 defined $stem_symtab and exists $stem_symtab->{$leaf}
3941 or return;
3942
3943 # clear all symbols
3944 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3945 for my $name (keys %$leaf_symtab) {
3946 _gv_clear *{"$pkg$name"};
3947# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3948 }
3461} 3949}
3462 3950
3463sub do_reload_perl() { 3951sub do_reload_perl() {
3464 # can/must only be called in main 3952 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3953 unless (in_main) {
3466 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3467 return; 3955 return;
3468 } 3956 }
3469 3957
3470 warn "reloading..."; 3958 return if $RELOAD++;
3471 3959
3472 warn "entering sync_job"; 3960 my $t1 = AE::time;
3473 3961
3962 while ($RELOAD) {
3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3965
3966 trace "perl_reload: entering sync_job";
3967
3474 cf::sync_job { 3968 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark
3476 cf::emergency_save; 3969 #cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark
3478 3970
3479 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV;
3481
3482 # if anything goes wrong in here, we should simply crash as we already saved
3483
3484 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs;
3490 warn "iterate...";
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = (); 3973 %EXT_CORO = ();
3498 3974
3499 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3500 %COMMAND = (); 3976 %COMMAND = ();
3501 3977
3502 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3503 %EXTCMD = (); 3979 %EXTCMD = ();
3504 %EXTICMD = (); 3980 %EXTICMD = ();
3505 3981
3506 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3507 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3509 3985
3510 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3511 eval { 3987 eval {
3512 $cb->($pkg); 3988 $cb->($pkg);
3513 1 3989 1
3514 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3991 }
3992
3993 trace "... clearing $pkg";
3994 clear_package $pkg;
3515 } 3995 }
3516 3996
3517 warn "... nuking $pkg";
3518 Symbol::delete_package $pkg;
3519 }
3520
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3522 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 4000
3525 warn "... unloading $k"; 4001 trace "... unloading $k";
3526 delete $INC{$k}; 4002 delete $INC{$k};
3527 4003
3528 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3530 4006
3531 if (my $cb = $k->can ("unload_module")) { 4007 if (my $cb = $k->can ("unload_module")) {
3532 $cb->(); 4008 $cb->();
4009 }
4010
4011 clear_package $k;
3533 } 4012 }
3534 4013
3535 Symbol::delete_package $k;
3536 }
3537
3538 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 4015 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 4017
3542 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 4021
3546 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3547 # and global variables created in xs 4023 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3549 4025
3550 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3551 4027
3552 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3553 require cf; 4029 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4030 cf::_connect_to_perl_1;
3555 4031
3556 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3557 cf::reload_config; 4033 cf::reload_config;
3558 4034
3559 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3560 cf::load_extensions; 4036 cf::load_extensions;
3561 4037
4038 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3565 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
4045 }
3568 4046
3569 warn "leaving sync_job"; 4047 cf::_post_init 1;
3570 4048
4049 trace "perl_reload: leaving sync_job";
4050
3571 1 4051 1
3572 } or do { 4052 } or do {
3573 warn $@; 4053 error $@;
3574 cf::cleanup "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
4055 };
4056
4057 --$RELOAD;
3575 }; 4058 }
3576 4059
3577 warn "reloaded"; 4060 $t1 = AE::time - $t1;
4061 info "perl_reload: completed in ${t1}s\n";
3578}; 4062};
3579 4063
3580our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3581 4065
3582sub reload_perl() { 4066sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 4067 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 4068 # coro crashes during coro_state_free->destroy here.
3585 4069
4070 $RELOAD_WATCHER ||= cf::async {
4071 Coro::AIO::aio_wait cache_extensions;
4072
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4073 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 4074 do_reload_perl;
3588 undef $RELOAD_WATCHER; 4075 undef $RELOAD_WATCHER;
4076 };
3589 }; 4077 };
3590} 4078}
3591 4079
3592register_command "reload" => sub { 4080register_command "reload" => sub {
3593 my ($who, $arg) = @_; 4081 my ($who, $arg) = @_;
3599 reload_perl; 4087 reload_perl;
3600 }; 4088 };
3601 } 4089 }
3602}; 4090};
3603 4091
3604unshift @INC, $LIBDIR; 4092#############################################################################
3605 4093
3606my $bug_warning = 0; 4094my $bug_warning = 0;
3607 4095
3608our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3610 4098
3611sub wait_for_tick { 4099sub wait_for_tick() {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3614 4101
3615 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 4104 $signal->wait;
3618} 4105}
3619 4106
3620sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3623 4109
3624 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 4112 $signal->wait;
3627} 4113}
3633 return; 4119 return;
3634 } 4120 }
3635 4121
3636 cf::server_tick; # one server iteration 4122 cf::server_tick; # one server iteration
3637 4123
4124 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4125
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4127 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 4128 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 4129 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 4130 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 4131 or error "ERROR: unable to write runtime file: $!";
3644 }; 4132 };
3645 } 4133 }
3646 4134
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3648 $sig->send; 4136 $sig->send;
3656 4144
3657 if (0) { 4145 if (0) {
3658 if ($NEXT_TICK) { 4146 if ($NEXT_TICK) {
3659 my $jitter = $TICK_START - $NEXT_TICK; 4147 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d# 4149 debug "jitter $JITTER\n";#d#
3662 } 4150 }
3663 } 4151 }
3664} 4152}
3665 4153
3666{ 4154{
3667 # configure BDB 4155 # configure BDB
3668 4156
3669 BDB::min_parallel 8; 4157 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4158 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4159 $AnyEvent::BDB::WATCHER->priority (1);
3672 4160
3673 unless ($DB_ENV) { 4161 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4162 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4163 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 4164 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4165 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4166 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4167 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4168
3680 cf::sync_job { 4169 cf::sync_job {
3681 eval { 4170 eval {
3707{ 4196{
3708 # configure IO::AIO 4197 # configure IO::AIO
3709 4198
3710 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4201 undef $AnyEvent::AIO::WATCHER;
3713} 4202}
3714 4203
3715my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
3716 4206
3717sub _log_backtrace { 4207sub _log_backtrace {
3718 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
3719 4209
3720 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
3721 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3722 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
3724 ++$_log_backtrace; 4218 ++$_log_backtrace;
4219 my $perl_bt = Carp::longmess $msg;
3725 async { 4220 async {
3726 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
3727 4222
3728 my @bt = fork_call { 4223 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4224 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4235 }
3741 4236
3742 @funcs 4237 @funcs
3743 }; 4238 };
3744 4239
3745 LOG llevInfo, "[ABT] $msg\n"; 4240 LOG llevInfo, "[ABT] $perl_bt\n";
4241 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4243 --$_log_backtrace;
3748 }; 4244 };
3749 } else { 4245 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3752 } 4248 }
3753} 4249}
3754 4250
3755# load additional modules 4251# load additional modules
3756use cf::pod; 4252require "cf/$_.pm" for @EXTRA_MODULES;
4253cf::_connect_to_perl_2;
3757 4254
3758END { cf::emergency_save } 4255END { cf::emergency_save }
3759 4256
37601 42571
3761 4258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines