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.442 by root, Sun Aug 31 09:03:31 2008 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 77
70$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" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE; # unused
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;
98 118
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 121our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
103 123
104our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 127our $DB_ENV;
108 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
109our %CFG; 131our %CFG;
110 132
111our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 134our $RUNTIME;
113our $NOW; 135our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 146our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
126 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 :)
153
127binmode STDOUT; 154binmode STDOUT;
128binmode STDERR; 155binmode STDERR;
129 156
130# read virtual server time, if available 157# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
135} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
136 165
137mkdir $_ 166mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 168
140our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
141 170
142sub 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::"} };
143 187
144############################################################################# 188#############################################################################
145 189
146=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
147 191
194returns 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
195per 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.
196 240
197=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
198 242
199This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
200C<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
201that call. 245that call.
202 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
203=back 253=back
204 254
205=cut 255=cut
206 256
207BEGIN { 257$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 258 my $msg = join "", @_;
210 259
211 $msg .= "\n" 260 $msg .= "\n"
212 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
213 262
214 $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;
215 264
216 LOG llevError, $msg; 265 LOG llevError, $msg;
217 }; 266};
218}
219 267
220$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
222 270
223 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 275 return;#d#
226 }#d# 276 }#d#
227 277
228 # kill coroutine otherwise 278 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 279 Coro::terminate
231}; 280};
232
233$SIG{__DIE__} = sub { }; #d#?
234 281
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
252)) { 299)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 301}
255 302
256$EV::DIED = sub { 303$EV::DIED = sub {
257 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
258}; 305};
259 306
260############################################################################# 307#############################################################################
261 308
262=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
299our $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
300 347
301sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
303 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
304=item cf::lock_wait $string 365=item cf::lock_wait $string
305 366
306Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
307 368
308=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
309 370
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
313returned. 374returned.
314 375
315Locks 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
316deadlocked coro. 377deadlocked coro.
322 383
323Return 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.
324 385
325=cut 386=cut
326 387
327our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 389
330sub lock_wait($) { 390sub lock_wait($) {
331 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 392}
344 393
345sub lock_acquire($) { 394sub lock_acquire($) {
346 my ($key) = @_; 395 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 396}
360 397
361sub lock_active($) { 398sub lock_active($) {
362 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 400}
366 401
367sub freeze_mainloop { 402sub freeze_mainloop {
368 tick_inhibit_inc; 403 tick_inhibit_inc;
369 404
370 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
371} 406}
372 407
373=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
374 409
375Like 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
376get spread over timer. 411get spread over time.
377 412
378=cut 413=cut
379 414
380sub periodic($$) { 415sub periodic($$) {
381 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
398 433
399=cut 434=cut
400 435
401our @SLOT_QUEUE; 436our @SLOT_QUEUE;
402our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
403 439
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
407 443
408 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
409 446
410 while () { 447 while () {
411 next_job: 448 next_job:
449
412 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 451
414 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 456 $job->[2]->send;
418 Coro::cede; 457 Coro::cede;
419 goto next_job; 458 goto next_job;
420 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 461 }
422 } 462 }
423 463
424 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 467 $signal->wait;
428 } else { 468 } else {
469 $busy = 0;
429 Coro::schedule; 470 Coro::schedule;
430 } 471 }
431 } 472 }
432}; 473};
433 474
434sub get_slot($;$$) { 475sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
436 477
437 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
438 479
439 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
440 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
441 483
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
471 513
472sub sync_job(&) { 514sub sync_job(&) {
473 my ($job) = @_; 515 my ($job) = @_;
474 516
475 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 518 my $time = AE::time;
477 519
478 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
480 522
481 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
498 } else { 540 } else {
499 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
500 } 542 }
501 } 543 }
502 544
503 my $time = EV::time - $time; 545 my $time = AE::time - $time;
504 546
505 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
506 548
507 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
508 } else { 550 } else {
552 reset_signals; 594 reset_signals;
553 &$cb 595 &$cb
554 }, @args; 596 }, @args;
555 597
556 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 )
557} 610}
558 611
559=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
560 613
561=cut 614=cut
727 780
728############################################################################# 781#############################################################################
729 782
730=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
731 784
732Many 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
733attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
735 788
736In 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>
737C<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
787=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
788 841
789Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
791 844
792Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
793that 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.
794 847
795These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
796 849
797=over 4 850=over 4
1142 1195
1143 sync_job { 1196 sync_job {
1144 if (length $$rdata) { 1197 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1148 1202
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1210 aio_close $fh;
1154 1211
1155 if (@$objs) { 1212 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1221 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1223 }
1164 } else { 1224 } else {
1165 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1166 } 1226 }
1167 1227
1168 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1232 } else {
1170 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1171 } 1234 }
1172 } else { 1235 } else {
1173 aio_unlink $filename; 1236 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1175 } 1238 }
1200 $av = $st->{objs}; 1263 $av = $st->{objs};
1201 } 1264 }
1202 1265
1203 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1206 1270
1207 ($data, $av) 1271 ($data, $av)
1208} 1272}
1209 1273
1210=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1266 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1267 1331
1268 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1269} 1333}
1270 1334
1335use File::Glob ();
1336
1271cf::player->attach ( 1337cf::player->attach (
1272 on_command => sub { 1338 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1274 1340
1275 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1276 or return; 1342 or return;
1277 1343
1307 1373
1308 cf::override; 1374 cf::override;
1309 }, 1375 },
1310); 1376);
1311 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
1312sub load_extensions { 1391sub load_extensions {
1313 cf::sync_job { 1392 cf::sync_job {
1314 my %todo; 1393 my %todo;
1315 1394
1316 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1343 . "\n};\n1"; 1422 . "\n};\n1";
1344 1423
1345 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1346 } 1425 }
1347 1426
1427 my $pass = 0;
1348 my %done; 1428 my %done;
1349 while (%todo) { 1429 while (%todo) {
1350 my $progress; 1430 my $progress;
1351 1431
1432 ++$pass;
1433
1434 ext:
1352 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1437 next ext
1355 unless exists $done{$_}; 1438 unless exists $done{$_};
1356 } 1439 }
1357 1440
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1442
1360 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1447
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1449 if exists $v->{meta}{mandatory};
1368 1450
1369 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;
1370 } 1460 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1461 }
1376 1462
1377 skip: 1463 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 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 }
1380 } 1471 }
1381 }; 1472 };
1382} 1473}
1383 1474
1384############################################################################# 1475#############################################################################
1385 1476
1386=back 1477=back
1387 1478
1388=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1389 1480
1390Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1391 1482
1392=cut 1483=cut
1393 1484
1394package cf::player; 1485package cf::player;
1395 1486
1438 1529
1439sub exists($) { 1530sub exists($) {
1440 my ($login) = @_; 1531 my ($login) = @_;
1441 1532
1442 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1444} 1535}
1445 1536
1446sub find($) { 1537sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1539 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1469 } 1560 }
1470 } 1561 }
1471} 1562}
1472 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
1473sub save($) { 1577sub save($) {
1474 my ($pl) = @_; 1578 my ($pl) = @_;
1475 1579
1476 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1477 1581
1482 1586
1483 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1485 1589
1486 cf::get_slot 0.01; 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];
1487 1594
1488 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1596 cf::cede_to_tick;
1490} 1597}
1491 1598
1523 my ($pl) = @_; 1630 my ($pl) = @_;
1524 1631
1525 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1526 1633
1527 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1528 $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
1529 1636
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1638 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1535 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1536 1642
1537 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1593 \@logins 1699 \@logins
1594} 1700}
1595 1701
1596=item $player->maps 1702=item $player->maps
1597 1703
1704=item cf::player::maps $login
1705
1598Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1599player. May block. 1707player. May block.
1600 1708
1601=cut 1709=cut
1602 1710
1619 } 1727 }
1620 1728
1621 \@paths 1729 \@paths
1622} 1730}
1623 1731
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1732=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1733
1626Expand crossfire pod fragments into protocol xml. 1734Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718 1735
1719=item $player->ext_reply ($msgid, @msg) 1736=item $player->ext_reply ($msgid, @msg)
1720 1737
1721Sends an ext reply to the player. 1738Sends an ext reply to the player.
1722 1739
1754 1771
1755=cut 1772=cut
1756 1773
1757sub find_by_path($) { 1774sub find_by_path($) {
1758 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1759 1778
1760 my ($match, $specificity); 1779 my ($match, $specificity);
1761 1780
1762 for my $region (list) { 1781 for my $region (list) {
1763 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796 1815
1797 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1798 $self->_create_random_map ( 1817 $self->_create_random_map (
1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1802 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1803 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1804 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1805 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1827 1846
1828 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1829} 1848}
1830 1849
1831# also paths starting with '/' 1850# also paths starting with '/'
1832$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1833 1852
1834sub thawer_merge { 1853sub thawer_merge {
1835 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1836 1855
1837 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1935 1954
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1938} 1957}
1939 1958
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947}
1948
1949sub decay_objects { 1959sub decay_objects {
1950 my ($self) = @_; 1960 my ($self) = @_;
1951 1961
1952 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1953 1963
2035sub find { 2045sub find {
2036 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
2037 2047
2038 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
2039 2049
2040 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
2042 2052
2043 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
2048 or return; 2055 or return;
2049 2056
2050 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
2051 2058
2063 2070
2064 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2065 } 2072 }
2066} 2073}
2067 2074
2068sub pre_load { } 2075sub pre_load { }
2069sub post_load { } 2076#sub post_load { } # XS
2070 2077
2071sub load { 2078sub load {
2072 my ($self) = @_; 2079 my ($self) = @_;
2073 2080
2074 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2119 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2127 $self->decay_objects;
2121 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2122 $self->update_buttons; 2129 $self->update_buttons;
2123 cf::cede_to_tick; 2130 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick;
2126 $self->activate; 2131 $self->activate;
2127 } 2132 }
2128 2133
2129 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2133 } 2138 }
2134 2139
2135 $self->post_load; 2140 $self->post_load;
2136} 2141}
2137 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
2138sub customise_for { 2146sub customise_for {
2139 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2140 2148
2141 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2142 if $self->per_player; 2150 if $self->per_player;
2158 or next; 2166 or next;
2159 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2160 or next; 2168 or next;
2161 $neigh->load; 2169 $neigh->load;
2162 2170
2171 # now find the diagonal neighbours
2163 push @neigh, 2172 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 } 2175 }
2167 2176
2219 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2220 2229
2221 () 2230 ()
2222} 2231}
2223 2232
2233# common code, used by both ->save and ->swapout
2224sub save { 2234sub _save {
2225 my ($self) = @_; 2235 my ($self) = @_;
2226
2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2236
2229 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2230 2238
2231 return unless $self->dirty; 2239 return unless $self->dirty;
2232 2240
2252 } else { 2260 } else {
2253 $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);
2254 } 2262 }
2255} 2263}
2256 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2257sub swap_out { 2273sub swap_out {
2258 my ($self) = @_; 2274 my ($self) = @_;
2259 2275
2260 # save first because save cedes
2261 $self->save;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2277
2265 return if $self->players;
2266 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2267 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2268 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2269 $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};
2270 2332
2271 $self->deactivate; 2333 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2273 $self->clear; 2335 $self->clear;
2274}
2275
2276sub reset_at {
2277 my ($self) = @_;
2278
2279 # TODO: safety, remove and allow resettable per-player maps
2280 return 1e99 if $self->{deny_reset};
2281
2282 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2283 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2284
2285 $time + $to
2286}
2287
2288sub should_reset {
2289 my ($self) = @_;
2290
2291 $self->reset_at <= $cf::RUNTIME
2292}
2293
2294sub reset {
2295 my ($self) = @_;
2296
2297 my $lock = cf::lock_acquire "map_data:$self->{path}";
2298
2299 return if $self->players;
2300
2301 warn "resetting map ", $self->path;
2302
2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # need to save uniques path
2306 unless ($self->{deny_save}) {
2307 my $uniq = $self->uniq_path; utf8::encode $uniq;
2308
2309 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2310 if $uniq;
2311 }
2312
2313 delete $cf::MAP{$self->path};
2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2317 $self->clear;
2318 2336
2319 $self->unlink_save; 2337 $self->unlink_save;
2320 $self->destroy; 2338 $self->destroy;
2321} 2339}
2322 2340
2330 2348
2331 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2332 2350
2333 $self->unlink_save; 2351 $self->unlink_save;
2334 2352
2335 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2336 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2337 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2338 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2340 2358
2397 : normalise $_ 2415 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2417 ]
2400} 2418}
2401 2419
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}
2451
2402=back 2452=back
2403 2453
2404=head3 cf::object 2454=head3 cf::object
2405 2455
2406=cut 2456=cut
2471 2521
2472our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2473 id => "say", 2523 id => "say",
2474 title => "Map", 2524 title => "Map",
2475 reply => "say ", 2525 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477}; 2527};
2478 2528
2479our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2480 id => "chat", 2530 id => "chat",
2481 title => "Chat", 2531 title => "Chat",
2536 2586
2537=item $player_object->enter_link 2587=item $player_object->enter_link
2538 2588
2539Freezes 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}>).
2540 2590
2541The 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.
2542I<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.
2543 2595
2544Will never block. 2596Will never block.
2545 2597
2546=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2547 2599
2567sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2568 my ($self) = @_; 2620 my ($self) = @_;
2569 2621
2570 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2571 2623
2624 ++$self->{_link_recursion};
2625
2572 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2573 2627
2574 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2575 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2576 2630
2577 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2578} 2632}
2579 2633
2580sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2581 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2582 2636
2599 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2601 2655
2602 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2605 2659
2606 $map->load; 2660 $map->load;
2607 $map->load_neighbours; 2661 $map->load_neighbours;
2608 2662
2609 return unless $self->contr->active; 2663 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2664
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2614} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2615 2672
2673}
2674
2616=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)]])
2617 2676
2618Moves 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
2619her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2620that 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
2621the 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
2628 2687
2629our $GOTOGEN; 2688our $GOTOGEN;
2630 2689
2631sub cf::object::player::goto { 2690sub cf::object::player::goto {
2632 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 }
2633 2698
2634 # 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
2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2636 2701
2637 $self->enter_link; 2702 $self->enter_link;
2661 my $map = eval { 2726 my $map = eval {
2662 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2663 2728
2664 if ($map) { 2729 if ($map) {
2665 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2666 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2667 } else { 2732 } else {
2668 $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);
2669 } 2734 }
2670 2735
2671 $map 2736 $map
2679 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2680 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2681 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2682 } 2747 }
2683 2748
2684 $done->() if $done; 2749 $done->($self) if $done;
2685 })->prio (1); 2750 })->prio (1);
2686} 2751}
2687 2752
2688=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2689 2754
2777 $self->contr->savebed ($map, $x, $y) 2842 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2843 if $exit->flag (cf::FLAG_DAMNED);
2779 2844
2780 1 2845 1
2781 }) { 2846 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2847 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "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. "
2784 . "Please report this to the dungeon master!", 2849 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2850 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2851
2787 warn "ERROR in enter_exit: $@"; 2852 warn "ERROR in enter_exit: $@";
2804sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2806 2871
2807 utf8::encode $text; 2872 utf8::encode $text;
2808 $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);
2809} 2899}
2810 2900
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 2902
2813Send 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
2817 2907
2818=cut 2908=cut
2819 2909
2820# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2822 "c/identify" => { 2918 "c/identify" => {
2823 id => "infobox", 2919 id => "infobox",
2824 title => "Identify", 2920 title => "Identify",
2825 reply => undef, 2921 reply => undef,
2826 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2828 "c/examine" => { 2924 "c/examine" => {
2829 id => "infobox", 2925 id => "infobox",
2830 title => "Examine", 2926 title => "Examine",
2831 reply => undef, 2927 reply => undef,
2832 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",
2833 }, 2935 },
2834 "c/book" => { 2936 "c/book" => {
2835 id => "infobox", 2937 id => "infobox",
2836 title => "Book", 2938 title => "Book",
2837 reply => undef, 2939 reply => undef,
2853 id => "infobox", 2955 id => "infobox",
2854 title => "Body Parts", 2956 title => "Body Parts",
2855 reply => undef, 2957 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2857 }, 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 },
2858 "c/uptime" => { 2996 "c/uptime" => {
2859 id => "infobox", 2997 id => "infobox",
2860 title => "Uptime", 2998 title => "Uptime",
2861 reply => undef, 2999 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2871 id => "party", 3009 id => "party",
2872 title => "Party", 3010 title => "Party",
2873 reply => "gsay ", 3011 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2875 }, 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,
2876); 3022);
2877 3023
2878sub cf::client::send_msg { 3024sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2880 3026
2881 $msg = $self->pl->expand_cfpod ($msg); 3027 $msg = $self->pl->expand_cfpod ($msg)
3028 unless $color & cf::NDI_VERBATIM;
2882 3029
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 3030 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 3031
2885 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2888 3035
2889 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2893 3038
2894 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 3044 }
2901 3045
2902 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2903 } 3047 }
2904 3048
2905 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2906 3050
2907 if ($self->can_msg) {
2908 # default colour, mask it out 3051 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2911 3054
2912 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3055 my $pkt = "msg "
3056 . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914 } else { 3058 );
2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925 3059
2926 $color &= cf::NDI_COLOR_MASK; 3060 $self->send_big_packet ($pkt);
2927
2928 utf8::encode $msg;
2929
2930 if (0 && $msg =~ /\[/) {
2931 # COMMAND/INFO
2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2933 } else {
2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2935 $self->send_packet ("drawinfo $color $msg")
2936 }
2937 }
2938 }
2939} 3061}
2940 3062
2941=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2942 3064
2943Sends an ext event to the client. 3065Sends an ext event to the client.
2946 3068
2947sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2948 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2949 3071
2950 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2952 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2953 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2954 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955 } 3077 }
2956} 3078}
2957 3079
2958=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2959 3081
2963 3085
2964sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2965 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2966 3088
2967 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2968 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2970 #TODO: version 1, remove 3092 #TODO: version 1, remove
2971 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2973 } 3095 }
2974} 3096}
2975 3097
2976=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2977 3099
3078 3200
3079 $coro 3201 $coro
3080} 3202}
3081 3203
3082cf::client->attach ( 3204cf::client->attach (
3083 on_destroy => sub { 3205 on_client_destroy => sub {
3084 my ($ns) = @_; 3206 my ($ns) = @_;
3085 3207
3086 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3087 }, 3209 },
3088); 3210);
3104our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3105 3227
3106$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3107 3229
3108$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3109 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3110 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3111 sort time 3233 sort time
3112)); 3234));
3113 3235
3114# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3118The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3119 3241
3120 cf::object 3242 cf::object
3121 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
3122 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3123 3246
3124 cf::object::player 3247 cf::object::player
3125 player 3248 player
3126 3249
3127 cf::player 3250 cf::player
3133=cut 3256=cut
3134 3257
3135for ( 3258for (
3136 ["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
3137 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3139 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3140 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3141 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3142) { 3265) {
3143 no strict 'refs'; 3266 no strict 'refs';
3144 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3145 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3163 3286
3164 my $qcode = $code; 3287 my $qcode = $code;
3165 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3166 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3167 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3168 local $_; 3294 local $_;
3169 local @safe::cf::_safe_eval_args = values %vars;
3170 3295
3171 my $eval = 3296 my $eval =
3172 "do {\n" 3297 "do {\n"
3173 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3174 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3175 . $code 3300 . $code
3176 . "\n}" 3301 . "\n}"
3177 ; 3302 ;
3178 3303
3304 if ($CFG{safe_eval}) {
3179 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3180 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3181 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 }
3182 3313
3183 if ($@) { 3314 if ($@) {
3184 warn "$@"; 3315 warn "$@";
3185 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3186 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3205=cut 3336=cut
3206 3337
3207sub register_script_function { 3338sub register_script_function {
3208 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3209 3340
3210 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3211 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3212} 3343}
3213 3344
3214=back 3345=back
3215 3346
3216=cut 3347=cut
3237 3368
3238 $facedata->{version} == 2 3369 $facedata->{version} == 2
3239 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3240 3371
3241 # 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]);
3242 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3243 type => FT_RSRC, 3375 type => FT_RSRC,
3244 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),
3245 }; 3378 };
3246 cf::cede_to_tick; 3379 cf::cede_to_tick;
3247 3380
3248 { 3381 {
3249 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3251 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3252 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253 3386
3254 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3255 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3258 3391
3259 cf::cede_to_tick; 3392 cf::cede_to_tick;
3260 } 3393 }
3261 3394
3262 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3286 3419
3287 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3288 } 3421 }
3289 3422
3290 { 3423 {
3291 # TODO: for gcfclient pleasure, we should give resources
3292 # that gcfclient doesn't grok a >10000 face index.
3293 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3294 3425
3295 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3297 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3298 my $data;
3299 3429
3300 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3301 # prepend meta info
3302
3303 my $meta = $enc->encode ({
3304 name => $name,
3305 %{ $info->{meta} || {} },
3306 });
3307
3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3315 } else { 3432 } else {
3316 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3317 } 3434 }
3318 3435
3319 cf::cede_to_tick; 3436 cf::cede_to_tick;
3320 } 3437 }
3321 } 3438 }
3322 3439
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3324 3441
3325 1 3442 1
3326} 3443}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3347 3444
3348register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3349 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3350 3447
3351 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3390sub reload_treasures { 3487sub reload_treasures {
3391 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3392 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3393} 3490}
3394 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3395sub reload_resources { 3515sub reload_resources {
3396 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3397 3517
3398 reload_facedata; 3518 reload_facedata;
3519 reload_sound;
3399 reload_archetypes; 3520 reload_archetypes;
3400 reload_regions; 3521 reload_regions;
3401 reload_treasures; 3522 reload_treasures;
3402 3523
3403 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3404} 3525}
3405 3526
3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 reload_resources;
3412}
3413
3414sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3415 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3416 or return; 3531 or return;
3417 3532
3418 local $/; 3533 local $/;
3419 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3420 3535
3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3422 3537
3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3425 3540
3426 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
3428 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3429 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3430 }; 3545 };
3431 warn $@ if $@; 3546 warn $@ if $@;
3432 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3550}
3551
3552sub pidfile() {
3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3554 or die "$PIDFILE: $!";
3555 flock $fh, &Fcntl::LOCK_EX
3556 or die "$PIDFILE: flock: $!";
3557 $fh
3558}
3559
3560# make sure only one server instance is running at any one time
3561sub atomic {
3562 my $fh = pidfile;
3563
3564 my $pid = <$fh>;
3565 kill 9, $pid if $pid > 0;
3566
3567 seek $fh, 0, 0;
3568 print $fh $$;
3569}
3570
3571sub main_loop {
3572 warn "EV::loop starting\n";
3573 if (1) {
3574 EV::loop;
3575 }
3576 warn "EV::loop returned\n";
3577 goto &main_loop unless $REALLY_UNLOOP;
3433} 3578}
3434 3579
3435sub main { 3580sub main {
3581 cf::init_globals; # initialise logging
3582
3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3587
3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3589
3436 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3437 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3592 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3439 (async { 3593 (async {
3440 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3594 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT; 3595 EV::loop EV::LOOP_ONESHOT;
3442 })->prio (Coro::PRIO_MAX); 3596 })->prio (Coro::PRIO_MAX);
3443 }; 3597 };
3444 3598
3445 { 3599 evthread_start IO::AIO::poll_fileno;
3446 my $guard = freeze_mainloop; 3600
3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3607 cf::load_settings;
3608 cf::load_materials;
3609
3610 reload_resources;
3447 reload_config; 3611 reload_config;
3448 db_init; 3612 db_init;
3613
3614 cf::init_uuid;
3615 cf::init_signals;
3616 cf::init_skills;
3617
3618 cf::init_beforeplay;
3619
3620 atomic;
3621
3449 load_extensions; 3622 load_extensions;
3450 3623
3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3624 utime time, time, $RUNTIMEFILE;
3625
3626 # no (long-running) fork's whatsoever before this point(!)
3627 use POSIX ();
3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3629
3630 (pop @POST_INIT)->(0) while @POST_INIT;
3452 } 3631 };
3453 3632
3454 EV::loop; 3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3635
3636 main_loop;
3455} 3637}
3456 3638
3457############################################################################# 3639#############################################################################
3458# initialisation and cleanup 3640# initialisation and cleanup
3459 3641
3460# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3461BEGIN { 3643BEGIN {
3462 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3463 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3464 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3465 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3466 }; 3648 };
3467 } 3649 }
3468} 3650}
3469 3651
3470sub write_runtime_sync { 3652sub write_runtime_sync {
3471 my $runtime = "$LOCALDIR/runtime"; 3653 my $t0 = AE::time;
3472 3654
3473 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3474 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3475 3657
3476 IO::AIO::aio_utime $runtime, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477 3659
3478 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3479 3661
3480 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3481 or return; 3663 or return;
3482 3664
3483 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3484 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3485 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
3495 aio_utime $fh, undef, undef; 3677 aio_utime $fh, undef, undef;
3496 3678
3497 close $fh 3679 close $fh
3498 or return; 3680 or return;
3499 3681
3500 aio_rename "$runtime~", $runtime 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501 and return; 3683 and return;
3502 3684
3503 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3504 3686
3505 1 3687 1
3506} 3688}
3507 3689
3508our $uuid_lock; 3690our $uuid_lock;
3517 my $uuid = "$LOCALDIR/uuid"; 3699 my $uuid = "$LOCALDIR/uuid";
3518 3700
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3701 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return; 3702 or return;
3521 3703
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3704 my $value = uuid_seq uuid_cur;
3705
3706 unless ($value) {
3707 warn "cowardly refusing to write zero uuid value!\n";
3708 return;
3709 }
3710
3711 my $value = uuid_str $value + $uuid_skip;
3523 $uuid_skip = 0; 3712 $uuid_skip = 0;
3524 3713
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3714 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return; 3715 and return;
3527 3716
3549} 3738}
3550 3739
3551sub emergency_save() { 3740sub emergency_save() {
3552 my $freeze_guard = cf::freeze_mainloop; 3741 my $freeze_guard = cf::freeze_mainloop;
3553 3742
3554 warn "enter emergency perl save\n"; 3743 warn "emergency_perl_save: enter\n";
3555 3744
3556 cf::sync_job { 3745 cf::sync_job {
3746 # this is a trade-off: we want to be very quick here, so
3747 # save all maps without fsync, and later call a global sync
3748 # (which in turn might be very very slow)
3749 local $USE_FSYNC = 0;
3750
3557 # use a peculiar iteration method to avoid tripping on perl 3751 # use a peculiar iteration method to avoid tripping on perl
3558 # refcount bugs in for. also avoids problems with players 3752 # refcount bugs in for. also avoids problems with players
3559 # and maps saved/destroyed asynchronously. 3753 # and maps saved/destroyed asynchronously.
3560 warn "begin emergency player save\n"; 3754 warn "emergency_perl_save: begin player save\n";
3561 for my $login (keys %cf::PLAYER) { 3755 for my $login (keys %cf::PLAYER) {
3562 my $pl = $cf::PLAYER{$login} or next; 3756 my $pl = $cf::PLAYER{$login} or next;
3563 $pl->valid or next; 3757 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565 $pl->save; 3759 $pl->save;
3566 } 3760 }
3567 warn "end emergency player save\n"; 3761 warn "emergency_perl_save: end player save\n";
3568 3762
3569 warn "begin emergency map save\n"; 3763 warn "emergency_perl_save: begin map save\n";
3570 for my $path (keys %cf::MAP) { 3764 for my $path (keys %cf::MAP) {
3571 my $map = $cf::MAP{$path} or next; 3765 my $map = $cf::MAP{$path} or next;
3572 $map->valid or next; 3766 $map->valid or next;
3573 $map->save; 3767 $map->save;
3574 } 3768 }
3575 warn "end emergency map save\n"; 3769 warn "emergency_perl_save: end map save\n";
3576 3770
3577 warn "begin emergency database checkpoint\n"; 3771 warn "emergency_perl_save: begin database checkpoint\n";
3578 BDB::db_env_txn_checkpoint $DB_ENV; 3772 BDB::db_env_txn_checkpoint $DB_ENV;
3579 warn "end emergency database checkpoint\n"; 3773 warn "emergency_perl_save: end database checkpoint\n";
3580 3774
3581 warn "begin write uuid\n"; 3775 warn "emergency_perl_save: begin write uuid\n";
3582 write_uuid_sync 1; 3776 write_uuid_sync 1;
3583 warn "end write uuid\n"; 3777 warn "emergency_perl_save: end write uuid\n";
3584 }; 3778 };
3585 3779
3780 warn "emergency_perl_save: starting sync()\n";
3781 IO::AIO::aio_sync sub {
3782 warn "emergency_perl_save: finished sync()\n";
3783 };
3784
3586 warn "leave emergency perl save\n"; 3785 warn "emergency_perl_save: leave\n";
3587} 3786}
3588 3787
3589sub post_cleanup { 3788sub post_cleanup {
3590 my ($make_core) = @_; 3789 my ($make_core) = @_;
3591 3790
3592 warn Carp::longmess "post_cleanup backtrace" 3791 warn Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3792 if $make_core;
3793
3794 my $fh = pidfile;
3795 unlink $PIDFILE if <$fh> == $$;
3594} 3796}
3595 3797
3596# a safer delete_package, copied from Symbol 3798# a safer delete_package, copied from Symbol
3597sub clear_package($) { 3799sub clear_package($) {
3598 my $pkg = shift; 3800 my $pkg = shift;
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) { 3817 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"}; 3818 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 } 3820 }
3619 warn "cleared package #$pkg\n";#d#
3620} 3821}
3621
3622our $RELOAD; # how many times to reload
3623 3822
3624sub do_reload_perl() { 3823sub do_reload_perl() {
3625 # can/must only be called in main 3824 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3627 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3628 return; 3827 return;
3629 } 3828 }
3630 3829
3631 return if $RELOAD++; 3830 return if $RELOAD++;
3831
3832 my $t1 = AE::time;
3632 3833
3633 while ($RELOAD) { 3834 while ($RELOAD) {
3634 warn "reloading..."; 3835 warn "reloading...";
3635 3836
3636 warn "entering sync_job"; 3837 warn "entering sync_job";
3697 clear_package "safe::$_" 3898 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3899 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3900
3700 warn "unloading cf.pm \"a bit\""; 3901 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3902 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3904
3704 # don't, removes xs symbols, too, 3905 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3906 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3907 #clear_package __PACKAGE__;
3707 3908
3708 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3709 3910
3710 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3711 require cf; 3912 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3713 3914
3714 warn "loading config and database again"; 3915 warn "loading config and database again";
3715 cf::reload_config; 3916 cf::reload_config;
3716 3917
3717 warn "loading extensions"; 3918 warn "loading extensions";
3718 cf::load_extensions; 3919 cf::load_extensions;
3719 3920
3921 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3922 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3923 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3924 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3925 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3926 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3927 reattach $_ for values %PLAYER;
3928 }
3929
3930 warn "running post_init jobs";
3931 (pop @POST_INIT)->(1) while @POST_INIT;
3726 3932
3727 warn "leaving sync_job"; 3933 warn "leaving sync_job";
3728 3934
3729 1 3935 1
3730 } or do { 3936 } or do {
3733 }; 3939 };
3734 3940
3735 warn "reloaded"; 3941 warn "reloaded";
3736 --$RELOAD; 3942 --$RELOAD;
3737 } 3943 }
3944
3945 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n";
3738}; 3947};
3739 3948
3740our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3741 3950
3742sub reload_perl() { 3951sub reload_perl() {
3743 # doing reload synchronously and two reloads happen back-to-back, 3952 # doing reload synchronously and two reloads happen back-to-back,
3744 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3745 3954
3955 $RELOAD_WATCHER ||= cf::async {
3956 Coro::AIO::aio_wait cache_extensions;
3957
3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3747 do_reload_perl; 3959 do_reload_perl;
3748 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3961 };
3749 }; 3962 };
3750} 3963}
3751 3964
3752register_command "reload" => sub { 3965register_command "reload" => sub {
3753 my ($who, $arg) = @_; 3966 my ($who, $arg) = @_;
3767 3980
3768our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3769our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3770 3983
3771sub wait_for_tick { 3984sub wait_for_tick {
3772 return if tick_inhibit || $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3773 3986
3774 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3775 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3776 $signal->wait; 3989 $signal->wait;
3777} 3990}
3778 3991
3779sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 3994
3782 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3784 $signal->wait; 3997 $signal->wait;
3785} 3998}
3790 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3791 return; 4004 return;
3792 } 4005 }
3793 4006
3794 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
4008
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3795 4010
3796 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3798 Coro::async_pool { 4013 Coro::async_pool {
3799 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
3822} 4037}
3823 4038
3824{ 4039{
3825 # configure BDB 4040 # configure BDB
3826 4041
3827 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3828 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3829 $AnyEvent::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3830 4045
3831 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3832 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
3879 $msg =~ s/\n//; 4094 $msg =~ s/\n//;
3880 4095
3881 # limit the # of concurrent backtraces 4096 # limit the # of concurrent backtraces
3882 if ($_log_backtrace < 2) { 4097 if ($_log_backtrace < 2) {
3883 ++$_log_backtrace; 4098 ++$_log_backtrace;
4099 my $perl_bt = Carp::longmess $msg;
3884 async { 4100 async {
3885 $Coro::current->{desc} = "abt $msg"; 4101 $Coro::current->{desc} = "abt $msg";
3886 4102
3887 my @bt = fork_call { 4103 my @bt = fork_call {
3888 @addr = map { sprintf "%x", $_ } @addr; 4104 @addr = map { sprintf "%x", $_ } @addr;
3899 } 4115 }
3900 4116
3901 @funcs 4117 @funcs
3902 }; 4118 };
3903 4119
3904 LOG llevInfo, "[ABT] $msg\n"; 4120 LOG llevInfo, "[ABT] $perl_bt\n";
4121 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905 LOG llevInfo, "[ABT] $_\n" for @bt; 4122 LOG llevInfo, "[ABT] $_\n" for @bt;
3906 --$_log_backtrace; 4123 --$_log_backtrace;
3907 }; 4124 };
3908 } else { 4125 } else {
3909 LOG llevInfo, "[ABT] $msg\n"; 4126 LOG llevInfo, "[ABT] $msg\n";
3910 LOG llevInfo, "[ABT] [suppressed]\n"; 4127 LOG llevInfo, "[ABT] [suppressed]\n";
3911 } 4128 }
3912} 4129}
3913 4130
3914# load additional modules 4131# load additional modules
3915use cf::pod; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3916 4134
3917END { cf::emergency_save } 4135END { cf::emergency_save }
3918 4136
39191 41371
3920 4138

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines