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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines