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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.529 by root, Wed Apr 28 11:28:22 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 77
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 80
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
71our %RESOURCE; 111our %RESOURCE;
72 112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
118
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 121our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 127our $DB_ENV;
85 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
86our %CFG; 131our %CFG;
87 132
88our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 134our $RUNTIME;
90our $NOW; 135our $NOW;
96# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 143
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
102 153
103binmode STDOUT; 154binmode STDOUT;
104binmode STDERR; 155binmode STDERR;
105 156
106# read virtual server time, if available 157# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
111} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
112 165
113mkdir $_ 166mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 168
116our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
117 170
118sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 187
120############################################################################# 188#############################################################################
121 189
122=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
123 191
170returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 240
173=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
174 242
175This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 245that call.
178 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
179=back 253=back
180 254
181=cut 255=cut
182 256
183BEGIN { 257$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 258 my $msg = join "", @_;
186 259
187 $msg .= "\n" 260 $msg .= "\n"
188 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
189 262
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 264
192 LOG llevError, $msg; 265 LOG llevError, $msg;
193 }; 266};
194}
195 267
196$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
198 270
199 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 275 return;#d#
202 }#d# 276 }#d#
203 277
204 # kill coroutine otherwise 278 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 279 Coro::terminate
207}; 280};
208
209$SIG{__DIE__} = sub { }; #d#?
210 281
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 292for my $pkg (qw(
222 cf::global cf::attachable 293 cf::global cf::attachable
223 cf::object cf::object::player 294 cf::object cf::object::player
224 cf::client cf::player 295 cf::client cf::player
225 cf::arch cf::living 296 cf::arch cf::living
297 cf::map cf::mapspace
226 cf::map cf::party cf::region 298 cf::party cf::region
227)) { 299)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 301}
231 302
232$EV::DIED = sub { 303$EV::DIED = sub {
233 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
234}; 305};
235 306
236############################################################################# 307#############################################################################
237 308
238=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
276 347
277sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
279 350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
364
280=item cf::lock_wait $string 365=item cf::lock_wait $string
281 366
282Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
283 368
284=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
285 370
286Wait until the given lock is available and then acquires it and returns 371Wait until the given lock is available and then acquires it and returns
287a Coro::guard object. If the guard object gets destroyed (goes out of scope, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
288for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
289returned. 374returned.
290 375
291Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro. 377deadlocked coro.
298 383
299Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
300 385
301=cut 386=cut
302 387
303our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 389
306sub lock_wait($) { 390sub lock_wait($) {
307 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 392}
320 393
321sub lock_acquire($) { 394sub lock_acquire($) {
322 my ($key) = @_; 395 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 396}
336 397
337sub lock_active($) { 398sub lock_active($) {
338 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 400}
342 401
343sub freeze_mainloop { 402sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 403 tick_inhibit_inc;
345 404
346 my $guard = Coro::guard { 405 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 406}
352 407
353=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
354 409
355Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer. 411get spread over time.
357 412
358=cut 413=cut
359 414
360sub periodic($$) { 415sub periodic($$) {
361 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
378 433
379=cut 434=cut
380 435
381our @SLOT_QUEUE; 436our @SLOT_QUEUE;
382our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
383 439
384$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
387 443
388 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
389 446
390 while () { 447 while () {
391 next_job: 448 next_job:
449
392 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
393 if ($avail > 0.01) { 451
394 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
396 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send; 456 $job->[2]->send;
398 Coro::cede; 457 Coro::cede;
399 goto next_job; 458 goto next_job;
400 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
401 } 461 }
402 } 462 }
403 463
404 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
405 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
406 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait; 467 $signal->wait;
408 } else { 468 } else {
469 $busy = 0;
409 Coro::schedule; 470 Coro::schedule;
410 } 471 }
411 } 472 }
412}; 473};
413 474
414sub get_slot($;$$) { 475sub get_slot($;$$) {
476 return if tick_inhibit || $Coro::current == $Coro::main;
477
415 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
416 479
417 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
418 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
419 483
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
449 513
450sub sync_job(&) { 514sub sync_job(&) {
451 my ($job) = @_; 515 my ($job) = @_;
452 516
453 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
454 my $time = EV::time; 518 my $time = AE::time;
455 519
456 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
458 522
459 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
460 524
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 525 my $freeze_guard = freeze_mainloop;
464 526
465 my $busy = 1; 527 my $busy = 1;
466 my @res; 528 my @res;
467 529
478 } else { 540 } else {
479 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
480 } 542 }
481 } 543 }
482 544
483 $time = EV::time - $time; 545 my $time = AE::time - $time;
484 546
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
489 548
490 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
491 } else { 550 } else {
492 # we are in another coroutine, how wonderful, everything just works 551 # we are in another coroutine, how wonderful, everything just works
493 552
535 reset_signals; 594 reset_signals;
536 &$cb 595 &$cb
537 }, @args; 596 }, @args;
538 597
539 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
610}
611
612=item $coin = coin_from_name $name
613
614=cut
615
616our %coin_alias = (
617 "silver" => "silvercoin",
618 "silvercoin" => "silvercoin",
619 "silvercoins" => "silvercoin",
620 "gold" => "goldcoin",
621 "goldcoin" => "goldcoin",
622 "goldcoins" => "goldcoin",
623 "platinum" => "platinacoin",
624 "platinumcoin" => "platinacoin",
625 "platinumcoins" => "platinacoin",
626 "platina" => "platinacoin",
627 "platinacoin" => "platinacoin",
628 "platinacoins" => "platinacoin",
629 "royalty" => "royalty",
630 "royalties" => "royalty",
631);
632
633sub coin_from_name($) {
634 $coin_alias{$_[0]}
635 ? cf::arch::find $coin_alias{$_[0]}
636 : undef
540} 637}
541 638
542=item $value = cf::db_get $family => $key 639=item $value = cf::db_get $family => $key
543 640
544Returns a single value from the environment database. 641Returns a single value from the environment database.
683 780
684############################################################################# 781#############################################################################
685 782
686=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
687 784
688Many objects in crossfire are so-called attachable objects. That means you can 785Many objects in deliantra are so-called attachable objects. That means you can
689attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
691 788
692In the following description, CLASS can be any of C<global>, C<object> 789In the following description, CLASS can be any of C<global>, C<object>
693C<player>, C<client> or C<map> (i.e. the attachable objects in 790C<player>, C<client> or C<map> (i.e. the attachable objects in
743=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
744 841
745Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
747 844
748Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
749that are attached at load/instantiate time, thus the need for a name. 846that are attached at load/instantiate time, thus the need for a name.
750 847
751These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
752 849
753=over 4 850=over 4
1044 1141
1045sub reattach { 1142sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1144 my ($obj) = @_;
1048 1145
1146 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1147 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1148
1051 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
1052 1150
1053 @$registry = (); 1151 @$registry = ();
1054 1152
1097 1195
1098 sync_job { 1196 sync_job {
1099 if (length $$rdata) { 1197 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1103 1202
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1204 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1108 close $fh; 1210 aio_close $fh;
1109 1211
1110 if (@$objs) { 1212 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1214 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1116 close $fh; 1221 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1223 }
1119 } else { 1224 } else {
1120 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1121 } 1226 }
1122 1227
1123 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1232 } else {
1125 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1126 } 1234 }
1127 } else { 1235 } else {
1128 aio_unlink $filename; 1236 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1130 } 1238 }
1155 $av = $st->{objs}; 1263 $av = $st->{objs};
1156 } 1264 }
1157 1265
1158 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1159 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1160 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1161 1270
1162 ($data, $av) 1271 ($data, $av)
1163} 1272}
1164 1273
1165=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1221 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1222 1331
1223 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1224} 1333}
1225 1334
1335use File::Glob ();
1336
1226cf::player->attach ( 1337cf::player->attach (
1227 on_command => sub { 1338 on_unknown_command => sub {
1228 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1229 1340
1230 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1231 or return; 1342 or return;
1232 1343
1262 1373
1263 cf::override; 1374 cf::override;
1264 }, 1375 },
1265); 1376);
1266 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1267sub load_extensions { 1391sub load_extensions {
1268 cf::sync_job { 1392 cf::sync_job {
1269 my %todo; 1393 my %todo;
1270 1394
1271 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1290 1414
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1417
1294 $ext{source} = 1418 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1297 . $source 1421 . $source
1298 . "\n};\n1"; 1422 . "\n};\n1";
1299 1423
1300 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1301 } 1425 }
1302 1426
1427 my $pass = 0;
1303 my %done; 1428 my %done;
1304 while (%todo) { 1429 while (%todo) {
1305 my $progress; 1430 my $progress;
1306 1431
1432 ++$pass;
1433
1434 ext:
1307 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip 1437 next ext
1310 unless exists $done{$_}; 1438 unless exists $done{$_};
1311 } 1439 }
1312 1440
1313 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1314 1442
1315 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1316 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1317 : "$v->{base}: extension inactive.\n";
1318 1447
1319 if (exists $v->{meta}{mandatory}) {
1320 warn $msg;
1321 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1322 } 1449 if exists $v->{meta}{mandatory};
1323 1450
1324 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1325 } 1460 }
1326
1327 $done{$k} = delete $todo{$k};
1328 push @EXTS, $v->{pkg};
1329 $progress = 1;
1330 } 1461 }
1331 1462
1332 skip: 1463 unless ($progress) {
1333 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1334 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1335 } 1471 }
1336 }; 1472 };
1337} 1473}
1338 1474
1339############################################################################# 1475#############################################################################
1340 1476
1341=back 1477=back
1342 1478
1343=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1344 1480
1345Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1346 1482
1347=cut 1483=cut
1348 1484
1349package cf::player; 1485package cf::player;
1350 1486
1393 1529
1394sub exists($) { 1530sub exists($) {
1395 my ($login) = @_; 1531 my ($login) = @_;
1396 1532
1397 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1398 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1399} 1535}
1400 1536
1401sub find($) { 1537sub find($) {
1402 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1403 my $login = $_[0]; 1539 my $login = $_[0];
1415 my $f = new_from_file cf::object::thawer path $login 1551 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1552 or return;
1417 1553
1418 my $pl = cf::player::load_pl $f 1554 my $pl = cf::player::load_pl $f
1419 or return; 1555 or return;
1556
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1557 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1558 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1423 } 1560 }
1424 } 1561 }
1425} 1562}
1426 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1427sub save($) { 1577sub save($) {
1428 my ($pl) = @_; 1578 my ($pl) = @_;
1429 1579
1430 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1431 1581
1434 1584
1435 return if $pl->{deny_save}; 1585 return if $pl->{deny_save};
1436 1586
1437 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1589
1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1439 1594
1440 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1596 cf::cede_to_tick;
1442} 1597}
1443 1598
1475 my ($pl) = @_; 1630 my ($pl) = @_;
1476 1631
1477 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1478 1633
1479 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1480 $pl->password ("*"); # this should lock out the player until we nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1481 1636
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1483 $pl->deactivate; 1638 $pl->deactivate;
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1485 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1486 1642
1487 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1527 1683
1528 for my $login (@$dirs) { 1684 for my $login (@$dirs) {
1529 my $path = path $login; 1685 my $path = path $login;
1530 1686
1531 # a .pst is a dead give-away for a valid player 1687 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1688 # if no pst file found, open and chekc for blocked users
1689 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1690 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1691 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1692 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1693 }
1537 1694
1541 1698
1542 \@logins 1699 \@logins
1543} 1700}
1544 1701
1545=item $player->maps 1702=item $player->maps
1703
1704=item cf::player::maps $login
1546 1705
1547Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1548player. May block. 1707player. May block.
1549 1708
1550=cut 1709=cut
1568 } 1727 }
1569 1728
1570 \@paths 1729 \@paths
1571} 1730}
1572 1731
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1732=item $protocol_xml = $player->expand_cfpod ($cfpod)
1574 1733
1575Expand crossfire pod fragments into protocol xml. 1734Expand deliantra pod fragments into protocol xml.
1576
1577=cut
1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1590sub expand_cfpod {
1591 my ($self, $pod) = @_;
1592
1593 my $xml;
1594
1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1598
1599 $group =~ s/&/&amp;/g;
1600 $group =~ s/</&lt;/g;
1601
1602 $xml .= $group;
1603 } elsif ($pod =~ m%\G
1604 ([BCGHITU])
1605 <
1606 (?:
1607 ([^<>]*) (?{ $group = $^N })
1608 | < $interior >
1609 )
1610 >
1611 %gcsx
1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1632 "")
1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1644
1645 for ($xml) {
1646 # create single paragraphs (very hackish)
1647 s/(?<=\S)\n(?=\w)/ /g;
1648
1649 # compress some whitespace
1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1655
1656 $xml
1657}
1658
1659no re 'eval';
1660
1661sub hintmode {
1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1663 $_[0]{hintmode}
1664}
1665 1735
1666=item $player->ext_reply ($msgid, @msg) 1736=item $player->ext_reply ($msgid, @msg)
1667 1737
1668Sends an ext reply to the player. 1738Sends an ext reply to the player.
1669 1739
1701 1771
1702=cut 1772=cut
1703 1773
1704sub find_by_path($) { 1774sub find_by_path($) {
1705 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1706 1778
1707 my ($match, $specificity); 1779 my ($match, $specificity);
1708 1780
1709 for my $region (list) { 1781 for my $region (list) {
1710 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1736our $MAX_RESET = 3600; 1808our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1809our $DEFAULT_RESET = 3000;
1738 1810
1739sub generate_random_map { 1811sub generate_random_map {
1740 my ($self, $rmp) = @_; 1812 my ($self, $rmp) = @_;
1813
1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1815
1741 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1817 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1746 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1747 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1748 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1749 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1771 1846
1772 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1773} 1848}
1774 1849
1775# also paths starting with '/' 1850# also paths starting with '/'
1776$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1777 1852
1778sub thawer_merge { 1853sub thawer_merge {
1779 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1780 1855
1781 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1867 1942
1868# the temporary/swap location 1943# the temporary/swap location
1869sub save_path { 1944sub save_path {
1870 my ($self) = @_; 1945 my ($self) = @_;
1871 1946
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1948 "$TMPDIR/$path.map"
1874} 1949}
1875 1950
1876# the unique path, undef == no special unique path 1951# the unique path, undef == no special unique path
1877sub uniq_path { 1952sub uniq_path {
1878 my ($self) = @_; 1953 my ($self) = @_;
1879 1954
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1882}
1883
1884# and all this just because we cannot iterate over
1885# all maps in C++...
1886sub change_all_map_light {
1887 my ($change) = @_;
1888
1889 $_->change_map_light ($change)
1890 for grep $_->outdoor, values %cf::MAP;
1891} 1957}
1892 1958
1893sub decay_objects { 1959sub decay_objects {
1894 my ($self) = @_; 1960 my ($self) = @_;
1895 1961
1979sub find { 2045sub find {
1980 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1981 2047
1982 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1983 2049
1984 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1986 2052
1987 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1991 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1992 or return; 2055 or return;
1993 2056
1994 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1995 2058
1997 or return; 2060 or return;
1998 2061
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2062 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2063 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2064 #$cf::WAIT_FOR_TICK->wait;
2065 undef $guard2;
2002 undef $guard1; 2066 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2067 $map->reset;
2005 return find $path; 2068 return find $path;
2006 } 2069 }
2007 2070
2008 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2009 } 2072 }
2010} 2073}
2011 2074
2012sub pre_load { } 2075sub pre_load { }
2013sub post_load { } 2076#sub post_load { } # XS
2014 2077
2015sub load { 2078sub load {
2016 my ($self) = @_; 2079 my ($self) = @_;
2017 2080
2018 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2098 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2099 $f->skip_block;
2037 $self->_load_objects ($f) 2100 $self->_load_objects ($f)
2038 or return; 2101 or return;
2039 2102
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2103 $self->post_load_original
2041 if delete $self->{load_original}; 2104 if delete $self->{load_original};
2042 2105
2043 if (my $uniq = $self->uniq_path) { 2106 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2107 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2108 unless (aio_stat $uniq) {
2063 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2064 $self->decay_objects; 2127 $self->decay_objects;
2065 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2066 $self->update_buttons; 2129 $self->update_buttons;
2067 cf::cede_to_tick; 2130 cf::cede_to_tick;
2068 $self->set_darkness_map;
2069 cf::cede_to_tick;
2070 $self->activate; 2131 $self->activate;
2071 } 2132 }
2072 2133
2073 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2075 2136
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2137 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2138 }
2078 2139
2079 $self->post_load; 2140 $self->post_load;
2080} 2141}
2081 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2082sub customise_for { 2146sub customise_for {
2083 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2084 2148
2085 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2150 if $self->per_player;
2102 or next; 2166 or next;
2103 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2104 or next; 2168 or next;
2105 $neigh->load; 2169 $neigh->load;
2106 2170
2171 # now find the diagonal neighbours
2107 push @neigh, 2172 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2175 }
2111 2176
2139 my ($path, $origin, $load) = @_; 2204 my ($path, $origin, $load) = @_;
2140 2205
2141 $path = normalise $path, $origin && $origin->{path}; 2206 $path = normalise $path, $origin && $origin->{path};
2142 2207
2143 if (my $map = $cf::MAP{$path}) { 2208 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2210 }
2146 2211
2147 $MAP_PREFETCH{$path} |= $load; 2212 $MAP_PREFETCH{$path} |= $load;
2148 2213
2149 $MAP_PREFETCHER ||= cf::async { 2214 $MAP_PREFETCHER ||= cf::async {
2163 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2164 2229
2165 () 2230 ()
2166} 2231}
2167 2232
2233# common code, used by both ->save and ->swapout
2168sub save { 2234sub _save {
2169 my ($self) = @_; 2235 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2236
2173 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2174 2238
2175 return unless $self->dirty; 2239 return unless $self->dirty;
2176 2240
2185 2249
2186 cf::async { 2250 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2251 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2252 $_->contr->save for $self->players;
2189 }; 2253 };
2254
2255 cf::get_slot 0.02;
2190 2256
2191 if ($uniq) { 2257 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2258 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2259 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2260 } else {
2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2196 } 2262 }
2197} 2263}
2198 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2199sub swap_out { 2273sub swap_out {
2200 my ($self) = @_; 2274 my ($self) = @_;
2201 2275
2202 # save first because save cedes
2203 $self->save;
2204
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2277
2278 return if $self->in_memory != cf::MAP_ACTIVE;
2279 return if $self->{deny_save};
2207 return if $self->players; 2280 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
2209 return if $self->{deny_save};
2210 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2211 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2212 2332
2213 $self->deactivate; 2333 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2215 $self->clear; 2335 $self->clear;
2216}
2217
2218sub reset_at {
2219 my ($self) = @_;
2220
2221 # TODO: safety, remove and allow resettable per-player maps
2222 return 1e99 if $self->{deny_reset};
2223
2224 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2225 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2226
2227 $time + $to
2228}
2229
2230sub should_reset {
2231 my ($self) = @_;
2232
2233 $self->reset_at <= $cf::RUNTIME
2234}
2235
2236sub reset {
2237 my ($self) = @_;
2238
2239 my $lock = cf::lock_acquire "map_data:$self->{path}";
2240
2241 return if $self->players;
2242
2243 warn "resetting map ", $self->path;
2244
2245 $self->in_memory (cf::MAP_SWAPPED);
2246
2247 # need to save uniques path
2248 unless ($self->{deny_save}) {
2249 my $uniq = $self->uniq_path; utf8::encode $uniq;
2250
2251 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2252 if $uniq;
2253 }
2254
2255 delete $cf::MAP{$self->path};
2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2259 $self->clear;
2260 2336
2261 $self->unlink_save; 2337 $self->unlink_save;
2262 $self->destroy; 2338 $self->destroy;
2263} 2339}
2264 2340
2272 2348
2273 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2274 2350
2275 $self->unlink_save; 2351 $self->unlink_save;
2276 2352
2277 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2278 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2279 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2280 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2282 2358
2331 2407
2332sub unique_maps() { 2408sub unique_maps() {
2333 [ 2409 [
2334 map { 2410 map {
2335 utf8::decode $_; 2411 utf8::decode $_;
2336 /\.map$/ 2412 s/\.map$//; # TODO future compatibility hack
2413 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2414 ? ()
2337 ? normalise $_ 2415 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2417 ]
2341} 2418}
2342 2419
2343package cf; 2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2344 2451
2345=back 2452=back
2346 2453
2347=head3 cf::object 2454=head3 cf::object
2348 2455
2352 2459
2353=over 4 2460=over 4
2354 2461
2355=item $ob->inv_recursive 2462=item $ob->inv_recursive
2356 2463
2357Returns the inventory of the object _and_ their inventories, recursively. 2464Returns the inventory of the object I<and> their inventories, recursively,
2465but I<not> the object itself.
2358 2466
2359=cut 2467=cut
2360 2468
2361sub inv_recursive_; 2469sub inv_recursive_;
2362sub inv_recursive_ { 2470sub inv_recursive_ {
2367 inv_recursive_ inv $_[0] 2475 inv_recursive_ inv $_[0]
2368} 2476}
2369 2477
2370=item $ref = $ob->ref 2478=item $ref = $ob->ref
2371 2479
2372creates and returns a persistent reference to an objetc that can be stored as a string. 2480Creates and returns a persistent reference to an object that can be stored as a string.
2373 2481
2374=item $ob = cf::object::deref ($refstring) 2482=item $ob = cf::object::deref ($refstring)
2375 2483
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2484returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block. 2485even if the object actually exists. May block.
2409can be C<undef>. Does the right thing when the player is currently in a 2517can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2518dialogue with the given NPC character.
2411 2519
2412=cut 2520=cut
2413 2521
2522our $SAY_CHANNEL = {
2523 id => "say",
2524 title => "Map",
2525 reply => "say ",
2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2527};
2528
2529our $CHAT_CHANNEL = {
2530 id => "chat",
2531 title => "Chat",
2532 reply => "chat ",
2533 tooltip => "Player chat and shouts, global to the server.",
2534};
2535
2414# rough implementation of a future "reply" method that works 2536# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2537# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2538#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2539sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2540 my ($self, $npc, $msg, $flags) = @_;
2429 my $dialog = $pl->{npc_dialog}; 2551 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2552 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2553
2432 } else { 2554 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2555 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2556 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2557 }
2436 } 2558 }
2437} 2559}
2438 2560
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2561=item $object->send_msg ($channel, $msg, $color, [extra...])
2464 2586
2465=item $player_object->enter_link 2587=item $player_object->enter_link
2466 2588
2467Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2468 2590
2469The player should be reasonably safe there for short amounts of time. You 2591The player should be reasonably safe there for short amounts of time (e.g.
2470I<MUST> call C<leave_link> as soon as possible, though. 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2593though, as the player cannot control the character while it is on the link
2594map.
2471 2595
2472Will never block. 2596Will never block.
2473 2597
2474=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2475 2599
2495sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2496 my ($self) = @_; 2620 my ($self) = @_;
2497 2621
2498 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2499 2623
2624 ++$self->{_link_recursion};
2625
2500 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2501 2627
2502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2503 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2504 2630
2505 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2506} 2632}
2507 2633
2508sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2509 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2510 2636
2527 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2528 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2529 2655
2530 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2531 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2532 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2533 2659
2534 $map->load; 2660 $map->load;
2535 $map->load_neighbours; 2661 $map->load_neighbours;
2536 2662
2537 return unless $self->contr->active; 2663 return unless $self->contr->active;
2538 $self->activate_recursive;
2539 2664
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2542} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2543 2672
2673}
2674
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2545 2676
2546Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process. 2681be called at the end of this process.
2551 2682
2683Note that $check will be called with a potentially non-loaded map, so if
2684it needs a loaded map it has to call C<< ->load >>.
2685
2552=cut 2686=cut
2553 2687
2554our $GOTOGEN; 2688our $GOTOGEN;
2555 2689
2556sub cf::object::player::goto { 2690sub cf::object::player::goto {
2557 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2558 2698
2559 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2561 2701
2562 $self->enter_link; 2702 $self->enter_link;
2586 my $map = eval { 2726 my $map = eval {
2587 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2588 2728
2589 if ($map) { 2729 if ($map) {
2590 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2591 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2592 } else { 2732 } else {
2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2594 } 2734 }
2595 2735
2596 $map 2736 $map
2604 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2605 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2606 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2607 } 2747 }
2608 2748
2609 $done->() if $done; 2749 $done->($self) if $done;
2610 })->prio (1); 2750 })->prio (1);
2611} 2751}
2612 2752
2613=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2614 2754
2634} 2774}
2635 2775
2636sub prepare_random_map { 2776sub prepare_random_map {
2637 my ($exit) = @_; 2777 my ($exit) = @_;
2638 2778
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2779 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2780 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2781 # that depends on the exit object
2644 2782
2645 my $rmp = parse_random_map_params $exit->msg; 2783 my $rmp = parse_random_map_params $exit->msg;
2647 if ($exit->map) { 2785 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2786 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2787 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2788 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2789 $rmp->{origin_y} = $exit->y;
2790
2791 $exit->map->touch;
2652 } 2792 }
2653 2793
2654 $rmp->{random_seed} ||= $exit->random_seed; 2794 $rmp->{random_seed} ||= $exit->random_seed;
2655 2795
2656 my $data = cf::encode_json $rmp; 2796 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2797 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2798 my $meta = "$RANDOMDIR/$md5.meta";
2659 2799
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2800 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2801 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2802 undef $fh;
2663 aio_rename "$meta~", $meta; 2803 aio_rename "$meta~", $meta;
2664 2804
2805 my $slaying = "?random/$md5";
2806
2807 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2808 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2809 $exit->msg (undef);
2810 }
2667 } 2811 }
2668} 2812}
2669 2813
2670sub cf::object::player::enter_exit { 2814sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2815 my ($self, $exit) = @_;
2672 2816
2673 return unless $self->type == cf::PLAYER; 2817 return unless $self->type == cf::PLAYER;
2674 2818
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2819 $self->enter_link;
2687 2820
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2821 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2822 $Coro::current->{desc} = "enter_exit";
2694 2823
2695 $self->deactivate_recursive; # just to be sure
2696 unless (eval { 2824 unless (eval {
2825 $self->deactivate_recursive; # just to be sure
2826
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2836 my $x = $exit->stats->hp;
2837 my $y = $exit->stats->sp;
2838
2697 $self->goto ($slaying, $hp, $sp); 2839 $self->goto ($map, $x, $y);
2698 2840
2841 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y)
2843 if $exit->flag (cf::FLAG_DAMNED);
2844
2699 1; 2845 1
2700 }) { 2846 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2847 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "I'll try to bring you back to the map you were before. " 2848 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2849 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2850 cf::NDI_UNIQUE | cf::NDI_RED);
2705 2851
2706 warn "ERROR in enter_exit: $@"; 2852 warn "ERROR in enter_exit: $@";
2723sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2724 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2725 2871
2726 utf8::encode $text; 2872 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2874}
2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2728} 2899}
2729 2900
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2902
2732Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2736 2907
2737=cut 2908=cut
2738 2909
2739# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2741 "c/identify" => { 2918 "c/identify" => {
2742 id => "infobox", 2919 id => "infobox",
2743 title => "Identify", 2920 title => "Identify",
2744 reply => undef, 2921 reply => undef,
2745 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2747 "c/examine" => { 2924 "c/examine" => {
2748 id => "infobox", 2925 id => "infobox",
2749 title => "Examine", 2926 title => "Examine",
2750 reply => undef, 2927 reply => undef,
2751 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 2935 },
2753 "c/book" => { 2936 "c/book" => {
2754 id => "infobox", 2937 id => "infobox",
2755 title => "Book", 2938 title => "Book",
2756 reply => undef, 2939 reply => undef,
2772 id => "infobox", 2955 id => "infobox",
2773 title => "Body Parts", 2956 title => "Body Parts",
2774 reply => undef, 2957 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2776 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2966 "c/skills" => {
2967 id => "infobox",
2968 title => "Skills",
2969 reply => undef,
2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2995 },
2777 "c/uptime" => { 2996 "c/uptime" => {
2778 id => "infobox", 2997 id => "infobox",
2779 title => "Uptime", 2998 title => "Uptime",
2780 reply => undef, 2999 reply => undef,
2781 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2784 id => "infobox", 3003 id => "infobox",
2785 title => "Map Info", 3004 title => "Map Info",
2786 reply => undef, 3005 reply => undef,
2787 tooltip => "Information related to the maps", 3006 tooltip => "Information related to the maps",
2788 }, 3007 },
3008 "c/party" => {
3009 id => "party",
3010 title => "Party",
3011 reply => "gsay ",
3012 tooltip => "Messages and chat related to your party",
3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2789); 3022);
2790 3023
2791sub cf::client::send_msg { 3024sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2793 3026
2794 $msg = $self->pl->expand_cfpod ($msg); 3027 $msg = $self->pl->expand_cfpod ($msg)
3028 unless $color & cf::NDI_VERBATIM;
2795 3029
2796 $color &= cf::NDI_CLIENT_MASK; # just in case... 3030 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797 3031
2798 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2801 3035
2802 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2806 3038
2807 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2812 if $self->can_msg;
2813 } 3044 }
2814 3045
2815 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2816 } 3047 }
2817 3048
2818 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2819 3050
2820 if ($self->can_msg) {
2821 # default colour, mask it out 3051 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2824 3054
2825 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3055 my $pkt = "msg "
3056 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 } else { 3058 );
2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838 3059
2839 $color &= cf::NDI_COLOR_MASK; 3060 $self->send_big_packet ($pkt);
2840
2841 utf8::encode $msg;
2842
2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2846 } else {
2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2848 $self->send_packet ("drawinfo $color $msg")
2849 }
2850 }
2851 }
2852} 3061}
2853 3062
2854=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2855 3064
2856Sends an ext event to the client. 3065Sends an ext event to the client.
2859 3068
2860sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2861 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2862 3071
2863 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2866 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 } 3077 }
2869} 3078}
2870 3079
2871=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2872 3081
2876 3085
2877sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2879 3088
2880 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove 3092 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 } 3095 }
2887} 3096}
2888 3097
2889=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2890 3099
2991 3200
2992 $coro 3201 $coro
2993} 3202}
2994 3203
2995cf::client->attach ( 3204cf::client->attach (
2996 on_destroy => sub { 3205 on_client_destroy => sub {
2997 my ($ns) = @_; 3206 my ($ns) = @_;
2998 3207
2999 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3000 }, 3209 },
3001); 3210);
3017our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3018 3227
3019$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3020 3229
3021$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3023 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3024 sort time 3233 sort time
3025)); 3234));
3026 3235
3027# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3030 3239
3031The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3032 3241
3033 cf::object 3242 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3244 insert remove name archname title slaying race decrease split
3245 value
3036 3246
3037 cf::object::player 3247 cf::object::player
3038 player 3248 player
3039 3249
3040 cf::player 3250 cf::player
3045 3255
3046=cut 3256=cut
3047 3257
3048for ( 3258for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3052 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3054 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3055) { 3265) {
3056 no strict 'refs'; 3266 no strict 'refs';
3057 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3058 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 3286
3077 my $qcode = $code; 3287 my $qcode = $code;
3078 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3079 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3080 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3081 local $_; 3294 local $_;
3082 local @safe::cf::_safe_eval_args = values %vars;
3083 3295
3084 my $eval = 3296 my $eval =
3085 "do {\n" 3297 "do {\n"
3086 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3087 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3088 . $code 3300 . $code
3089 . "\n}" 3301 . "\n}"
3090 ; 3302 ;
3091 3303
3304 if ($CFG{safe_eval}) {
3092 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3093 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3094 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3095 3313
3096 if ($@) { 3314 if ($@) {
3097 warn "$@"; 3315 warn "$@";
3098 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3099 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3118=cut 3336=cut
3119 3337
3120sub register_script_function { 3338sub register_script_function {
3121 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3122 3340
3123 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3124 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3125} 3343}
3126 3344
3127=back 3345=back
3128 3346
3129=cut 3347=cut
3150 3368
3151 $facedata->{version} == 2 3369 $facedata->{version} == 2
3152 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3153 3371
3154 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3155 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC, 3375 type => FT_RSRC,
3157 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3158 }; 3378 };
3159 cf::cede_to_tick; 3379 cf::cede_to_tick;
3160 3380
3161 { 3381 {
3162 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3164 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3165 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166 3386
3167 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3171 3391
3172 cf::cede_to_tick; 3392 cf::cede_to_tick;
3173 } 3393 }
3174 3394
3175 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3199 3419
3200 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3201 } 3421 }
3202 3422
3203 { 3423 {
3204 # TODO: for gcfclient pleasure, we should give resources
3205 # that gcfclient doesn't grok a >10000 face index.
3206 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3207 3425
3208 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3210 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212 3429
3213 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3214 # prepend meta info
3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3228 } else { 3432 } else {
3229 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info;
3230 } 3434 }
3231 3435
3264 while (my ($k, $v) = each %$want) { 3468 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3469 $ns->fx_want ($k, $v);
3266 } 3470 }
3267}; 3471};
3268 3472
3473sub load_resource_file($) {
3474 my $guard = lock_acquire "load_resource_file";
3475
3476 my $status = load_resource_file_ $_[0];
3477 get_slot 0.1, 100;
3478 cf::arch::commit_load;
3479
3480 $status
3481}
3482
3269sub reload_regions { 3483sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3484 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3485 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3486 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3487
3286} 3500}
3287 3501
3288sub reload_archetypes { 3502sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3503 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3504 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3505}
3297 3506
3298sub reload_treasures { 3507sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3508 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3509 or die "unable to load treasurelists\n";
3301} 3510}
3302 3511
3303sub reload_resources { 3512sub reload_resources {
3304 warn "reloading resource files...\n"; 3513 warn "reloading resource files...\n";
3305 3514
3515 reload_facedata;
3516 reload_archetypes;
3306 reload_regions; 3517 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3518 reload_treasures;
3311 3519
3312 warn "finished reloading resource files\n"; 3520 warn "finished reloading resource files\n";
3313} 3521}
3314 3522
3315sub init {
3316 reload_resources;
3317}
3318
3319sub reload_config { 3523sub reload_config {
3524 warn "reloading config file...\n";
3525
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3526 open my $fh, "<:utf8", "$CONFDIR/config"
3321 or return; 3527 or return;
3322 3528
3323 local $/; 3529 local $/;
3324 *CFG = YAML::Load <$fh>; 3530 *CFG = YAML::XS::Load scalar <$fh>;
3325 3531
3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3327 3533
3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3534 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3535 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3330 3536
3331 if (exists $CFG{mlockall}) { 3537 if (exists $CFG{mlockall}) {
3333 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3334 and die "WARNING: m(un)lockall failed: $!\n"; 3540 and die "WARNING: m(un)lockall failed: $!\n";
3335 }; 3541 };
3336 warn $@ if $@; 3542 warn $@ if $@;
3337 } 3543 }
3544
3545 warn "finished reloading resource files\n";
3546}
3547
3548sub pidfile() {
3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550 or die "$PIDFILE: $!";
3551 flock $fh, &Fcntl::LOCK_EX
3552 or die "$PIDFILE: flock: $!";
3553 $fh
3554}
3555
3556# make sure only one server instance is running at any one time
3557sub atomic {
3558 my $fh = pidfile;
3559
3560 my $pid = <$fh>;
3561 kill 9, $pid if $pid > 0;
3562
3563 seek $fh, 0, 0;
3564 print $fh $$;
3565}
3566
3567sub main_loop {
3568 warn "EV::loop starting\n";
3569 if (1) {
3570 EV::loop;
3571 }
3572 warn "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP;
3338} 3574}
3339 3575
3340sub main { 3576sub main {
3577 cf::init_globals; # initialise logging
3578
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583
3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585
3341 # we must not ever block the main coroutine 3586 # we must not ever block the main coroutine
3342 local $Coro::idle = sub { 3587 local $Coro::idle = sub {
3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3588 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3344 (async { 3589 (async {
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3590 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3591 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3592 })->prio (Coro::PRIO_MAX);
3348 }; 3593 };
3349 3594
3595 evthread_start IO::AIO::poll_fileno;
3596
3597 cf::sync_job {
3598 cf::init_experience;
3599 cf::init_anim;
3600 cf::init_attackmess;
3601 cf::init_dynamic;
3602
3603 cf::load_settings;
3604 cf::load_materials;
3605
3606 reload_resources;
3350 reload_config; 3607 reload_config;
3351 db_init; 3608 db_init;
3609
3610 cf::init_uuid;
3611 cf::init_signals;
3612 cf::init_skills;
3613
3614 cf::init_beforeplay;
3615
3616 atomic;
3617
3352 load_extensions; 3618 load_extensions;
3353 3619
3354 $TICK_WATCHER->start; 3620 utime time, time, $RUNTIMEFILE;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3621
3356 EV::loop; 3622 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX ();
3624 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3625
3626 (pop @POST_INIT)->(0) while @POST_INIT;
3627 };
3628
3629 cf::object::thawer::errors_are_fatal 0;
3630 warn "parse errors in files are no longer fatal from this point on.\n";
3631
3632 main_loop;
3357} 3633}
3358 3634
3359############################################################################# 3635#############################################################################
3360# initialisation and cleanup 3636# initialisation and cleanup
3361 3637
3362# install some emergency cleanup handlers 3638# install some emergency cleanup handlers
3363BEGIN { 3639BEGIN {
3364 our %SIGWATCHER = (); 3640 our %SIGWATCHER = ();
3365 for my $signal (qw(INT HUP TERM)) { 3641 for my $signal (qw(INT HUP TERM)) {
3366 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3642 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3367 cf::cleanup "SIG$signal"; 3643 cf::cleanup "SIG$signal";
3368 }; 3644 };
3369 } 3645 }
3370} 3646}
3371 3647
3372sub write_runtime { 3648sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3649 my $t0 = AE::time;
3374 3650
3375 # first touch the runtime file to show we are still running: 3651 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3652 # the fsync below can take a very very long time.
3377 3653
3378 IO::AIO::aio_utime $runtime, undef, undef; 3654 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3379 3655
3380 my $guard = cf::lock_acquire "write_runtime"; 3656 my $guard = cf::lock_acquire "write_runtime";
3381 3657
3382 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3383 or return; 3659 or return;
3384 3660
3385 my $value = $cf::RUNTIME + 90 + 10; 3661 my $value = $cf::RUNTIME + 90 + 10;
3386 # 10 is the runtime save interval, for a monotonic clock 3662 # 10 is the runtime save interval, for a monotonic clock
3387 # 60 allows for the watchdog to kill the server. 3663 # 60 allows for the watchdog to kill the server.
3397 aio_utime $fh, undef, undef; 3673 aio_utime $fh, undef, undef;
3398 3674
3399 close $fh 3675 close $fh
3400 or return; 3676 or return;
3401 3677
3402 aio_rename "$runtime~", $runtime 3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3403 and return; 3679 and return;
3404 3680
3405 warn "runtime file written.\n"; 3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3406 3682
3407 1 3683 1
3684}
3685
3686our $uuid_lock;
3687our $uuid_skip;
3688
3689sub write_uuid_sync($) {
3690 $uuid_skip ||= $_[0];
3691
3692 return if $uuid_lock;
3693 local $uuid_lock = 1;
3694
3695 my $uuid = "$LOCALDIR/uuid";
3696
3697 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3698 or return;
3699
3700 my $value = uuid_seq uuid_cur;
3701
3702 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n";
3704 return;
3705 }
3706
3707 my $value = uuid_str $value + $uuid_skip;
3708 $uuid_skip = 0;
3709
3710 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3711 and return;
3712
3713 # always fsync - this file is important
3714 aio_fsync $fh
3715 and return;
3716
3717 close $fh
3718 or return;
3719
3720 aio_rename "$uuid~", $uuid
3721 and return;
3722
3723 warn "uuid file written ($value).\n";
3724
3725 1
3726
3727}
3728
3729sub write_uuid($$) {
3730 my ($skip, $sync) = @_;
3731
3732 $sync ? write_uuid_sync $skip
3733 : async { write_uuid_sync $skip };
3408} 3734}
3409 3735
3410sub emergency_save() { 3736sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3737 my $freeze_guard = cf::freeze_mainloop;
3412 3738
3413 warn "enter emergency perl save\n"; 3739 warn "emergency_perl_save: enter\n";
3414 3740
3415 cf::sync_job { 3741 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746
3416 # use a peculiar iteration method to avoid tripping on perl 3747 # use a peculiar iteration method to avoid tripping on perl
3417 # refcount bugs in for. also avoids problems with players 3748 # refcount bugs in for. also avoids problems with players
3418 # and maps saved/destroyed asynchronously. 3749 # and maps saved/destroyed asynchronously.
3419 warn "begin emergency player save\n"; 3750 warn "emergency_perl_save: begin player save\n";
3420 for my $login (keys %cf::PLAYER) { 3751 for my $login (keys %cf::PLAYER) {
3421 my $pl = $cf::PLAYER{$login} or next; 3752 my $pl = $cf::PLAYER{$login} or next;
3422 $pl->valid or next; 3753 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3424 $pl->save; 3755 $pl->save;
3425 } 3756 }
3426 warn "end emergency player save\n"; 3757 warn "emergency_perl_save: end player save\n";
3427 3758
3428 warn "begin emergency map save\n"; 3759 warn "emergency_perl_save: begin map save\n";
3429 for my $path (keys %cf::MAP) { 3760 for my $path (keys %cf::MAP) {
3430 my $map = $cf::MAP{$path} or next; 3761 my $map = $cf::MAP{$path} or next;
3431 $map->valid or next; 3762 $map->valid or next;
3432 $map->save; 3763 $map->save;
3433 } 3764 }
3434 warn "end emergency map save\n"; 3765 warn "emergency_perl_save: end map save\n";
3435 3766
3436 warn "begin emergency database checkpoint\n"; 3767 warn "emergency_perl_save: begin database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3768 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3769 warn "emergency_perl_save: end database checkpoint\n";
3770
3771 warn "emergency_perl_save: begin write uuid\n";
3772 write_uuid_sync 1;
3773 warn "emergency_perl_save: end write uuid\n";
3439 }; 3774 };
3440 3775
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3441 warn "leave emergency perl save\n"; 3781 warn "emergency_perl_save: leave\n";
3442} 3782}
3443 3783
3444sub post_cleanup { 3784sub post_cleanup {
3445 my ($make_core) = @_; 3785 my ($make_core) = @_;
3446 3786
3447 warn Carp::longmess "post_cleanup backtrace" 3787 warn Carp::longmess "post_cleanup backtrace"
3448 if $make_core; 3788 if $make_core;
3789
3790 my $fh = pidfile;
3791 unlink $PIDFILE if <$fh> == $$;
3792}
3793
3794# a safer delete_package, copied from Symbol
3795sub clear_package($) {
3796 my $pkg = shift;
3797
3798 # expand to full symbol table name if needed
3799 unless ($pkg =~ /^main::.*::$/) {
3800 $pkg = "main$pkg" if $pkg =~ /^::/;
3801 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3802 $pkg .= '::' unless $pkg =~ /::$/;
3803 }
3804
3805 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3806 my $stem_symtab = *{$stem}{HASH};
3807
3808 defined $stem_symtab and exists $stem_symtab->{$leaf}
3809 or return;
3810
3811 # clear all symbols
3812 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3813 for my $name (keys %$leaf_symtab) {
3814 _gv_clear *{"$pkg$name"};
3815# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3816 }
3449} 3817}
3450 3818
3451sub do_reload_perl() { 3819sub do_reload_perl() {
3452 # can/must only be called in main 3820 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3821 if (in_main) {
3454 warn "can only reload from main coroutine"; 3822 warn "can only reload from main coroutine";
3455 return; 3823 return;
3456 } 3824 }
3457 3825
3826 return if $RELOAD++;
3827
3828 my $t1 = AE::time;
3829
3830 while ($RELOAD) {
3458 warn "reloading..."; 3831 warn "reloading...";
3459 3832
3460 warn "entering sync_job"; 3833 warn "entering sync_job";
3461 3834
3462 cf::sync_job { 3835 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3836 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3837 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3838 cf::write_runtime_sync; # external watchdog should not bark
3466 3839
3467 warn "syncing database to disk"; 3840 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3841 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3842
3470 # if anything goes wrong in here, we should simply crash as we already saved 3843 # if anything goes wrong in here, we should simply crash as we already saved
3471 3844
3472 warn "flushing outstanding aio requests"; 3845 warn "flushing outstanding aio requests";
3473 for (;;) {
3474 BDB::flush;
3475 IO::AIO::flush;
3476 Coro::cede_notself;
3477 last unless IO::AIO::nreqs || BDB::nreqs; 3846 while (IO::AIO::nreqs || BDB::nreqs) {
3478 warn "iterate..."; 3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3479 }
3480
3481 ++$RELOAD;
3482
3483 warn "cancelling all extension coros";
3484 $_->cancel for values %EXT_CORO;
3485 %EXT_CORO = ();
3486
3487 warn "removing commands";
3488 %COMMAND = ();
3489
3490 warn "removing ext/exti commands";
3491 %EXTCMD = ();
3492 %EXTICMD = ();
3493
3494 warn "unloading/nuking all extensions";
3495 for my $pkg (@EXTS) {
3496 warn "... unloading $pkg";
3497
3498 if (my $cb = $pkg->can ("unload")) {
3499 eval {
3500 $cb->($pkg);
3501 1
3502 } or warn "$pkg unloaded, but with errors: $@";
3503 } 3848 }
3504 3849
3505 warn "... nuking $pkg"; 3850 warn "cancelling all extension coros";
3506 Symbol::delete_package $pkg; 3851 $_->cancel for values %EXT_CORO;
3507 } 3852 %EXT_CORO = ();
3508 3853
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3854 warn "removing commands";
3510 while (my ($k, $v) = each %INC) { 3855 %COMMAND = ();
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3856
3857 warn "removing ext/exti commands";
3858 %EXTCMD = ();
3859 %EXTICMD = ();
3860
3861 warn "unloading/nuking all extensions";
3862 for my $pkg (@EXTS) {
3513 warn "... unloading $k"; 3863 warn "... unloading $pkg";
3514 delete $INC{$k};
3515 3864
3516 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g;
3518
3519 if (my $cb = $k->can ("unload_module")) { 3865 if (my $cb = $pkg->can ("unload")) {
3866 eval {
3520 $cb->(); 3867 $cb->($pkg);
3868 1
3869 } or warn "$pkg unloaded, but with errors: $@";
3870 }
3871
3872 warn "... clearing $pkg";
3873 clear_package $pkg;
3521 } 3874 }
3522 3875
3523 Symbol::delete_package $k; 3876 warn "unloading all perl modules loaded from $LIBDIR";
3877 while (my ($k, $v) = each %INC) {
3878 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879
3880 warn "... unloading $k";
3881 delete $INC{$k};
3882
3883 $k =~ s/\.pm$//;
3884 $k =~ s/\//::/g;
3885
3886 if (my $cb = $k->can ("unload_module")) {
3887 $cb->();
3888 }
3889
3890 clear_package $k;
3524 } 3891 }
3525 3892
3526 warn "getting rid of safe::, as good as possible"; 3893 warn "getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 3894 clear_package "safe::$_"
3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3895 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3529 3896
3530 warn "unloading cf.pm \"a bit\""; 3897 warn "unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 3898 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3533 3900
3534 # don't, removes xs symbols, too, 3901 # don't, removes xs symbols, too,
3535 # and global variables created in xs 3902 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 3903 #clear_package __PACKAGE__;
3537 3904
3538 warn "unload completed, starting to reload now"; 3905 warn "unload completed, starting to reload now";
3539 3906
3540 warn "reloading cf.pm"; 3907 warn "reloading cf.pm";
3541 require cf; 3908 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3909 cf::_connect_to_perl_1;
3543 3910
3544 warn "loading config and database again"; 3911 warn "loading config and database again";
3545 cf::reload_config; 3912 cf::reload_config;
3546 3913
3547 warn "loading extensions"; 3914 warn "loading extensions";
3548 cf::load_extensions; 3915 cf::load_extensions;
3549 3916
3917 if ($REATTACH_ON_RELOAD) {
3550 warn "reattaching attachments to objects/players"; 3918 warn "reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 3919 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 3920 warn "reattaching attachments to maps";
3553 reattach $_ for values %MAP; 3921 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 3922 warn "reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 3923 reattach $_ for values %PLAYER;
3924 }
3556 3925
3926 warn "running post_init jobs";
3927 (pop @POST_INIT)->(1) while @POST_INIT;
3928
3557 warn "leaving sync_job"; 3929 warn "leaving sync_job";
3558 3930
3559 1 3931 1
3560 } or do { 3932 } or do {
3561 warn $@; 3933 warn $@;
3562 cf::cleanup "error while reloading, exiting."; 3934 cf::cleanup "error while reloading, exiting.";
3563 }; 3935 };
3564 3936
3565 warn "reloaded"; 3937 warn "reloaded";
3938 --$RELOAD;
3939 }
3940
3941 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n";
3566}; 3943};
3567 3944
3568our $RELOAD_WATCHER; # used only during reload 3945our $RELOAD_WATCHER; # used only during reload
3569 3946
3570sub reload_perl() { 3947sub reload_perl() {
3571 # doing reload synchronously and two reloads happen back-to-back, 3948 # doing reload synchronously and two reloads happen back-to-back,
3572 # coro crashes during coro_state_free->destroy here. 3949 # coro crashes during coro_state_free->destroy here.
3573 3950
3951 $RELOAD_WATCHER ||= cf::async {
3952 Coro::AIO::aio_wait cache_extensions;
3953
3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3954 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3575 do_reload_perl; 3955 do_reload_perl;
3576 undef $RELOAD_WATCHER; 3956 undef $RELOAD_WATCHER;
3957 };
3577 }; 3958 };
3578} 3959}
3579 3960
3580register_command "reload" => sub { 3961register_command "reload" => sub {
3581 my ($who, $arg) = @_; 3962 my ($who, $arg) = @_;
3595 3976
3596our @WAIT_FOR_TICK; 3977our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3978our @WAIT_FOR_TICK_BEGIN;
3598 3979
3599sub wait_for_tick { 3980sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3602 3982
3603 my $signal = new Coro::Signal; 3983 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3984 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3985 $signal->wait;
3606} 3986}
3607 3987
3608sub wait_for_tick_begin { 3988sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3611 3990
3612 my $signal = new Coro::Signal; 3991 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3992 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3993 $signal->wait;
3615} 3994}
3616 3995
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3996sub tick {
3618 if ($Coro::current != $Coro::main) { 3997 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3998 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3999 unless ++$bug_warning > 10;
3621 return; 4000 return;
3622 } 4001 }
3623 4002
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 4003 cf::server_tick; # one server iteration
3627 4004
3628 $RUNTIME += $TICK; 4005 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3629 $NEXT_TICK = $_[0]->at;
3630 4006
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4007 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4008 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 4009 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 4010 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 4011 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 4012 or warn "ERROR: unable to write runtime file: $!";
3637 }; 4013 };
3638 } 4014 }
3639 4015
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4016 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3642 } 4018 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 4019 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 4020 $sig->send;
3645 } 4021 }
3646 4022
3647 $LOAD = ($NOW - $tick_start) / $TICK; 4023 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4024 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 4025
3650 _post_tick; 4026 if (0) {
3651}; 4027 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 4028 my $jitter = $TICK_START - $NEXT_TICK;
4029 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030 warn "jitter $JITTER\n";#d#
4031 }
4032 }
4033}
3653 4034
3654{ 4035{
3655 # configure BDB 4036 # configure BDB
3656 4037
3657 BDB::min_parallel 8; 4038 BDB::min_parallel 16;
3658 BDB::max_poll_reqs $TICK * 0.1; 4039 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 4040 $AnyEvent::BDB::WATCHER->priority (1);
3660 4041
3661 unless ($DB_ENV) { 4042 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 4043 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4044 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | BDB::LOG_AUTOREMOVE, 1); 4045 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4046 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4047 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4048 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 4049
3668 cf::sync_job { 4050 cf::sync_job {
3669 eval { 4051 eval {
3695{ 4077{
3696 # configure IO::AIO 4078 # configure IO::AIO
3697 4079
3698 IO::AIO::min_parallel 8; 4080 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 4081 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 4082 undef $AnyEvent::AIO::WATCHER;
3701} 4083}
3702 4084
3703my $_log_backtrace; 4085my $_log_backtrace;
3704 4086
3705sub _log_backtrace { 4087sub _log_backtrace {
3708 $msg =~ s/\n//; 4090 $msg =~ s/\n//;
3709 4091
3710 # limit the # of concurrent backtraces 4092 # limit the # of concurrent backtraces
3711 if ($_log_backtrace < 2) { 4093 if ($_log_backtrace < 2) {
3712 ++$_log_backtrace; 4094 ++$_log_backtrace;
4095 my $perl_bt = Carp::longmess $msg;
3713 async { 4096 async {
3714 $Coro::current->{desc} = "abt $msg"; 4097 $Coro::current->{desc} = "abt $msg";
3715 4098
3716 my @bt = fork_call { 4099 my @bt = fork_call {
3717 @addr = map { sprintf "%x", $_ } @addr; 4100 @addr = map { sprintf "%x", $_ } @addr;
3728 } 4111 }
3729 4112
3730 @funcs 4113 @funcs
3731 }; 4114 };
3732 4115
3733 LOG llevInfo, "[ABT] $msg\n"; 4116 LOG llevInfo, "[ABT] $perl_bt\n";
4117 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3734 LOG llevInfo, "[ABT] $_\n" for @bt; 4118 LOG llevInfo, "[ABT] $_\n" for @bt;
3735 --$_log_backtrace; 4119 --$_log_backtrace;
3736 }; 4120 };
3737 } else { 4121 } else {
3738 LOG llevInfo, "[ABT] $msg\n"; 4122 LOG llevInfo, "[ABT] $msg\n";
3739 LOG llevInfo, "[ABT] [suppressed]\n"; 4123 LOG llevInfo, "[ABT] [suppressed]\n";
3740 } 4124 }
3741} 4125}
3742 4126
3743# load additional modules 4127# load additional modules
3744use cf::pod; 4128require "cf/$_.pm" for @EXTRA_MODULES;
4129cf::_connect_to_perl_2;
3745 4130
3746END { cf::emergency_save } 4131END { cf::emergency_save }
3747 4132
37481 41331
3749 4134

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines