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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 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 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB 1.6; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
51use Data::Dumper; 55use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 56use Fcntl;
54use YAML (); 57use YAML::XS ();
55use IO::AIO (); 58use IO::AIO ();
56use Time::HiRes; 59use Time::HiRes;
57use Compress::LZF; 60use Compress::LZF;
58use Digest::MD5 (); 61use Digest::MD5 ();
59 62
… …
61 64
62# configure various modules to our taste 65# configure various modules to our taste
63# 66#
64$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 75
68$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" };
69 78
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
74 85
75our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
85our $DATADIR = datadir; 99our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
89our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
95our %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;
96 120
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 123our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
101 125
102our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 129our $DB_ENV;
106 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
107our %CFG; 133our %CFG;
108 134
109our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 136our $RUNTIME;
111our $NOW; 137our $NOW;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 148our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
124 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
125binmode STDOUT; 156binmode STDOUT;
126binmode STDERR; 157binmode STDERR;
127 158
128# read virtual server time, if available 159# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
133} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
134 167
135mkdir $_ 168mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 170
138our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
139 172
140sub 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::"} };
141 189
142############################################################################# 190#############################################################################
143 191
144=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
145 193
… …
187from wherever your confdir points to. 235from wherever your confdir points to.
188 236
189=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
190 238
191These 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
192returns 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
193per 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.
194 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
195=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
196 249
197This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
198C<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
199that call. 252that call.
200 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
201=back 260=back
202 261
203=cut 262=cut
204 263
205BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
206 *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 {
207 my $msg = join "", @_; 271 my $msg = join "", @_;
208 272
209 $msg .= "\n" 273 $msg .= "\n"
210 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
211 275
212 $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;
213 277
214 LOG llevError, $msg; 278 LOG llevWarn, $msg;
215 }; 279};
216}
217 280
218$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
220 283
221 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 288 return;#d#
224 }#d# 289 }#d#
225 290
226 # kill coroutine otherwise 291 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 292 Coro::terminate
229}; 293};
230
231$SIG{__DIE__} = sub { }; #d#?
232 294
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
246 cf::client cf::player 308 cf::client cf::player
247 cf::arch cf::living 309 cf::arch cf::living
248 cf::map cf::mapspace 310 cf::map cf::mapspace
249 cf::party cf::region 311 cf::party cf::region
250)) { 312)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 314}
254 315
255$EV::DIED = sub { 316$EV::DIED = sub {
256 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
257}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
258 324
259############################################################################# 325#############################################################################
260 326
261=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
262 328
… …
283 $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;
284 $d 350 $d
285 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
286} 352}
287 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
288=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
289 369
290Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
291 371
292=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
298our $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
299 379
300sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
302 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
303=item cf::lock_wait $string 445=item cf::lock_wait $string
304 446
305Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
306 448
307=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
308 450
309Wait 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
310a 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,
311for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
312returned. 454returned.
313 455
314Locks 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
315deadlocked coro. 457deadlocked coro.
… …
321 463
322Return 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.
323 465
324=cut 466=cut
325 467
326our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 469
329sub lock_wait($) { 470sub lock_wait($) {
330 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 472}
343 473
344sub lock_acquire($) { 474sub lock_acquire($) {
345 my ($key) = @_; 475 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 476}
359 477
360sub lock_active($) { 478sub lock_active($) {
361 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 480}
365 481
366sub freeze_mainloop { 482sub freeze_mainloop {
367 tick_inhibit_inc; 483 tick_inhibit_inc;
368 484
369 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
370} 486}
371 487
372=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
373 489
374Like 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
375get spread over timer. 491get spread over time.
376 492
377=cut 493=cut
378 494
379sub periodic($$) { 495sub periodic($$) {
380 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
384 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
385} 501}
386 502
387=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
388 504
389Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
390This 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
391of 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.
392 512
393The 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
394used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
395 515
396Useful for short background jobs. 516Useful for short background jobs.
397 517
398=cut 518=cut
399 519
400our @SLOT_QUEUE; 520our @SLOT_QUEUE;
401our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
402 523
403$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
404$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
406 527
407 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
408 530
409 while () { 531 while () {
410 next_job: 532 next_job:
533
411 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
412 if ($avail > 0.01) { 535
413 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
414 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
415 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
416 $job->[2]->send; 540 $job->[2]->send;
417 Coro::cede; 541 Coro::cede;
418 goto next_job; 542 goto next_job;
419 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
420 } 545 }
421 } 546 }
422 547
423 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
424 # 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
425 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
426 $signal->wait; 551 $signal->wait;
427 } else { 552 } else {
553 $busy = 0;
428 Coro::schedule; 554 Coro::schedule;
429 } 555 }
430 } 556 }
431}; 557};
432 558
433sub get_slot($;$$) { 559sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
435 561
436 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
437 563
438 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
439 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
440 567
441 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
442 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
443 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
… …
469=cut 596=cut
470 597
471sub sync_job(&) { 598sub sync_job(&) {
472 my ($job) = @_; 599 my ($job) = @_;
473 600
474 if ($Coro::current == $Coro::main) { 601 if (in_main) {
475 my $time = EV::time; 602 my $time = AE::time;
476 603
477 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
478 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
479 606
480 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
481 608
482 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
483 610
484 my $busy = 1; 611 my $busy = 1;
485 my @res; 612 my @res;
486 613
487 (async { 614 (async {
488 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
489 @res = eval { $job->() }; 616 @res = eval { $job->() };
490 warn $@ if $@; 617 error $@ if $@;
491 undef $busy; 618 undef $busy;
492 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
493 620
494 while ($busy) { 621 while ($busy) {
495 if (Coro::nready) { 622 if (Coro::nready) {
… …
497 } else { 624 } else {
498 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
499 } 626 }
500 } 627 }
501 628
502 my $time = EV::time - $time; 629 my $time = AE::time - $time;
503 630
504 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
505 632
506 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
507 } else { 634 } else {
… …
529 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
530 657
531 $coro 658 $coro
532} 659}
533 660
534=item fork_call { }, $args 661=item fork_call { }, @args
535 662
536Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
537process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
538Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
539never block itself or use any form of event handling. 666never block itself or use any form of event handling.
540 667
541=cut 668=cut
542 669
670sub post_fork {
671 reset_signals;
672}
673
543sub fork_call(&@) { 674sub fork_call(&@) {
544 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
545 676
546 # 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,
547 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
548 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
549 680
550 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
551 reset_signals; 682 cf::post_fork;
552 &$cb 683 &$cb
553 }, @args; 684 } @args;
554 685
555 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 )
556} 698}
557 699
558=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
559 701
560=cut 702=cut
… …
597within each server. 739within each server.
598 740
599=cut 741=cut
600 742
601sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
602 my ($name) = @_; 747 my ($name) = @_;
603 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
604 749
605 eval { 750 eval {
606 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
616} 761}
617 762
618our $DB; 763our $DB;
619 764
620sub db_init { 765sub db_init {
621 cf::sync_job {
622 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
623 };
624} 767}
625 768
626sub db_get($$) { 769sub db_get($$) {
627 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
628 771
629 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
630 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
631 776
632 $! ? () 777 $! ? ()
633 : $data 778 : $data
634 }
635} 779}
636 780
637sub db_put($$$) { 781sub db_put($$$) {
638 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
639 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
667 811
668 my @data; 812 my @data;
669 my $md5; 813 my $md5;
670 814
671 for (0 .. $#$src) { 815 for (0 .. $#$src) {
672 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
673 or Carp::croak "$src->[$_]: $!";
674 } 817 }
675 818
676 # if processing is expensive, check 819 # if processing is expensive, check
677 # checksum first 820 # checksum first
678 if (1) { 821 if (1) {
… …
695 838
696 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
697 my $data = $process->(\@data); 840 my $data = $process->(\@data);
698 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
699 842
700 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
701 844
702 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
703 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
704 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
705 848
… …
715 858
716=cut 859=cut
717 860
718sub datalog($@) { 861sub datalog($@) {
719 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
720 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
721} 864}
722 865
723=back 866=back
724 867
725=cut 868=cut
726 869
727############################################################################# 870#############################################################################
728 871
729=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
730 873
731Many 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
732attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
734 877
735In 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>
736C<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
… …
786=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
787 930
788Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
790 933
791Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
792that 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.
793 936
794These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
795 938
796=over 4 939=over 4
… …
920 1063
921 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
922 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
923 1066
924 } elsif (ref $type) { 1067 } elsif (ref $type) {
925 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
926 1069
927 } else { 1070 } else {
928 shift @arg; 1071 shift @arg;
929 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
930 } 1073 }
931 } 1074 }
932} 1075}
933 1076
934sub _object_attach { 1077sub _object_attach {
… …
944 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
945 } 1088 }
946 1089
947 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
948 } else { 1091 } else {
949 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
950 } 1093 }
951 1094
952 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
953} 1096}
954 1097
… …
1013 1156
1014 for (@$callbacks) { 1157 for (@$callbacks) {
1015 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1016 1159
1017 if ($@) { 1160 if ($@) {
1018 warn "$@";
1019 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1020 override; 1162 override;
1021 } 1163 }
1022 1164
1023 return 1 if $override; 1165 return 1 if $override;
1024 } 1166 }
… …
1087 1229
1088sub reattach { 1230sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1232 my ($obj) = @_;
1091 1233
1234 # no longer needed after getting rid of delete_package?
1092 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
1093 1236
1094 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1095 1238
1096 @$registry = (); 1239 @$registry = ();
1097 1240
… …
1102 for (@$attach) { 1245 for (@$attach) {
1103 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1104 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1105 } 1248 }
1106 } else { 1249 } else {
1107 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1108 } 1251 }
1109 } 1252 }
1110} 1253}
1111 1254
1112cf::attachable->attach ( 1255cf::attachable->attach (
… …
1139 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1140 1283
1141 sync_job { 1284 sync_job {
1142 if (length $$rdata) { 1285 if (length $$rdata) {
1143 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1144 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1145 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1146 1290
1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1148 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1150 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 }
1151 aio_close $fh; 1298 aio_close $fh;
1152 1299
1153 if (@$objs) { 1300 if (@$objs) {
1154 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) {
1155 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1157 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1158 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 }
1159 aio_close $fh; 1309 aio_close $fh;
1160 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1161 } 1311 }
1162 } else { 1312 } else {
1163 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1164 } 1314 }
1165 1315
1166 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1320 } else {
1168 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1169 } 1322 }
1170 } else { 1323 } else {
1171 aio_unlink $filename; 1324 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1173 } 1326 }
… …
1197 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1198 $av = $st->{objs}; 1351 $av = $st->{objs};
1199 } 1352 }
1200 1353
1201 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1202 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1203 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1204 1358
1205 ($data, $av) 1359 ($data, $av)
1206} 1360}
1207 1361
1208=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1264 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1265 1419
1266 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1267} 1421}
1268 1422
1423use File::Glob ();
1424
1269cf::player->attach ( 1425cf::player->attach (
1270 on_command => sub { 1426 on_unknown_command => sub {
1271 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1272 1428
1273 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1274 or return; 1430 or return;
1275 1431
… …
1298 1454
1299 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1300 if $reply; 1456 if $reply;
1301 1457
1302 } else { 1458 } else {
1303 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1304 } 1460 }
1305 1461
1306 cf::override; 1462 cf::override;
1307 }, 1463 },
1308); 1464);
1309 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
1310sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1311 cf::sync_job { 1482 cf::sync_job {
1312 my %todo; 1483 my %todo;
1313 1484
1314 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1315 next unless -r $path; 1486 next unless -r $path;
… …
1333 1504
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1507
1337 $ext{source} = 1508 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1339 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1340 . $source 1511 . $source
1341 . "\n};\n1"; 1512 . "\n};\n1";
1342 1513
1343 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1344 } 1515 }
1345 1516
1517 my $pass = 0;
1346 my %done; 1518 my %done;
1347 while (%todo) { 1519 while (%todo) {
1348 my $progress; 1520 my $progress;
1349 1521
1522 ++$pass;
1523
1524 ext:
1350 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1351 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1352 goto skip 1527 next ext
1353 unless exists $done{$_}; 1528 unless exists $done{$_};
1354 } 1529 }
1355 1530
1356 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1357 1532
1358 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1359 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1360 : "$v->{base}: extension inactive.\n";
1361 1537
1362 if (exists $v->{meta}{mandatory}) {
1363 warn $msg;
1364 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1365 } 1539 if exists $v->{meta}{mandatory};
1366 1540
1367 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;
1368 } 1550 }
1369
1370 $done{$k} = delete $todo{$k};
1371 push @EXTS, $v->{pkg};
1372 $progress = 1;
1373 } 1551 }
1374 1552
1375 skip: 1553 unless ($progress) {
1376 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1377 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 }
1378 } 1563 }
1379 }; 1564 };
1380} 1565}
1381 1566
1382############################################################################# 1567#############################################################################
1383 1568
1384=back 1569=back
1385 1570
1386=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1387 1572
1388Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1389 1574
1390=cut 1575=cut
1391 1576
1392package cf::player; 1577package cf::player;
1393 1578
… …
1436 1621
1437sub exists($) { 1622sub exists($) {
1438 my ($login) = @_; 1623 my ($login) = @_;
1439 1624
1440 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1442} 1627}
1443 1628
1444sub find($) { 1629sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1631 my $login = $_[0];
… …
1466 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1467 } 1652 }
1468 } 1653 }
1469} 1654}
1470 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
1471sub save($) { 1669sub save($) {
1472 my ($pl) = @_; 1670 my ($pl) = @_;
1473 1671
1474 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1475 1673
… …
1480 1678
1481 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1482 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1483 1681
1484 cf::get_slot 0.01; 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];
1485 1686
1486 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1487 cf::cede_to_tick; 1688 cf::cede_to_tick;
1488} 1689}
1489 1690
… …
1521 my ($pl) = @_; 1722 my ($pl) = @_;
1522 1723
1523 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1524 1725
1525 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1526 $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
1527 1728
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1529 $pl->deactivate; 1730 $pl->deactivate;
1731
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1532 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1533 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1534 1737
1535 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1536 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1537 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1591 \@logins 1794 \@logins
1592} 1795}
1593 1796
1594=item $player->maps 1797=item $player->maps
1595 1798
1799=item cf::player::maps $login
1800
1596Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1597player. May block. 1802player. May block.
1598 1803
1599=cut 1804=cut
1600 1805
… …
1617 } 1822 }
1618 1823
1619 \@paths 1824 \@paths
1620} 1825}
1621 1826
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1828
1624Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714 1830
1715=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1716 1832
1717Sends an ext reply to the player. 1833Sends an ext reply to the player.
1718 1834
… …
1750 1866
1751=cut 1867=cut
1752 1868
1753sub find_by_path($) { 1869sub find_by_path($) {
1754 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1755 1873
1756 my ($match, $specificity); 1874 my ($match, $specificity);
1757 1875
1758 for my $region (list) { 1876 for my $region (list) {
1759 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
… …
1788sub generate_random_map { 1906sub generate_random_map {
1789 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1790 1908
1791 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
1792 1910
1793 # mit "rum" bekleckern, nicht
1794 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1798 $rmp->{exit_on_final_map},
1799 $rmp->{xsize}, $rmp->{ysize},
1800 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1801 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1802 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1803 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1804 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1805 (cf::region::find $rmp->{region}), $rmp->{custom}
1806 )
1807} 1912}
1808 1913
1809=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1810 1915
1811Register 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
… …
1816 1921
1817sub register { 1922sub register {
1818 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1819 my $pkg = caller; 1924 my $pkg = caller;
1820 1925
1821 no strict;
1822 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1823 1927
1824 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1825} 1929}
1826 1930
1827# also paths starting with '/' 1931# also paths starting with '/'
1828$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1829 1933
1830sub thawer_merge { 1934sub thawer_merge {
1831 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1832 1936
1833 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1838} 1942}
1839 1943
1840sub normalise { 1944sub normalise {
1841 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1842 1946
1843 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1844 1948
1845 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1846 1950
1847 # map plan: 1951 # map plan:
1848 # 1952 #
… …
1863 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1864 $path = "$base/$path"; 1968 $path = "$base/$path";
1865 } 1969 }
1866 1970
1867 for ($path) { 1971 for ($path) {
1868 redo if s{//}{/};
1869 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1870 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1871 } 1974 }
1872 1975
1873 $path 1976 $path
… …
1887 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1888 return $self; 1991 return $self;
1889 } 1992 }
1890 } 1993 }
1891 1994
1892 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1893 () 1996 ()
1894} 1997}
1895 1998
1999# may re-bless or do other evil things
1896sub init { 2000sub init {
1897 my ($self) = @_; 2001 my ($self) = @_;
1898 2002
1899 $self 2003 $self
1900} 2004}
… …
1931 2035
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1934} 2038}
1935 2039
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943}
1944
1945sub decay_objects { 2040sub decay_objects {
1946 my ($self) = @_; 2041 my ($self) = @_;
1947 2042
1948 return if $self->{deny_reset}; 2043 return if $self->{deny_reset};
1949 2044
… …
1974 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1975 2070
1976 1 2071 1
1977} 2072}
1978 2073
2074# used to laod the header of an original map
1979sub load_header_orig { 2075sub load_header_orig {
1980 my ($self) = @_; 2076 my ($self) = @_;
1981 2077
1982 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1983} 2079}
1984 2080
2081# used to laod the header of an instantiated map
1985sub load_header_temp { 2082sub load_header_temp {
1986 my ($self) = @_; 2083 my ($self) = @_;
1987 2084
1988 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1989} 2086}
1990 2087
2088# called after loading the header from an instantiated map
1991sub prepare_temp { 2089sub prepare_temp {
1992 my ($self) = @_; 2090 my ($self) = @_;
1993 2091
1994 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1995 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1996 # safety 2094 # safety
1997 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1998 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1999} 2097}
2000 2098
2099# called after loading the header from an original map
2001sub prepare_orig { 2100sub prepare_orig {
2002 my ($self) = @_; 2101 my ($self) = @_;
2003 2102
2004 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
2005 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
2029 2128
2030sub find; 2129sub find;
2031sub find { 2130sub find {
2032 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2033 2132
2133 cf::cede_to_tick;
2134
2034 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2035 2136
2036 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2139
2039 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
2044 or return; 2142 or return;
2045 2143
2046 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
2047 2145
… …
2059 2157
2060 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
2061 } 2159 }
2062} 2160}
2063 2161
2064sub pre_load { } 2162sub pre_load { }
2065sub post_load { } 2163#sub post_load { } # XS
2066 2164
2067sub load { 2165sub load {
2068 my ($self) = @_; 2166 my ($self) = @_;
2069 2167
2070 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
… …
2073 2171
2074 { 2172 {
2075 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
2076 2174
2077 return unless $self->valid; 2175 return unless $self->valid;
2078 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->state == cf::MAP_SWAPPED;
2079
2080 $self->in_memory (cf::MAP_LOADING);
2081 2177
2082 $self->alloc; 2178 $self->alloc;
2083 2179
2084 $self->pre_load; 2180 $self->pre_load;
2085 cf::cede_to_tick; 2181 cf::cede_to_tick;
2086 2182
2183 if (exists $self->{load_path}) {
2087 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2088 $f->skip_block; 2185 $f->skip_block;
2089 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
2090 or return; 2187 or return;
2091 2188
2092 $self->post_load_original 2189 $self->post_load_original
2093 if delete $self->{load_original}; 2190 if delete $self->{load_original};
2094 2191
2095 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
2096 utf8::encode $uniq; 2193 utf8::encode $uniq;
2097 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
2098 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
2099 $self->clear_unique_items; 2196 $self->clear_unique_items;
2100 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
2101 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
2102 } 2200 }
2103 } 2201 }
2104 }
2105 2202
2106 $f->resolve_delayed_derefs; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->state (cf::MAP_INACTIVE);
2107 2210
2108 cf::cede_to_tick; 2211 cf::cede_to_tick;
2109 # now do the right thing for maps 2212 # now do the right thing for maps
2110 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2111 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2115 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2219 $self->decay_objects;
2117 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2118 $self->update_buttons; 2221 $self->update_buttons;
2119 cf::cede_to_tick; 2222 cf::cede_to_tick;
2120 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
2121 cf::cede_to_tick;
2122 $self->activate;
2123 } 2224 }
2124 2225
2125 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2127
2128 $self->in_memory (cf::MAP_ACTIVE);
2129 } 2228 }
2130 2229
2131 $self->post_load; 2230 $self->post_load;
2132}
2133 2231
2232 1
2233}
2234
2235# customize the map for a given player, i.e.
2236# return the _real_ map. used by e.g. per-player
2237# maps to change the path to ~playername/mappath
2134sub customise_for { 2238sub customise_for {
2135 my ($self, $ob) = @_; 2239 my ($self, $ob) = @_;
2136 2240
2137 return find "~" . $ob->name . "/" . $self->{path} 2241 return find "~" . $ob->name . "/" . $self->{path}
2138 if $self->per_player; 2242 if $self->per_player;
… …
2154 or next; 2258 or next;
2155 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
2156 or next; 2260 or next;
2157 $neigh->load; 2261 $neigh->load;
2158 2262
2263 # now find the diagonal neighbours
2159 push @neigh, 2264 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 } 2267 }
2163 2268
… …
2170} 2275}
2171 2276
2172sub find_sync { 2277sub find_sync {
2173 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2174 2279
2175 cf::sync_job { find $path, $origin } 2280 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2282 if $Coro::current == $Coro::main;
2283
2284 find $path, $origin
2176} 2285}
2177 2286
2178sub do_load_sync { 2287sub do_load_sync {
2179 my ($map) = @_; 2288 my ($map) = @_;
2180 2289
2290 # it's a bug to call this from the main context
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2183 2293
2184 cf::sync_job { $map->load }; 2294 $map->load;
2185} 2295}
2186 2296
2187our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2189 2299
2190sub find_async { 2300sub find_async {
2191 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2192 2302
2193 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2194 2304
2195 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->linkable;
2197 } 2307 }
2198 2308
2199 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2200 2310
2201 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
… …
2215 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2216 2326
2217 () 2327 ()
2218} 2328}
2219 2329
2330# common code, used by both ->save and ->swapout
2220sub save { 2331sub _save {
2221 my ($self) = @_; 2332 my ($self) = @_;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2333
2225 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2226 2335
2227 return unless $self->dirty; 2336 return unless $self->dirty;
2228 2337
… …
2248 } else { 2357 } else {
2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2250 } 2359 }
2251} 2360}
2252 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2253sub swap_out { 2370sub swap_out {
2254 my ($self) = @_; 2371 my ($self) = @_;
2255 2372
2256 # save first because save cedes
2257 $self->save;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2261 return if $self->players; 2377 return if $self->players;
2262 return if $self->in_memory != cf::MAP_ACTIVE; 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2382 $self->state (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2263 return if $self->{deny_save}; 2395 return 1e99 if $self->{deny_reset};
2264 2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2265 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->state (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2266 2429
2267 $self->deactivate; 2430 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear; 2432 $self->clear;
2270}
2271
2272sub reset_at {
2273 my ($self) = @_;
2274
2275 # TODO: safety, remove and allow resettable per-player maps
2276 return 1e99 if $self->{deny_reset};
2277
2278 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2279 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2280
2281 $time + $to
2282}
2283
2284sub should_reset {
2285 my ($self) = @_;
2286
2287 $self->reset_at <= $cf::RUNTIME
2288}
2289
2290sub reset {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 return if $self->players;
2296
2297 warn "resetting map ", $self->path;
2298
2299 $self->in_memory (cf::MAP_SWAPPED);
2300
2301 # need to save uniques path
2302 unless ($self->{deny_save}) {
2303 my $uniq = $self->uniq_path; utf8::encode $uniq;
2304
2305 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2306 if $uniq;
2307 }
2308
2309 delete $cf::MAP{$self->path};
2310
2311 $self->deactivate;
2312 $_->clear_links_to ($self) for values %cf::MAP;
2313 $self->clear;
2314 2433
2315 $self->unlink_save; 2434 $self->unlink_save;
2316 $self->destroy; 2435 $self->destroy;
2317} 2436}
2318 2437
… …
2326 2445
2327 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2328 2447
2329 $self->unlink_save; 2448 $self->unlink_save;
2330 2449
2331 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2332 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2333 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2334 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2335 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2336 2455
… …
2393 : normalise $_ 2512 : normalise $_
2394 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2395 ] 2514 ]
2396} 2515}
2397 2516
2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2548
2398=back 2549=back
2399 2550
2400=head3 cf::object 2551=head3 cf::object
2401 2552
2402=cut 2553=cut
… …
2467 2618
2468our $SAY_CHANNEL = { 2619our $SAY_CHANNEL = {
2469 id => "say", 2620 id => "say",
2470 title => "Map", 2621 title => "Map",
2471 reply => "say ", 2622 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2473}; 2624};
2474 2625
2475our $CHAT_CHANNEL = { 2626our $CHAT_CHANNEL = {
2476 id => "chat", 2627 id => "chat",
2477 title => "Chat", 2628 title => "Chat",
… …
2532 2683
2533=item $player_object->enter_link 2684=item $player_object->enter_link
2534 2685
2535Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2536 2687
2537The player should be reasonably safe there for short amounts of time. You 2688The player should be reasonably safe there for short amounts of time (e.g.
2538I<MUST> call C<leave_link> as soon as possible, though. 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2690though, as the player cannot control the character while it is on the link
2691map.
2539 2692
2540Will never block. 2693Will never block.
2541 2694
2542=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2543 2696
… …
2563sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2564 my ($self) = @_; 2717 my ($self) = @_;
2565 2718
2566 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2567 2720
2721 ++$self->{_link_recursion};
2722
2568 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2569 2724
2570 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2571 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2572 2727
2573 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2574} 2729}
2575 2730
2576sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2577 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2578 2733
… …
2595 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2596 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2597 2752
2598 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2599 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2600 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2601 2756
2602 $map->load; 2757 $map->load;
2603 $map->load_neighbours; 2758 $map->load_neighbours;
2604 2759
2605 return unless $self->contr->active; 2760 return unless $self->contr->active;
2606 $self->activate_recursive;
2607 2761
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2610} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2611 2769
2770}
2771
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613 2773
2614Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2615her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2616that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2617the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
… …
2624 2784
2625our $GOTOGEN; 2785our $GOTOGEN;
2626 2786
2627sub cf::object::player::goto { 2787sub cf::object::player::goto {
2628 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2629 2795
2630 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2798
2633 $self->enter_link; 2799 $self->enter_link;
… …
2653 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2654 } 2820 }
2655 } 2821 }
2656 2822
2657 my $map = eval { 2823 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659 2825
2660 if ($map) { 2826 if ($map) {
2661 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2829 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 } 2831 }
2666 2832
2667 $map 2833 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2678 } 2844 }
2679 2845
2680 $done->() if $done; 2846 $done->($self) if $done;
2681 })->prio (1); 2847 })->prio (1);
2682} 2848}
2683 2849
2684=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2685 2851
… …
2753 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2754 2920
2755 unless (eval { 2921 unless (eval {
2756 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2757 2923
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2767 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2769 2950
2770 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2771 2952
2772 # if exit is damned, update players death & WoR home-position 2953 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y) 2954 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 2955 if $exit->flag (cf::FLAG_DAMNED);
2775 2956
2776 1 2957 1
2777 }) { 2958 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "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. "
2780 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2963
2783 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2965 $self->leave_link;
2785 } 2966 }
2786 })->prio (1); 2967 })->prio (1);
2787} 2968}
2788 2969
… …
2800sub cf::client::send_drawinfo { 2981sub cf::client::send_drawinfo {
2801 my ($self, $text, $flags) = @_; 2982 my ($self, $text, $flags) = @_;
2802 2983
2803 utf8::encode $text; 2984 utf8::encode $text;
2804 $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);
2805} 3011}
2806 3012
2807=item $client->send_msg ($channel, $msg, $color, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2808 3014
2809Send 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
… …
2813 3019
2814=cut 3020=cut
2815 3021
2816# non-persistent channels (usually the info channel) 3022# non-persistent channels (usually the info channel)
2817our %CHANNEL = ( 3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
2818 "c/identify" => { 3030 "c/identify" => {
2819 id => "infobox", 3031 id => "infobox",
2820 title => "Identify", 3032 title => "Identify",
2821 reply => undef, 3033 reply => undef,
2822 tooltip => "Items recently identified", 3034 tooltip => "Items recently identified",
… …
2824 "c/examine" => { 3036 "c/examine" => {
2825 id => "infobox", 3037 id => "infobox",
2826 title => "Examine", 3038 title => "Examine",
2827 reply => undef, 3039 reply => undef,
2828 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",
2829 }, 3047 },
2830 "c/book" => { 3048 "c/book" => {
2831 id => "infobox", 3049 id => "infobox",
2832 title => "Book", 3050 title => "Book",
2833 reply => undef, 3051 reply => undef,
… …
2849 id => "infobox", 3067 id => "infobox",
2850 title => "Body Parts", 3068 title => "Body Parts",
2851 reply => undef, 3069 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 3070 tooltip => "Shows which body parts you posess and are available",
2853 }, 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 },
2854 "c/uptime" => { 3108 "c/uptime" => {
2855 id => "infobox", 3109 id => "infobox",
2856 title => "Uptime", 3110 title => "Uptime",
2857 reply => undef, 3111 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 3112 tooltip => "How long the server has been running since last restart",
… …
2867 id => "party", 3121 id => "party",
2868 title => "Party", 3122 title => "Party",
2869 reply => "gsay ", 3123 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 3124 tooltip => "Messages and chat related to your party",
2871 }, 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,
2872); 3134);
2873 3135
2874sub cf::client::send_msg { 3136sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 3137 my ($self, $channel, $msg, $color, @extra) = @_;
2876 3138
2877 $msg = $self->pl->expand_cfpod ($msg); 3139 $msg = $self->pl->expand_cfpod ($msg)
3140 unless $color & cf::NDI_VERBATIM;
2878 3141
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 3142 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 3143
2881 # check predefined channels, for the benefit of C 3144 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 3145 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 3146 $channel = $CHANNEL{$channel};
2884 3147
2885 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2889 3150
2890 } elsif (ref $channel) { 3151 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 3152 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 3153 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 3154 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 3155 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 3156 }
2897 3157
2898 $channel = $channel->{id}; 3158 $channel = $channel->{id};
2899 } 3159 }
2900 3160
2901 return unless @extra || length $msg; 3161 return unless @extra || length $msg;
2902 3162
2903 if ($self->can_msg) {
2904 # default colour, mask it out 3163 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3164 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 3165 if $color & cf::NDI_DEF;
2907 3166
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3167 my $pkt = "msg "
3168 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 3170 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 3171
2922 $color &= cf::NDI_COLOR_MASK; 3172 $self->send_big_packet ($pkt);
2923
2924 utf8::encode $msg;
2925
2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 }
2935} 3173}
2936 3174
2937=item $client->ext_msg ($type, @msg) 3175=item $client->ext_msg ($type, @msg)
2938 3176
2939Sends an ext event to the client. 3177Sends an ext event to the client.
… …
2942 3180
2943sub cf::client::ext_msg($$@) { 3181sub cf::client::ext_msg($$@) {
2944 my ($self, $type, @msg) = @_; 3182 my ($self, $type, @msg) = @_;
2945 3183
2946 if ($self->extcmd == 2) { 3184 if ($self->extcmd == 2) {
2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove 3186 } elsif ($self->extcmd == 1) { # TODO: remove
2949 push @msg, msgtype => "event_$type"; 3187 push @msg, msgtype => "event_$type";
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3189 }
2952} 3190}
2953 3191
2954=item $client->ext_reply ($msgid, @msg) 3192=item $client->ext_reply ($msgid, @msg)
2955 3193
… …
2959 3197
2960sub cf::client::ext_reply($$@) { 3198sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_; 3199 my ($self, $id, @msg) = @_;
2962 3200
2963 if ($self->extcmd == 2) { 3201 if ($self->extcmd == 2) {
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) { 3203 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove 3204 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id; 3205 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 } 3207 }
2970} 3208}
2971 3209
2972=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2973 3211
… …
3044 3282
3045 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
3046 if $reply; 3284 if $reply;
3047 3285
3048 } else { 3286 } else {
3049 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";
3050 } 3288 }
3051 3289
3052 cf::override; 3290 cf::override;
3053 }, 3291 },
3054); 3292);
… …
3074 3312
3075 $coro 3313 $coro
3076} 3314}
3077 3315
3078cf::client->attach ( 3316cf::client->attach (
3079 on_destroy => sub { 3317 on_client_destroy => sub {
3080 my ($ns) = @_; 3318 my ($ns) = @_;
3081 3319
3082 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3083 }, 3321 },
3084); 3322);
… …
3100our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
3101 3339
3102$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
3103 3341
3104$safe->permit_only (Opcode::opset qw( 3342$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math 3343 :base_core :base_mem :base_orig :base_math :base_loop
3106 grepstart grepwhile mapstart mapwhile 3344 grepstart grepwhile mapstart mapwhile
3107 sort time 3345 sort time
3108)); 3346));
3109 3347
3110# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
… …
3114The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
3115 3353
3116 cf::object 3354 cf::object
3117 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
3118 insert remove name archname title slaying race decrease split 3356 insert remove name archname title slaying race decrease split
3357 value
3119 3358
3120 cf::object::player 3359 cf::object::player
3121 player 3360 player
3122 3361
3123 cf::player 3362 cf::player
… …
3129=cut 3368=cut
3130 3369
3131for ( 3370for (
3132 ["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
3133 insert remove inv nrof name archname title slaying race 3372 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3138) { 3377) {
3139 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3142 for @funs; 3380 for @funs;
3143} 3381}
3144 3382
… …
3159 3397
3160 my $qcode = $code; 3398 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
3163 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
3164 local $_; 3405 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars;
3166 3406
3167 my $eval = 3407 my $eval =
3168 "do {\n" 3408 "do {\n"
3169 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3170 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
3171 . $code 3411 . $code
3172 . "\n}" 3412 . "\n}"
3173 ; 3413 ;
3174 3414
3415 if ($CFG{safe_eval}) {
3175 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
3176 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3177 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 }
3178 3424
3179 if ($@) { 3425 if ($@) {
3180 warn "$@"; 3426 warn "$@",
3181 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3182 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3183 } 3429 }
3184 3430
3185 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3186} 3432}
3187 3433
… …
3201=cut 3447=cut
3202 3448
3203sub register_script_function { 3449sub register_script_function {
3204 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
3205 3451
3206 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
3207 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
3208} 3454}
3209 3455
3210=back 3456=back
3211 3457
3212=cut 3458=cut
… …
3221 # for this (global event?) 3467 # for this (global event?)
3222 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3223 3469
3224 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3225 3471
3226 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3227 3473
3228 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3229 0 < aio_load $path, $facedata
3230 or die "$path: $!";
3231
3232 $facedata = Coro::Storable::thaw $facedata;
3233 3475
3234 $facedata->{version} == 2 3476 $facedata->{version} == 2
3235 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3236 3478
3237 # 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]);
3238 $facedata->{resource}{"res/exp_table"} = { 3481 $facedata->{resource}{"res/exp_table"} = {
3239 type => FT_RSRC, 3482 type => FT_RSRC,
3240 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),
3241 }; 3485 };
3242 cf::cede_to_tick; 3486 cf::cede_to_tick;
3243 3487
3244 { 3488 {
3245 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
… …
3247 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
3248 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249 3493
3250 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3251 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3253 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} ;
3254 3499
3255 cf::cede_to_tick; 3500 cf::cede_to_tick;
3256 } 3501 }
3257 3502
3258 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
… …
3263 3508
3264 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3265 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3266 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3267 } else { 3512 } else {
3268 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3269 } 3514 }
3270 3515
3271 cf::cede_to_tick; 3516 cf::cede_to_tick;
3272 } 3517 }
3273 } 3518 }
… …
3282 3527
3283 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
3284 } 3529 }
3285 3530
3286 { 3531 {
3287 # TODO: for gcfclient pleasure, we should give resources
3288 # that gcfclient doesn't grok a >10000 face index.
3289 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
3290 3533
3291 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
3292 if (defined $info->{type}) { 3535 if (defined $info->{type}) {
3293 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
3295 3537
3296 if ($info->{type} & 1) { 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3297 # prepend meta info
3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3311 } else { 3540 } else {
3312 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3313 } 3542 }
3314 3543
3315 cf::cede_to_tick; 3544 cf::cede_to_tick;
3316 } 3545 }
3317 } 3546 }
3318 3547
3319 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3320 3549
3321 1 3550 1
3322} 3551}
3323
3324cf::global->attach (on_resource_update => sub {
3325 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3326 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3327
3328 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3329 my $sound = $soundconf->{compat}[$_]
3330 or next;
3331
3332 my $face = cf::face::find "sound/$sound->[1]";
3333 cf::sound::set $sound->[0] => $face;
3334 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3335 }
3336
3337 while (my ($k, $v) = each %{$soundconf->{event}}) {
3338 my $face = cf::face::find "sound/$v";
3339 cf::sound::set $k => $face;
3340 }
3341 }
3342});
3343 3552
3344register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3345 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3346 3555
3347 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
… …
3386sub reload_treasures { 3595sub reload_treasures {
3387 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3388 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3389} 3598}
3390 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
3391sub reload_resources { 3620sub reload_resources {
3392 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3393 3622
3623 reload_exp_table;
3624 reload_materials;
3394 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3395 reload_archetypes; 3627 reload_archetypes;
3396 reload_regions; 3628 reload_regions;
3397 reload_treasures; 3629 reload_treasures;
3398 3630
3399 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3400}
3401
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408} 3632}
3409 3633
3410sub reload_config { 3634sub reload_config {
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3635 trace "reloading config file...\n";
3412 or return;
3413 3636
3414 local $/; 3637 my $config = load_file "$CONFDIR/config";
3415 *CFG = YAML::Load <$fh>; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3416 3640
3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3418 3642
3419 $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};
3420 $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};
3421 3645
3422 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
… …
3426 }; 3650 };
3427 warn $@ if $@; 3651 warn $@ if $@;
3428 } 3652 }
3429} 3653}
3430 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
3431sub 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
3432 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
3434 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#
3435 (async { 3696 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3697 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3698 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3699 })->prio (Coro::PRIO_MAX);
3439 }; 3700 };
3440 3701
3441 { 3702 evthread_start IO::AIO::poll_fileno;
3442 my $guard = freeze_mainloop; 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;
3443 reload_config; 3714 reload_config;
3444 db_init; 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
3445 load_extensions; 3725 load_extensions;
3446 3726
3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 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;
3448 } 3734 };
3449 3735
3450 EV::loop; 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;
3451} 3745}
3452 3746
3453############################################################################# 3747#############################################################################
3454# initialisation and cleanup 3748# initialisation and cleanup
3455 3749
3456# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3457BEGIN { 3751BEGIN {
3458 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3459 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3460 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3461 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3462 }; 3756 };
3463 } 3757 }
3464} 3758}
3465 3759
3466sub write_runtime_sync { 3760sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime"; 3761 my $t0 = AE::time;
3468 3762
3469 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3471 3765
3472 IO::AIO::aio_utime $runtime, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3767
3474 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3475 3769
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3477 or return; 3771 or return;
3478 3772
3479 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
… …
3491 aio_utime $fh, undef, undef; 3785 aio_utime $fh, undef, undef;
3492 3786
3493 close $fh 3787 close $fh
3494 or return; 3788 or return;
3495 3789
3496 aio_rename "$runtime~", $runtime 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3791 and return;
3498 3792
3499 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3500 3794
3501 1 3795 1
3502} 3796}
3503 3797
3504our $uuid_lock; 3798our $uuid_lock;
… …
3513 my $uuid = "$LOCALDIR/uuid"; 3807 my $uuid = "$LOCALDIR/uuid";
3514 3808
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3809 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 3810 or return;
3517 3811
3518 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;
3519 $uuid_skip = 0; 3820 $uuid_skip = 0;
3520 3821
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3822 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 3823 and return;
3523 3824
… …
3529 or return; 3830 or return;
3530 3831
3531 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3532 and return; 3833 and return;
3533 3834
3534 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3535 3836
3536 1 3837 1
3537 3838
3538} 3839}
3539 3840
… …
3545} 3846}
3546 3847
3547sub emergency_save() { 3848sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3549 3850
3550 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;
3551 3857
3552 cf::sync_job { 3858 cf::sync_job {
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3553 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 3867 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 3869 $pl->save;
3562 } 3870 }
3563 warn "end emergency player save\n"; 3871 info "emergency_perl_save: end player save\n";
3564 3872
3565 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";
3566 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 3878 $map->valid or next;
3569 $map->save; 3879 $map->save;
3570 } 3880 }
3571 warn "end emergency map save\n"; 3881 info "emergency_perl_save: end map save\n";
3572 3882
3573 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";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3576 3888
3577 warn "begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 3890 write_uuid_sync 1;
3579 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
3580 }; 3911 };
3581 3912
3582 warn "leave emergency perl save\n"; 3913 info "emergency_perl_save: leave\n";
3583} 3914}
3584 3915
3585sub post_cleanup { 3916sub post_cleanup {
3586 my ($make_core) = @_; 3917 my ($make_core) = @_;
3587 3918
3919 IO::AIO::flush;
3920
3588 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3589 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 }
3590} 3951}
3591 3952
3592sub do_reload_perl() { 3953sub do_reload_perl() {
3593 # can/must only be called in main 3954 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3595 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3596 return; 3957 return;
3597 } 3958 }
3598 3959
3599 warn "reloading..."; 3960 return if $RELOAD++;
3600 3961
3601 warn "entering sync_job"; 3962 my $t1 = AE::time;
3602 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
3603 cf::sync_job { 3970 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3971 #cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark
3607 3972
3608 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV;
3610
3611 # if anything goes wrong in here, we should simply crash as we already saved
3612
3613 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs;
3619 warn "iterate...";
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = (); 3975 %EXT_CORO = ();
3627 3976
3628 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3629 %COMMAND = (); 3978 %COMMAND = ();
3630 3979
3631 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3632 %EXTCMD = (); 3981 %EXTCMD = ();
3633 %EXTICMD = (); 3982 %EXTICMD = ();
3634 3983
3635 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3636 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3638 3987
3639 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3640 eval { 3989 eval {
3641 $cb->($pkg); 3990 $cb->($pkg);
3642 1 3991 1
3643 } 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;
3644 } 3997 }
3645 3998
3646 warn "... nuking $pkg";
3647 Symbol::delete_package $pkg;
3648 }
3649
3650 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3651 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 4002
3654 warn "... unloading $k"; 4003 trace "... unloading $k";
3655 delete $INC{$k}; 4004 delete $INC{$k};
3656 4005
3657 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3659 4008
3660 if (my $cb = $k->can ("unload_module")) { 4009 if (my $cb = $k->can ("unload_module")) {
3661 $cb->(); 4010 $cb->();
4011 }
4012
4013 clear_package $k;
3662 } 4014 }
3663 4015
3664 Symbol::delete_package $k;
3665 }
3666
3667 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 4017 clear_package "safe::$_"
3669 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);
3670 4019
3671 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 4023
3675 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3676 # and global variables created in xs 4025 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3678 4027
3679 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3680 4029
3681 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3682 require cf; 4031 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3684 4033
3685 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3686 cf::reload_config; 4035 cf::reload_config;
3687 4036
3688 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3689 cf::load_extensions; 4038 cf::load_extensions;
3690 4039
4040 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3694 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
4047 }
3697 4048
3698 warn "leaving sync_job"; 4049 cf::_post_init 1;
3699 4050
4051 trace "perl_reload: leaving sync_job";
4052
3700 1 4053 1
3701 } or do { 4054 } or do {
3702 warn $@; 4055 error $@;
3703 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
4057 };
4058
4059 --$RELOAD;
3704 }; 4060 }
3705 4061
3706 warn "reloaded"; 4062 $t1 = AE::time - $t1;
4063 info "perl_reload: completed in ${t1}s\n";
3707}; 4064};
3708 4065
3709our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3710 4067
3711sub reload_perl() { 4068sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 4069 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3714 4071
4072 $RELOAD_WATCHER ||= cf::async {
4073 Coro::AIO::aio_wait cache_extensions;
4074
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 4076 do_reload_perl;
3717 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
4078 };
3718 }; 4079 };
3719} 4080}
3720 4081
3721register_command "reload" => sub { 4082register_command "reload" => sub {
3722 my ($who, $arg) = @_; 4083 my ($who, $arg) = @_;
… …
3728 reload_perl; 4089 reload_perl;
3729 }; 4090 };
3730 } 4091 }
3731}; 4092};
3732 4093
3733unshift @INC, $LIBDIR; 4094#############################################################################
3734 4095
3735my $bug_warning = 0; 4096my $bug_warning = 0;
3736 4097
3737our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3738our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3739 4100
3740sub wait_for_tick { 4101sub wait_for_tick() {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3742 4103
3743 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3744 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3745 $signal->wait; 4106 $signal->wait;
3746} 4107}
3747 4108
3748sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3749 return if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3750 4111
3751 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3752 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3753 $signal->wait; 4114 $signal->wait;
3754} 4115}
… …
3760 return; 4121 return;
3761 } 4122 }
3762 4123
3763 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3764 4125
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127
3765 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3766 $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.;
3767 Coro::async_pool { 4130 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3769 write_runtime_sync 4132 write_runtime_sync
3770 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3771 }; 4134 };
3772 } 4135 }
3773 4136
3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3775 $sig->send; 4138 $sig->send;
… …
3783 4146
3784 if (0) { 4147 if (0) {
3785 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3786 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3789 } 4152 }
3790 } 4153 }
3791} 4154}
3792 4155
3793{ 4156{
3794 # configure BDB 4157 # configure BDB
3795 4158
3796 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3797 BDB::max_poll_reqs $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3798 $AnyEvent::BDB::WATCHER->priority (1); 4161 $AnyEvent::BDB::WATCHER->priority (1);
3799 4162
3800 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3801 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
… …
3838 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3839 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3840 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
3841} 4204}
3842 4205
3843my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3844 4208
3845sub _log_backtrace { 4209sub _log_backtrace {
3846 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3847 4211
3848 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3849 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3850 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3852 ++$_log_backtrace; 4220 ++$_log_backtrace;
4221 my $perl_bt = Carp::longmess $msg;
3853 async { 4222 async {
3854 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
3855 4224
3856 my @bt = fork_call { 4225 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 4226 @addr = map { sprintf "%x", $_ } @addr;
… …
3868 } 4237 }
3869 4238
3870 @funcs 4239 @funcs
3871 }; 4240 };
3872 4241
3873 LOG llevInfo, "[ABT] $msg\n"; 4242 LOG llevInfo, "[ABT] $perl_bt\n";
4243 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 4245 --$_log_backtrace;
3876 }; 4246 };
3877 } else { 4247 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3880 } 4250 }
3881} 4251}
3882 4252
3883# load additional modules 4253# load additional modules
3884use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3885 4256
3886END { cf::emergency_save } 4257END { cf::emergency_save }
3887 4258
38881 42591
3889 4260

Diff Legend

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