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.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.513 by root, Mon Apr 12 05:22:38 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
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$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" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 118our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
99 120
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 124our $DB_ENV;
105 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
106our %CFG; 128our %CFG;
107 129
108our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 131our $RUNTIME;
110our $NOW; 132our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 143our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
123 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
124binmode STDOUT; 151binmode STDOUT;
125binmode STDERR; 152binmode STDERR;
126 153
127# read virtual server time, if available 154# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
132} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
133 162
134mkdir $_ 163mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 165
137our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
138 167
139sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 180
141############################################################################# 181#############################################################################
142 182
143=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
144 184
191returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 233
194=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
195 235
196This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 238that call.
199 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
200=back 246=back
201 247
202=cut 248=cut
203 249
204BEGIN { 250$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 251 my $msg = join "", @_;
207 252
208 $msg .= "\n" 253 $msg .= "\n"
209 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
210 255
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 257
213 LOG llevError, $msg; 258 LOG llevError, $msg;
214 }; 259};
215}
216 260
217$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
219 265
220 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 268 return;#d#
223 }#d# 269 }#d#
224 270
225 # kill coroutine otherwise 271 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 272 Coro::terminate
228}; 273};
229
230$SIG{__DIE__} = sub { }; #d#?
231 274
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 285for my $pkg (qw(
243 cf::global cf::attachable 286 cf::global cf::attachable
244 cf::object cf::object::player 287 cf::object cf::object::player
245 cf::client cf::player 288 cf::client cf::player
246 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
247 cf::map cf::party cf::region 291 cf::party cf::region
248)) { 292)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 294}
252 295
253$EV::DIED = sub { 296$EV::DIED = sub {
254 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
255}; 298};
256 299
257############################################################################# 300#############################################################################
258 301
259=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 340
298sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
300 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
301=item cf::lock_wait $string 358=item cf::lock_wait $string
302 359
303Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
304 361
305=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
306 363
307Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
310returned. 367returned.
311 368
312Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 370deadlocked coro.
319 376
320Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
321 378
322=cut 379=cut
323 380
324our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 382
327sub lock_wait($) { 383sub lock_wait($) {
328 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 385}
341 386
342sub lock_acquire($) { 387sub lock_acquire($) {
343 my ($key) = @_; 388 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 389}
357 390
358sub lock_active($) { 391sub lock_active($) {
359 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 393}
363 394
364sub freeze_mainloop { 395sub freeze_mainloop {
365 tick_inhibit_inc; 396 tick_inhibit_inc;
366 397
367 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
368} 399}
369 400
370=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
371 402
372Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
395 426
396=cut 427=cut
397 428
398our @SLOT_QUEUE; 429our @SLOT_QUEUE;
399our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
400 432
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
404 436
405 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
406 439
407 while () { 440 while () {
408 next_job: 441 next_job:
442
409 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 444
411 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 449 $job->[2]->send;
415 Coro::cede; 450 Coro::cede;
416 goto next_job; 451 goto next_job;
417 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 454 }
419 } 455 }
420 456
421 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 460 $signal->wait;
425 } else { 461 } else {
462 $busy = 0;
426 Coro::schedule; 463 Coro::schedule;
427 } 464 }
428 } 465 }
429}; 466};
430 467
431sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
432 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
433 472
434 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
435 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
436 476
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
466 506
467sub sync_job(&) { 507sub sync_job(&) {
468 my ($job) = @_; 508 my ($job) = @_;
469 509
470 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
471 my $time = EV::time; 511 my $time = AE::time;
472 512
473 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
475 515
476 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
493 } else { 533 } else {
494 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
495 } 535 }
496 } 536 }
497 537
498 my $time = EV::time - $time; 538 my $time = AE::time - $time;
499 539
500 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
501 541
502 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
503 } else { 543 } else {
722 762
723############################################################################# 763#############################################################################
724 764
725=head2 ATTACHABLE OBJECTS 765=head2 ATTACHABLE OBJECTS
726 766
727Many objects in crossfire are so-called attachable objects. That means you can 767Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 768attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 769to it. All such attachable objects support the following methods.
730 770
731In the following description, CLASS can be any of C<global>, C<object> 771In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 772C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 822=item cf::CLASS::attachment $name, ...
783 823
784Register an attachment by C<$name> through which attachable objects of the 824Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 825given CLASS can refer to this attachment.
786 826
787Some classes such as crossfire maps and objects can specify attachments 827Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 828that are attached at load/instantiate time, thus the need for a name.
789 829
790These calls expect any number of the following handler/hook descriptions: 830These calls expect any number of the following handler/hook descriptions:
791 831
792=over 4 832=over 4
1083 1123
1084sub reattach { 1124sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1125 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1126 my ($obj) = @_;
1087 1127
1128 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1129 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1130
1090 my $registry = $obj->registry; 1131 my $registry = $obj->registry;
1091 1132
1092 @$registry = (); 1133 @$registry = ();
1093 1134
1139 utf8::decode (my $decname = $filename); 1180 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1181 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1182 $decname, length $$rdata, scalar @$objs;
1142 1183
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1147 close $fh; 1191 aio_close $fh;
1148 1192
1149 if (@$objs) { 1193 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1194 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1195 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1196 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1197 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1155 close $fh; 1202 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1203 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1204 }
1158 } else { 1205 } else {
1159 aio_unlink "$filename.pst"; 1206 aio_unlink "$filename.pst";
1160 } 1207 }
1161 1208
1162 aio_rename "$filename~", $filename; 1209 aio_rename "$filename~", $filename;
1210
1211 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1213 } else {
1164 warn "FATAL: $filename~: $!\n"; 1214 warn "unable to save objects: $filename~: $!\n";
1165 } 1215 }
1166 } else { 1216 } else {
1167 aio_unlink $filename; 1217 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1218 aio_unlink "$filename.pst";
1169 } 1219 }
1260 my ($name, $cb) = @_; 1310 my ($name, $cb) = @_;
1261 1311
1262 $EXTICMD{$name} = $cb; 1312 $EXTICMD{$name} = $cb;
1263} 1313}
1264 1314
1315use File::Glob ();
1316
1265cf::player->attach ( 1317cf::player->attach (
1266 on_command => sub { 1318 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1319 my ($pl, $name, $params) = @_;
1268 1320
1269 my $cb = $COMMAND{$name} 1321 my $cb = $COMMAND{$name}
1270 or return; 1322 or return;
1271 1323
1301 1353
1302 cf::override; 1354 cf::override;
1303 }, 1355 },
1304); 1356);
1305 1357
1358# "readahead" all extensions
1359sub cache_extensions {
1360 my $grp = IO::AIO::aio_group;
1361
1362 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1363 for (grep /\.ext$/, @{$_[0]}) {
1364 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1365 }
1366 };
1367
1368 $grp
1369}
1370
1306sub load_extensions { 1371sub load_extensions {
1307 cf::sync_job { 1372 cf::sync_job {
1308 my %todo; 1373 my %todo;
1309 1374
1310 for my $path (<$LIBDIR/*.ext>) { 1375 for my $path (<$LIBDIR/*.ext>) {
1329 1394
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1397
1333 $ext{source} = 1398 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1400 . "#line 1 \"$path\"\n{\n"
1336 . $source 1401 . $source
1337 . "\n};\n1"; 1402 . "\n};\n1";
1338 1403
1339 $todo{$base} = \%ext; 1404 $todo{$base} = \%ext;
1340 } 1405 }
1341 1406
1407 my $pass = 0;
1342 my %done; 1408 my %done;
1343 while (%todo) { 1409 while (%todo) {
1344 my $progress; 1410 my $progress;
1345 1411
1412 ++$pass;
1413
1414 ext:
1346 while (my ($k, $v) = each %todo) { 1415 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1416 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1417 next ext
1349 unless exists $done{$_}; 1418 unless exists $done{$_};
1350 } 1419 }
1351 1420
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1422
1354 unless (eval $v->{source}) { 1423 my $active = eval $v->{source};
1424
1425 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1426 warn "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1427
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1428 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1429 if exists $v->{meta}{mandatory};
1362 1430 } else {
1363 warn $msg; 1431 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg};
1433 $progress = 1;
1434
1435 warn "$v->{base}: extension inactive.\n"
1436 unless $active;
1364 } 1437 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1438 }
1370 1439
1371 skip: 1440 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1441 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 unless $progress; 1442
1443 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory};
1446 }
1447 }
1374 } 1448 }
1375 }; 1449 };
1376} 1450}
1377 1451
1378############################################################################# 1452#############################################################################
1379 1453
1380=back 1454=back
1381 1455
1382=head2 CORE EXTENSIONS 1456=head2 CORE EXTENSIONS
1383 1457
1384Functions and methods that extend core crossfire objects. 1458Functions and methods that extend core deliantra objects.
1385 1459
1386=cut 1460=cut
1387 1461
1388package cf::player; 1462package cf::player;
1389 1463
1432 1506
1433sub exists($) { 1507sub exists($) {
1434 my ($login) = @_; 1508 my ($login) = @_;
1435 1509
1436 $cf::PLAYER{$login} 1510 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1511 or !aio_stat path $login
1438} 1512}
1439 1513
1440sub find($) { 1514sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1515 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1516 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1528 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1529 or return;
1456 1530
1457 my $pl = cf::player::load_pl $f 1531 my $pl = cf::player::load_pl $f
1458 or return; 1532 or return;
1533
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1534 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1535 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1536 $cf::PLAYER{$login} = $pl
1462 } 1537 }
1463 } 1538 }
1464} 1539}
1465 1540
1541cf::player->attach (
1542 on_load => sub {
1543 my ($pl, $path) = @_;
1544
1545 # restore slots saved in save, below
1546 my $slots = delete $pl->{_slots};
1547
1548 $pl->ob->current_weapon ($slots->[0]);
1549 $pl->combat_ob ($slots->[1]);
1550 $pl->ranged_ob ($slots->[2]);
1551 },
1552);
1553
1466sub save($) { 1554sub save($) {
1467 my ($pl) = @_; 1555 my ($pl) = @_;
1468 1556
1469 return if $pl->{deny_save}; 1557 return if $pl->{deny_save};
1470 1558
1473 1561
1474 return if $pl->{deny_save}; 1562 return if $pl->{deny_save};
1475 1563
1476 aio_mkdir playerdir $pl, 0770; 1564 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1565 $pl->{last_save} = $cf::RUNTIME;
1566
1567 cf::get_slot 0.01;
1568
1569 # save slots, to be restored later
1570 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1478 1571
1479 $pl->save_pl ($path); 1572 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1573 cf::cede_to_tick;
1481} 1574}
1482 1575
1514 my ($pl) = @_; 1607 my ($pl) = @_;
1515 1608
1516 my $name = $pl->ob->name; 1609 my $name = $pl->ob->name;
1517 1610
1518 $pl->{deny_save} = 1; 1611 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1612 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1613
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1615 $pl->deactivate;
1616 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1617 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1618 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1619 $pl->ns->destroy if $pl->ns;
1525 1620
1526 my $path = playerdir $pl; 1621 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1622 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1661
1567 for my $login (@$dirs) { 1662 for my $login (@$dirs) {
1568 my $path = path $login; 1663 my $path = path $login;
1569 1664
1570 # a .pst is a dead give-away for a valid player 1665 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1666 # if no pst file found, open and chekc for blocked users
1667 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1668 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1669 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1670 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1671 }
1576 1672
1607 } 1703 }
1608 1704
1609 \@paths 1705 \@paths
1610} 1706}
1611 1707
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1708=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1709
1614Expand crossfire pod fragments into protocol xml. 1710Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1711
1705=item $player->ext_reply ($msgid, @msg) 1712=item $player->ext_reply ($msgid, @msg)
1706 1713
1707Sends an ext reply to the player. 1714Sends an ext reply to the player.
1708 1715
1775our $MAX_RESET = 3600; 1782our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1783our $DEFAULT_RESET = 3000;
1777 1784
1778sub generate_random_map { 1785sub generate_random_map {
1779 my ($self, $rmp) = @_; 1786 my ($self, $rmp) = @_;
1787
1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1789
1780 # mit "rum" bekleckern, nicht 1790 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1791 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map}, 1795 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize}, 1796 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1906 1916
1907# the temporary/swap location 1917# the temporary/swap location
1908sub save_path { 1918sub save_path {
1909 my ($self) = @_; 1919 my ($self) = @_;
1910 1920
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1921 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1922 "$TMPDIR/$path.map"
1913} 1923}
1914 1924
1915# the unique path, undef == no special unique path 1925# the unique path, undef == no special unique path
1916sub uniq_path { 1926sub uniq_path {
1917 my ($self) = @_; 1927 my ($self) = @_;
1918 1928
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1929 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1930 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1931}
1931 1932
1932sub decay_objects { 1933sub decay_objects {
1933 my ($self) = @_; 1934 my ($self) = @_;
1934 1935
2018sub find { 2019sub find {
2019 my ($path, $origin) = @_; 2020 my ($path, $origin) = @_;
2020 2021
2021 $path = normalise $path, $origin && $origin->path; 2022 $path = normalise $path, $origin && $origin->path;
2022 2023
2023 cf::lock_wait "map_data:$path";#d#remove 2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2025 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2026
2026 $cf::MAP{$path} || do { 2027 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2028 my $map = new_from_path cf::map $path
2031 or return; 2029 or return;
2032 2030
2033 $map->{last_save} = $cf::RUNTIME; 2031 $map->{last_save} = $cf::RUNTIME;
2034 2032
2036 or return; 2034 or return;
2037 2035
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2036 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2037 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2038 #$cf::WAIT_FOR_TICK->wait;
2039 undef $guard2;
2041 undef $guard1; 2040 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2041 $map->reset;
2044 return find $path; 2042 return find $path;
2045 } 2043 }
2046 2044
2047 $cf::MAP{$path} = $map 2045 $cf::MAP{$path} = $map
2048 } 2046 }
2049} 2047}
2050 2048
2051sub pre_load { } 2049sub pre_load { }
2052sub post_load { } 2050#sub post_load { } # XS
2053 2051
2054sub load { 2052sub load {
2055 my ($self) = @_; 2053 my ($self) = @_;
2056 2054
2057 local $self->{deny_reset} = 1; # loading can take a long time 2055 local $self->{deny_reset} = 1; # loading can take a long time
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2072 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2073 $f->skip_block;
2076 $self->_load_objects ($f) 2074 $self->_load_objects ($f)
2077 or return; 2075 or return;
2078 2076
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2077 $self->post_load_original
2080 if delete $self->{load_original}; 2078 if delete $self->{load_original};
2081 2079
2082 if (my $uniq = $self->uniq_path) { 2080 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2081 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2082 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2100 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2101 $self->decay_objects;
2104 $self->fix_auto_apply; 2102 $self->fix_auto_apply;
2105 $self->update_buttons; 2103 $self->update_buttons;
2106 cf::cede_to_tick; 2104 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2105 $self->activate;
2110 } 2106 }
2111 2107
2112 $self->{last_save} = $cf::RUNTIME; 2108 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2109 $self->last_access ($cf::RUNTIME);
2114 2110
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2111 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2112 }
2117 2113
2118 $self->post_load; 2114 $self->post_load;
2119} 2115}
2120 2116
2117# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath
2121sub customise_for { 2120sub customise_for {
2122 my ($self, $ob) = @_; 2121 my ($self, $ob) = @_;
2123 2122
2124 return find "~" . $ob->name . "/" . $self->{path} 2123 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2124 if $self->per_player;
2178 my ($path, $origin, $load) = @_; 2177 my ($path, $origin, $load) = @_;
2179 2178
2180 $path = normalise $path, $origin && $origin->{path}; 2179 $path = normalise $path, $origin && $origin->{path};
2181 2180
2182 if (my $map = $cf::MAP{$path}) { 2181 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2183 }
2185 2184
2186 $MAP_PREFETCH{$path} |= $load; 2185 $MAP_PREFETCH{$path} |= $load;
2187 2186
2188 $MAP_PREFETCHER ||= cf::async { 2187 $MAP_PREFETCHER ||= cf::async {
2225 cf::async { 2224 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2225 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2226 $_->contr->save for $self->players;
2228 }; 2227 };
2229 2228
2229 cf::get_slot 0.02;
2230
2230 if ($uniq) { 2231 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2233 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2234 } else {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2235 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2242 $self->save; 2243 $self->save;
2243 2244
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2246
2246 return if $self->players; 2247 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2248 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2249 return if $self->{deny_save};
2249 2250
2250 $self->in_memory (cf::MAP_SWAPPED); 2251 $self->in_memory (cf::MAP_SWAPPED);
2251 2252
2252 $self->deactivate; 2253 $self->deactivate;
2277 2278
2278 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279 2280
2280 return if $self->players; 2281 return if $self->players;
2281 2282
2282 warn "resetting map ", $self->path; 2283 warn "resetting map ", $self->path, "\n";
2283 2284
2284 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2285 2286
2286 # need to save uniques path 2287 # need to save uniques path
2287 unless ($self->{deny_save}) { 2288 unless ($self->{deny_save}) {
2370 2371
2371sub unique_maps() { 2372sub unique_maps() {
2372 [ 2373 [
2373 map { 2374 map {
2374 utf8::decode $_; 2375 utf8::decode $_;
2375 /\.map$/ 2376 s/\.map$//; # TODO future compatibility hack
2377 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2378 ? ()
2376 ? normalise $_ 2379 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2380 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2381 ]
2380} 2382}
2381 2383
2384=item cf::map::static_maps
2385
2386Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2387file in the shared directory excluding F</styles> and F</editor>). May
2388block.
2389
2390=cut
2391
2392sub static_maps() {
2393 my @dirs = "";
2394 my @maps;
2395
2396 while (@dirs) {
2397 my $dir = shift @dirs;
2398
2399 next if $dir eq "/styles" || $dir eq "/editor";
2400
2401 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2402 or return;
2403
2404 for (@$files) {
2405 s/\.map$// or next;
2406 utf8::decode $_;
2407 push @maps, "$dir/$_";
2408 }
2409
2410 push @dirs, map "$dir/$_", @$dirs;
2411 }
2412
2413 \@maps
2414}
2415
2382=back 2416=back
2383 2417
2384=head3 cf::object 2418=head3 cf::object
2385 2419
2386=cut 2420=cut
2389 2423
2390=over 4 2424=over 4
2391 2425
2392=item $ob->inv_recursive 2426=item $ob->inv_recursive
2393 2427
2394Returns the inventory of the object _and_ their inventories, recursively. 2428Returns the inventory of the object I<and> their inventories, recursively,
2429but I<not> the object itself.
2395 2430
2396=cut 2431=cut
2397 2432
2398sub inv_recursive_; 2433sub inv_recursive_;
2399sub inv_recursive_ { 2434sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2439 inv_recursive_ inv $_[0]
2405} 2440}
2406 2441
2407=item $ref = $ob->ref 2442=item $ref = $ob->ref
2408 2443
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2444Creates and returns a persistent reference to an object that can be stored as a string.
2410 2445
2411=item $ob = cf::object::deref ($refstring) 2446=item $ob = cf::object::deref ($refstring)
2412 2447
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2448returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2449even if the object actually exists. May block.
2446can be C<undef>. Does the right thing when the player is currently in a 2481can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2482dialogue with the given NPC character.
2448 2483
2449=cut 2484=cut
2450 2485
2486our $SAY_CHANNEL = {
2487 id => "say",
2488 title => "Map",
2489 reply => "say ",
2490 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2491};
2492
2493our $CHAT_CHANNEL = {
2494 id => "chat",
2495 title => "Chat",
2496 reply => "chat ",
2497 tooltip => "Player chat and shouts, global to the server.",
2498};
2499
2451# rough implementation of a future "reply" method that works 2500# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2501# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2502#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2503sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2504 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2515 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2516 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2517
2469 } else { 2518 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2519 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2520 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2521 }
2473 } 2522 }
2474} 2523}
2475 2524
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2525=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2550
2502=item $player_object->enter_link 2551=item $player_object->enter_link
2503 2552
2504Freezes the player and moves him/her to a special map (C<{link}>). 2553Freezes the player and moves him/her to a special map (C<{link}>).
2505 2554
2506The player should be reasonably safe there for short amounts of time. You 2555The player should be reasonably safe there for short amounts of time (e.g.
2507I<MUST> call C<leave_link> as soon as possible, though. 2556for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557though, as the palyer cannot control the character while it is on the link
2558map.
2508 2559
2509Will never block. 2560Will never block.
2510 2561
2511=item $player_object->leave_link ($map, $x, $y) 2562=item $player_object->leave_link ($map, $x, $y)
2512 2563
2564 ($x, $y) = (-1, -1) 2615 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2616 unless (defined $x) && (defined $y);
2566 2617
2567 # use -1 or undef as default coordinates, not 0, 0 2618 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2619 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2620 if $x <= 0 && $y <= 0;
2570 2621
2571 $map->load; 2622 $map->load;
2572 $map->load_neighbours; 2623 $map->load_neighbours;
2573 2624
2574 return unless $self->contr->active; 2625 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2626
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2628 $self->enter_map ($map, $x, $y);
2629
2630 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive;
2579} 2632}
2580 2633
2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2582 2635
2583Moves the player to the given map-path and coordinates by first freezing 2636Moves the player to the given map-path and coordinates by first freezing
2584her, loading and preparing them map, calling the provided $check callback 2637her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2638that has to return the map if sucecssful, and then unfreezes the player on
2586the new (success) or old (failed) map position. In either case, $done will 2639the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2640be called at the end of this process.
2641
2642Note that $check will be called with a potentially non-loaded map, so if
2643it needs a loaded map it has to call C<< ->load >>.
2588 2644
2589=cut 2645=cut
2590 2646
2591our $GOTOGEN; 2647our $GOTOGEN;
2592 2648
2671} 2727}
2672 2728
2673sub prepare_random_map { 2729sub prepare_random_map {
2674 my ($exit) = @_; 2730 my ($exit) = @_;
2675 2731
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2732 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2733 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2734 # that depends on the exit object
2681 2735
2682 my $rmp = parse_random_map_params $exit->msg; 2736 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2738 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2739 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2740 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2741 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2742 $rmp->{origin_y} = $exit->y;
2743
2744 $exit->map->touch;
2689 } 2745 }
2690 2746
2691 $rmp->{random_seed} ||= $exit->random_seed; 2747 $rmp->{random_seed} ||= $exit->random_seed;
2692 2748
2693 my $data = cf::encode_json $rmp; 2749 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2750 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2751 my $meta = "$RANDOMDIR/$md5.meta";
2696 2752
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2753 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2754 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2755 undef $fh;
2700 aio_rename "$meta~", $meta; 2756 aio_rename "$meta~", $meta;
2701 2757
2758 my $slaying = "?random/$md5";
2759
2760 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2761 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2762 $exit->msg (undef);
2763 }
2704 } 2764 }
2705} 2765}
2706 2766
2707sub cf::object::player::enter_exit { 2767sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2768 my ($self, $exit) = @_;
2709 2769
2710 return unless $self->type == cf::PLAYER; 2770 return unless $self->type == cf::PLAYER;
2711 2771
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2772 $self->enter_link;
2724 2773
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2774 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2775 $Coro::current->{desc} = "enter_exit";
2731 2776
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2777 unless (eval {
2778 $self->deactivate_recursive; # just to be sure
2779
2780 # random map handling
2781 {
2782 my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784 prepare_random_map $exit
2785 if $exit->slaying eq "/!";
2786 }
2787
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2789 my $x = $exit->stats->hp;
2790 my $y = $exit->stats->sp;
2791
2734 $self->goto ($slaying, $hp, $sp); 2792 $self->goto ($map, $x, $y);
2735 2793
2794 # if exit is damned, update players death & WoR home-position
2795 $self->contr->savebed ($map, $x, $y)
2796 if $exit->flag (cf::FLAG_DAMNED);
2797
2736 1; 2798 1
2737 }) { 2799 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2800 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "I'll try to bring you back to the map you were before. " 2801 . "I'll try to bring you back to the map you were before. "
2740 . "Please report this to the dungeon master!", 2802 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2803 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2804
2743 warn "ERROR in enter_exit: $@"; 2805 warn "ERROR in enter_exit: $@";
2760sub cf::client::send_drawinfo { 2822sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2823 my ($self, $text, $flags) = @_;
2762 2824
2763 utf8::encode $text; 2825 utf8::encode $text;
2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2826 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2827}
2828
2829=item $client->send_big_packet ($pkt)
2830
2831Like C<send_packet>, but tries to compress large packets, and fragments
2832them as required.
2833
2834=cut
2835
2836our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2837
2838sub cf::client::send_big_packet {
2839 my ($self, $pkt) = @_;
2840
2841 # try lzf for large packets
2842 $pkt = "lzf " . Compress::LZF::compress $pkt
2843 if 1024 <= length $pkt and $self->{can_lzf};
2844
2845 # split very large packets
2846 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2847 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2848 $pkt = "frag";
2849 }
2850
2851 $self->send_packet ($pkt);
2765} 2852}
2766 2853
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2854=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2855
2769Send a drawinfo or msg packet to the client, formatting the msg for the 2856Send a drawinfo or msg packet to the client, formatting the msg for the
2773 2860
2774=cut 2861=cut
2775 2862
2776# non-persistent channels (usually the info channel) 2863# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2864our %CHANNEL = (
2865 "c/motd" => {
2866 id => "infobox",
2867 title => "MOTD",
2868 reply => undef,
2869 tooltip => "The message of the day",
2870 },
2778 "c/identify" => { 2871 "c/identify" => {
2779 id => "infobox", 2872 id => "infobox",
2780 title => "Identify", 2873 title => "Identify",
2781 reply => undef, 2874 reply => undef,
2782 tooltip => "Items recently identified", 2875 tooltip => "Items recently identified",
2784 "c/examine" => { 2877 "c/examine" => {
2785 id => "infobox", 2878 id => "infobox",
2786 title => "Examine", 2879 title => "Examine",
2787 reply => undef, 2880 reply => undef,
2788 tooltip => "Signs and other items you examined", 2881 tooltip => "Signs and other items you examined",
2882 },
2883 "c/shopinfo" => {
2884 id => "infobox",
2885 title => "Shop Info",
2886 reply => undef,
2887 tooltip => "What your bargaining skill tells you about the shop",
2789 }, 2888 },
2790 "c/book" => { 2889 "c/book" => {
2791 id => "infobox", 2890 id => "infobox",
2792 title => "Book", 2891 title => "Book",
2793 reply => undef, 2892 reply => undef,
2809 id => "infobox", 2908 id => "infobox",
2810 title => "Body Parts", 2909 title => "Body Parts",
2811 reply => undef, 2910 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2911 tooltip => "Shows which body parts you posess and are available",
2813 }, 2912 },
2913 "c/statistics" => {
2914 id => "infobox",
2915 title => "Statistics",
2916 reply => undef,
2917 tooltip => "Shows your primary statistics",
2918 },
2919 "c/skills" => {
2920 id => "infobox",
2921 title => "Skills",
2922 reply => undef,
2923 tooltip => "Shows your experience per skill and item power",
2924 },
2925 "c/shopitems" => {
2926 id => "infobox",
2927 title => "Shop Items",
2928 reply => undef,
2929 tooltip => "Shows the items currently for sale in this shop",
2930 },
2931 "c/resistances" => {
2932 id => "infobox",
2933 title => "Resistances",
2934 reply => undef,
2935 tooltip => "Shows your resistances",
2936 },
2937 "c/pets" => {
2938 id => "infobox",
2939 title => "Pets",
2940 reply => undef,
2941 tooltip => "Shows information abotu your pets/a specific pet",
2942 },
2943 "c/perceiveself" => {
2944 id => "infobox",
2945 title => "Perceive Self",
2946 reply => undef,
2947 tooltip => "You gained detailed knowledge about yourself",
2948 },
2814 "c/uptime" => { 2949 "c/uptime" => {
2815 id => "infobox", 2950 id => "infobox",
2816 title => "Uptime", 2951 title => "Uptime",
2817 reply => undef, 2952 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2953 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 2956 id => "infobox",
2822 title => "Map Info", 2957 title => "Map Info",
2823 reply => undef, 2958 reply => undef,
2824 tooltip => "Information related to the maps", 2959 tooltip => "Information related to the maps",
2825 }, 2960 },
2961 "c/party" => {
2962 id => "party",
2963 title => "Party",
2964 reply => "gsay ",
2965 tooltip => "Messages and chat related to your party",
2966 },
2967 "c/death" => {
2968 id => "death",
2969 title => "Death",
2970 reply => undef,
2971 tooltip => "Reason for and more info about your most recent death",
2972 },
2973 "c/say" => $SAY_CHANNEL,
2974 "c/chat" => $CHAT_CHANNEL,
2826); 2975);
2827 2976
2828sub cf::client::send_msg { 2977sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2978 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2979
2831 $msg = $self->pl->expand_cfpod ($msg); 2980 $msg = $self->pl->expand_cfpod ($msg)
2981 unless $color & cf::NDI_VERBATIM;
2832 2982
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2983 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2984
2835 # check predefined channels, for the benefit of C 2985 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2986 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 2987 $channel = $CHANNEL{$channel};
2838 2988
2839 $self->ext_msg (channel_info => $channel) 2989 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 2990 $channel = $channel->{id};
2843 2991
2844 } elsif (ref $channel) { 2992 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 2993 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 2994 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 2995 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 2996 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 2997 }
2851 2998
2852 $channel = $channel->{id}; 2999 $channel = $channel->{id};
2853 } 3000 }
2854 3001
2855 return unless @extra || length $msg; 3002 return unless @extra || length $msg;
2856 3003
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3004 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3005 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3006 if $color & cf::NDI_DEF;
2861 3007
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3008 my $pkt = "msg "
3009 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3010 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3011 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3012
2876 $color &= cf::NDI_COLOR_MASK; 3013 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3014}
2890 3015
2891=item $client->ext_msg ($type, @msg) 3016=item $client->ext_msg ($type, @msg)
2892 3017
2893Sends an ext event to the client. 3018Sends an ext event to the client.
2896 3021
2897sub cf::client::ext_msg($$@) { 3022sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3023 my ($self, $type, @msg) = @_;
2899 3024
2900 if ($self->extcmd == 2) { 3025 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3027 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3028 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3029 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3030 }
2906} 3031}
2907 3032
2908=item $client->ext_reply ($msgid, @msg) 3033=item $client->ext_reply ($msgid, @msg)
2909 3034
2913 3038
2914sub cf::client::ext_reply($$@) { 3039sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3040 my ($self, $id, @msg) = @_;
2916 3041
2917 if ($self->extcmd == 2) { 3042 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3044 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3045 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3046 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3048 }
2924} 3049}
2925 3050
2926=item $success = $client->query ($flags, "text", \&cb) 3051=item $success = $client->query ($flags, "text", \&cb)
2927 3052
3028 3153
3029 $coro 3154 $coro
3030} 3155}
3031 3156
3032cf::client->attach ( 3157cf::client->attach (
3033 on_destroy => sub { 3158 on_client_destroy => sub {
3034 my ($ns) = @_; 3159 my ($ns) = @_;
3035 3160
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3161 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3162 },
3038); 3163);
3054our $safe_hole = new Safe::Hole; 3179our $safe_hole = new Safe::Hole;
3055 3180
3056$SIG{FPE} = 'IGNORE'; 3181$SIG{FPE} = 'IGNORE';
3057 3182
3058$safe->permit_only (Opcode::opset qw( 3183$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3184 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3185 grepstart grepwhile mapstart mapwhile
3061 sort time 3186 sort time
3062)); 3187));
3063 3188
3064# here we export the classes and methods available to script code 3189# here we export the classes and methods available to script code
3067 3192
3068The following functions and methods are available within a safe environment: 3193The following functions and methods are available within a safe environment:
3069 3194
3070 cf::object 3195 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3196 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3197 insert remove name archname title slaying race decrease split
3198 value
3073 3199
3074 cf::object::player 3200 cf::object::player
3075 player 3201 player
3076 3202
3077 cf::player 3203 cf::player
3082 3208
3083=cut 3209=cut
3084 3210
3085for ( 3211for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3212 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3213 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3214 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3215 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3216 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3217 ["cf::map" => qw(trigger)],
3092) { 3218) {
3093 no strict 'refs'; 3219 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3220 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3113 3239
3114 my $qcode = $code; 3240 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3241 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3242 $qcode =~ s/\n/\\n/g;
3117 3243
3244 %vars = (_dummy => 0) unless %vars;
3245
3246 my @res;
3118 local $_; 3247 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3248
3121 my $eval = 3249 my $eval =
3122 "do {\n" 3250 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3251 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3252 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3253 . $code
3126 . "\n}" 3254 . "\n}"
3127 ; 3255 ;
3128 3256
3257 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3258 sub_generation_inc;
3259 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3260 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 sub_generation_inc; 3261 sub_generation_inc;
3262 } else {
3263 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval;
3265 }
3132 3266
3133 if ($@) { 3267 if ($@) {
3134 warn "$@"; 3268 warn "$@";
3135 warn "while executing safe code '$code'\n"; 3269 warn "while executing safe code '$code'\n";
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3270 warn "with arguments " . (join " ", %vars) . "\n";
3155=cut 3289=cut
3156 3290
3157sub register_script_function { 3291sub register_script_function {
3158 my ($fun, $cb) = @_; 3292 my ($fun, $cb) = @_;
3159 3293
3160 no strict 'refs'; 3294 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3295 *$fun = $safe_hole->wrap ($cb);
3162} 3296}
3163 3297
3164=back 3298=back
3165 3299
3166=cut 3300=cut
3187 3321
3188 $facedata->{version} == 2 3322 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3323 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3324
3191 # patch in the exptable 3325 # patch in the exptable
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3192 $facedata->{resource}{"res/exp_table"} = { 3327 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3328 type => FT_RSRC,
3194 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3329 data => $exp_table,
3330 hash => (Digest::MD5::md5 $exp_table),
3195 }; 3331 };
3196 cf::cede_to_tick; 3332 cf::cede_to_tick;
3197 3333
3198 { 3334 {
3199 my $faces = $facedata->{faceinfo}; 3335 my $faces = $facedata->{faceinfo};
3201 while (my ($face, $info) = each %$faces) { 3337 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3338 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3339
3204 cf::face::set_visibility $idx, $info->{visibility}; 3340 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3341 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3208 3344
3209 cf::cede_to_tick; 3345 cf::cede_to_tick;
3210 } 3346 }
3211 3347
3212 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3236 3372
3237 cf::anim::invalidate_all; # d'oh 3373 cf::anim::invalidate_all; # d'oh
3238 } 3374 }
3239 3375
3240 { 3376 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3377 my $res = $facedata->{resource};
3244 3378
3245 while (my ($name, $info) = each %$res) { 3379 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3380 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3381 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3382
3250 if ($info->{type} & 1) { 3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3384 cf::face::set_type $idx, $info->{type};
3265 } else { 3385 } else {
3266 $RESOURCE{$name} = $info; 3386 $RESOURCE{$name} = $info;
3267 } 3387 }
3268 3388
3301 while (my ($k, $v) = each %$want) { 3421 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3422 $ns->fx_want ($k, $v);
3303 } 3423 }
3304}; 3424};
3305 3425
3426sub load_resource_file($) {
3427 my $guard = lock_acquire "load_resource_file";
3428
3429 my $status = load_resource_file_ $_[0];
3430 get_slot 0.1, 100;
3431 cf::arch::commit_load;
3432
3433 $status
3434}
3435
3306sub reload_regions { 3436sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3437 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3438 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3439 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3440
3323} 3453}
3324 3454
3325sub reload_archetypes { 3455sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3456 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3457 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3458}
3334 3459
3335sub reload_treasures { 3460sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3461 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3462 or die "unable to load treasurelists\n";
3338} 3463}
3339 3464
3340sub reload_resources { 3465sub reload_resources {
3341 warn "reloading resource files...\n"; 3466 warn "reloading resource files...\n";
3342 3467
3468 reload_facedata;
3469 reload_archetypes;
3343 reload_regions; 3470 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3471 reload_treasures;
3348 3472
3349 warn "finished reloading resource files\n"; 3473 warn "finished reloading resource files\n";
3350} 3474}
3351 3475
3352sub init {
3353 reload_resources;
3354}
3355
3356sub reload_config { 3476sub reload_config {
3477 warn "reloading config file...\n";
3478
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3479 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3480 or return;
3359 3481
3360 local $/; 3482 local $/;
3361 *CFG = YAML::Load <$fh>; 3483 *CFG = YAML::XS::Load scalar <$fh>;
3362 3484
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3364 3486
3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3371 and die "WARNING: m(un)lockall failed: $!\n"; 3493 and die "WARNING: m(un)lockall failed: $!\n";
3372 }; 3494 };
3373 warn $@ if $@; 3495 warn $@ if $@;
3374 } 3496 }
3497
3498 warn "finished reloading resource files\n";
3499}
3500
3501sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!";
3504 flock $fh, &Fcntl::LOCK_EX
3505 or die "$PIDFILE: flock: $!";
3506 $fh
3507}
3508
3509# make sure only one server instance is running at any one time
3510sub atomic {
3511 my $fh = pidfile;
3512
3513 my $pid = <$fh>;
3514 kill 9, $pid if $pid > 0;
3515
3516 seek $fh, 0, 0;
3517 print $fh $$;
3518}
3519
3520sub main_loop {
3521 warn "EV::loop starting\n";
3522 if (1) {
3523 EV::loop;
3524 }
3525 warn "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP;
3375} 3527}
3376 3528
3377sub main { 3529sub main {
3530 cf::init_globals; # initialise logging
3531
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543
3378 # we must not ever block the main coroutine 3544 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3545 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3546 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3547 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3548 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3549 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3550 })->prio (Coro::PRIO_MAX);
3385 }; 3551 };
3386 3552
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3553 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 3554
3555 cf::sync_job {
3556 cf::load_settings;
3557 cf::load_materials;
3558
3559 reload_resources;
3560 reload_config;
3561 db_init;
3562
3563 cf::init_uuid;
3564 cf::init_signals;
3565 cf::init_skills;
3566
3567 cf::init_beforeplay;
3568
3569 atomic;
3570
3571 load_extensions;
3572
3573 utime time, time, $RUNTIMEFILE;
3574
3575 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578
3579 (pop @POST_INIT)->(0) while @POST_INIT;
3580 };
3581
3582 main_loop;
3394} 3583}
3395 3584
3396############################################################################# 3585#############################################################################
3397# initialisation and cleanup 3586# initialisation and cleanup
3398 3587
3399# install some emergency cleanup handlers 3588# install some emergency cleanup handlers
3400BEGIN { 3589BEGIN {
3401 our %SIGWATCHER = (); 3590 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3591 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3592 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3593 cf::cleanup "SIG$signal";
3405 }; 3594 };
3406 } 3595 }
3407} 3596}
3408 3597
3409sub write_runtime { 3598sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3599 my $t0 = AE::time;
3411 3600
3412 # first touch the runtime file to show we are still running: 3601 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3602 # the fsync below can take a very very long time.
3414 3603
3415 IO::AIO::aio_utime $runtime, undef, undef; 3604 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3605
3417 my $guard = cf::lock_acquire "write_runtime"; 3606 my $guard = cf::lock_acquire "write_runtime";
3418 3607
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3609 or return;
3421 3610
3422 my $value = $cf::RUNTIME + 90 + 10; 3611 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3612 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3613 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3623 aio_utime $fh, undef, undef;
3435 3624
3436 close $fh 3625 close $fh
3437 or return; 3626 or return;
3438 3627
3439 aio_rename "$runtime~", $runtime 3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3629 and return;
3441 3630
3442 warn "runtime file written.\n"; 3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3632
3444 1 3633 1
3445} 3634}
3446 3635
3447our $uuid_lock; 3636our $uuid_lock;
3456 my $uuid = "$LOCALDIR/uuid"; 3645 my $uuid = "$LOCALDIR/uuid";
3457 3646
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3647 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3648 or return;
3460 3649
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3650 my $value = uuid_seq uuid_cur;
3651
3652 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n";
3654 return;
3655 }
3656
3657 my $value = uuid_str $value + $uuid_skip;
3462 $uuid_skip = 0; 3658 $uuid_skip = 0;
3463 3659
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3660 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3661 and return;
3466 3662
3488} 3684}
3489 3685
3490sub emergency_save() { 3686sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3687 my $freeze_guard = cf::freeze_mainloop;
3492 3688
3493 warn "enter emergency perl save\n"; 3689 warn "emergency_perl_save: enter\n";
3494 3690
3495 cf::sync_job { 3691 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696
3496 # use a peculiar iteration method to avoid tripping on perl 3697 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3698 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3699 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3700 warn "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3701 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3702 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3703 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3705 $pl->save;
3505 } 3706 }
3506 warn "end emergency player save\n"; 3707 warn "emergency_perl_save: end player save\n";
3507 3708
3508 warn "begin emergency map save\n"; 3709 warn "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3710 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3711 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3712 $map->valid or next;
3512 $map->save; 3713 $map->save;
3513 } 3714 }
3514 warn "end emergency map save\n"; 3715 warn "emergency_perl_save: end map save\n";
3515 3716
3516 warn "begin emergency database checkpoint\n"; 3717 warn "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3718 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3719 warn "emergency_perl_save: end database checkpoint\n";
3519 3720
3520 warn "begin write uuid\n"; 3721 warn "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3722 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3723 warn "emergency_perl_save: end write uuid\n";
3523 }; 3724 };
3524 3725
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3525 warn "leave emergency perl save\n"; 3731 warn "emergency_perl_save: leave\n";
3526} 3732}
3527 3733
3528sub post_cleanup { 3734sub post_cleanup {
3529 my ($make_core) = @_; 3735 my ($make_core) = @_;
3530 3736
3531 warn Carp::longmess "post_cleanup backtrace" 3737 warn Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3738 if $make_core;
3739
3740 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$;
3742}
3743
3744# a safer delete_package, copied from Symbol
3745sub clear_package($) {
3746 my $pkg = shift;
3747
3748 # expand to full symbol table name if needed
3749 unless ($pkg =~ /^main::.*::$/) {
3750 $pkg = "main$pkg" if $pkg =~ /^::/;
3751 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3752 $pkg .= '::' unless $pkg =~ /::$/;
3753 }
3754
3755 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3756 my $stem_symtab = *{$stem}{HASH};
3757
3758 defined $stem_symtab and exists $stem_symtab->{$leaf}
3759 or return;
3760
3761 # clear all symbols
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 }
3767 warn "cleared package $pkg\n";#d#
3533} 3768}
3534 3769
3535sub do_reload_perl() { 3770sub do_reload_perl() {
3536 # can/must only be called in main 3771 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3772 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3773 warn "can only reload from main coroutine";
3539 return; 3774 return;
3540 } 3775 }
3541 3776
3777 return if $RELOAD++;
3778
3779 my $t1 = AE::time;
3780
3781 while ($RELOAD) {
3542 warn "reloading..."; 3782 warn "reloading...";
3543 3783
3544 warn "entering sync_job"; 3784 warn "entering sync_job";
3545 3785
3546 cf::sync_job { 3786 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark 3787 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3788 cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark 3789 cf::write_runtime_sync; # external watchdog should not bark
3550 3790
3551 warn "syncing database to disk"; 3791 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3792 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3793
3554 # if anything goes wrong in here, we should simply crash as we already saved 3794 # if anything goes wrong in here, we should simply crash as we already saved
3555 3795
3556 warn "flushing outstanding aio requests"; 3796 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3797 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3799 }
3588 3800
3589 warn "... nuking $pkg"; 3801 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3802 $_->cancel for values %EXT_CORO;
3591 } 3803 %EXT_CORO = ();
3592 3804
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3805 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3806 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3807
3808 warn "removing ext/exti commands";
3809 %EXTCMD = ();
3810 %EXTICMD = ();
3811
3812 warn "unloading/nuking all extensions";
3813 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3814 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3815
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3816 if (my $cb = $pkg->can ("unload")) {
3817 eval {
3604 $cb->(); 3818 $cb->($pkg);
3819 1
3820 } or warn "$pkg unloaded, but with errors: $@";
3821 }
3822
3823 warn "... clearing $pkg";
3824 clear_package $pkg;
3605 } 3825 }
3606 3826
3607 Symbol::delete_package $k; 3827 warn "unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830
3831 warn "... unloading $k";
3832 delete $INC{$k};
3833
3834 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g;
3836
3837 if (my $cb = $k->can ("unload_module")) {
3838 $cb->();
3839 }
3840
3841 clear_package $k;
3608 } 3842 }
3609 3843
3610 warn "getting rid of safe::, as good as possible"; 3844 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3845 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3847
3614 warn "unloading cf.pm \"a bit\""; 3848 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3849 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3851
3618 # don't, removes xs symbols, too, 3852 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3853 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3854 #clear_package __PACKAGE__;
3621 3855
3622 warn "unload completed, starting to reload now"; 3856 warn "unload completed, starting to reload now";
3623 3857
3624 warn "reloading cf.pm"; 3858 warn "reloading cf.pm";
3625 require cf; 3859 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3860 cf::_connect_to_perl_1;
3627 3861
3628 warn "loading config and database again"; 3862 warn "loading config and database again";
3629 cf::reload_config; 3863 cf::reload_config;
3630 3864
3631 warn "loading extensions"; 3865 warn "loading extensions";
3632 cf::load_extensions; 3866 cf::load_extensions;
3633 3867
3868 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3869 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3870 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3871 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3872 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3873 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3874 reattach $_ for values %PLAYER;
3875 }
3640 3876
3877 warn "running post_init jobs";
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879
3641 warn "leaving sync_job"; 3880 warn "leaving sync_job";
3642 3881
3643 1 3882 1
3644 } or do { 3883 } or do {
3645 warn $@; 3884 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3885 cf::cleanup "error while reloading, exiting.";
3647 }; 3886 };
3648 3887
3649 warn "reloaded"; 3888 warn "reloaded";
3889 --$RELOAD;
3890 }
3891
3892 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n";
3650}; 3894};
3651 3895
3652our $RELOAD_WATCHER; # used only during reload 3896our $RELOAD_WATCHER; # used only during reload
3653 3897
3654sub reload_perl() { 3898sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3899 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3900 # coro crashes during coro_state_free->destroy here.
3657 3901
3902 $RELOAD_WATCHER ||= cf::async {
3903 Coro::AIO::aio_wait cache_extensions;
3904
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3905 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3906 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3907 undef $RELOAD_WATCHER;
3908 };
3661 }; 3909 };
3662} 3910}
3663 3911
3664register_command "reload" => sub { 3912register_command "reload" => sub {
3665 my ($who, $arg) = @_; 3913 my ($who, $arg) = @_;
3679 3927
3680our @WAIT_FOR_TICK; 3928our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3929our @WAIT_FOR_TICK_BEGIN;
3682 3930
3683sub wait_for_tick { 3931sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3686 3933
3687 my $signal = new Coro::Signal; 3934 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3935 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3936 $signal->wait;
3690} 3937}
3691 3938
3692sub wait_for_tick_begin { 3939sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3695 3941
3696 my $signal = new Coro::Signal; 3942 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3943 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3944 $signal->wait;
3699} 3945}
3705 return; 3951 return;
3706 } 3952 }
3707 3953
3708 cf::server_tick; # one server iteration 3954 cf::server_tick; # one server iteration
3709 3955
3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3957
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712 Coro::async_pool { 3960 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 3961 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 3962 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 3963 or warn "ERROR: unable to write runtime file: $!";
3716 }; 3964 };
3717 } 3965 }
3718 3966
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3736} 3984}
3737 3985
3738{ 3986{
3739 # configure BDB 3987 # configure BDB
3740 3988
3741 BDB::min_parallel 8; 3989 BDB::min_parallel 16;
3742 BDB::max_poll_reqs $TICK * 0.1; 3990 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3991 $AnyEvent::BDB::WATCHER->priority (1);
3744 3992
3745 unless ($DB_ENV) { 3993 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3994 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3995 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 3996 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3997 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3998 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3999 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 4000
3752 cf::sync_job { 4001 cf::sync_job {
3753 eval { 4002 eval {
3779{ 4028{
3780 # configure IO::AIO 4029 # configure IO::AIO
3781 4030
3782 IO::AIO::min_parallel 8; 4031 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 4032 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 4033 undef $AnyEvent::AIO::WATCHER;
3785} 4034}
3786 4035
3787my $_log_backtrace; 4036my $_log_backtrace;
3788 4037
3789sub _log_backtrace { 4038sub _log_backtrace {
3792 $msg =~ s/\n//; 4041 $msg =~ s/\n//;
3793 4042
3794 # limit the # of concurrent backtraces 4043 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 4044 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 4045 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg;
3797 async { 4047 async {
3798 $Coro::current->{desc} = "abt $msg"; 4048 $Coro::current->{desc} = "abt $msg";
3799 4049
3800 my @bt = fork_call { 4050 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 4051 @addr = map { sprintf "%x", $_ } @addr;
3812 } 4062 }
3813 4063
3814 @funcs 4064 @funcs
3815 }; 4065 };
3816 4066
3817 LOG llevInfo, "[ABT] $msg\n"; 4067 LOG llevInfo, "[ABT] $perl_bt\n";
4068 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 4069 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 4070 --$_log_backtrace;
3820 }; 4071 };
3821 } else { 4072 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 4073 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 4074 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 4075 }
3825} 4076}
3826 4077
3827# load additional modules 4078# load additional modules
3828use cf::pod; 4079require "cf/$_.pm" for @EXTRA_MODULES;
4080cf::_connect_to_perl_2;
3829 4081
3830END { cf::emergency_save } 4082END { cf::emergency_save }
3831 4083
38321 40841
3833 4085

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines