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.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE;
104 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 118our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
109 120
110our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 124our $DB_ENV;
114 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
115our %CFG; 128our %CFG;
116 129
117our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 131our $RUNTIME;
119our $NOW; 132our $NOW;
127 140
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 143our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
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 :)
132 150
133binmode STDOUT; 151binmode STDOUT;
134binmode STDERR; 152binmode STDERR;
135 153
136# read virtual server time, if available 154# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
141} 159}
142 160
161eval "sub TICK() { $TICK } 1" or die;
162
143mkdir $_ 163mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 165
146our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
147 167
148sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
149 184
150############################################################################# 185#############################################################################
151 186
152=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
153 188
200returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
201per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
202 237
203=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
204 239
205This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 242that call.
208 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
209=back 250=back
210 251
211=cut 252=cut
212 253
213BEGIN { 254$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 255 my $msg = join "", @_;
216 256
217 $msg .= "\n" 257 $msg .= "\n"
218 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
219 259
220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221 261
222 LOG llevError, $msg; 262 LOG llevError, $msg;
223 }; 263};
224}
225 264
226$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
228 267
229 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 272 return;#d#
232 }#d# 273 }#d#
233 274
234 # kill coroutine otherwise 275 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 276 Coro::terminate
237}; 277};
238
239$SIG{__DIE__} = sub { }; #d#?
240 278
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 296)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 298}
261 299
262$EV::DIED = sub { 300$EV::DIED = sub {
263 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
264}; 302};
265 303
266############################################################################# 304#############################################################################
267 305
268=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 344
307sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
309 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
310=item cf::lock_wait $string 362=item cf::lock_wait $string
311 363
312Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
313 365
314=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
315 367
316Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
317a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
319returned. 371returned.
320 372
321Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 374deadlocked coro.
328 380
329Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
330 382
331=cut 383=cut
332 384
333our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 386
336sub lock_wait($) { 387sub lock_wait($) {
337 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 389}
350 390
351sub lock_acquire($) { 391sub lock_acquire($) {
352 my ($key) = @_; 392 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 393}
366 394
367sub lock_active($) { 395sub lock_active($) {
368 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 397}
372 398
373sub freeze_mainloop { 399sub freeze_mainloop {
374 tick_inhibit_inc; 400 tick_inhibit_inc;
375 401
376 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
377} 403}
378 404
379=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
380 406
381Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
382get spread over timer. 408get spread over time.
383 409
384=cut 410=cut
385 411
386sub periodic($$) { 412sub periodic($$) {
387 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
404 430
405=cut 431=cut
406 432
407our @SLOT_QUEUE; 433our @SLOT_QUEUE;
408our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
409 436
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
413 440
414 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
415 443
416 while () { 444 while () {
417 next_job: 445 next_job:
446
418 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 448
420 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 453 $job->[2]->send;
424 Coro::cede; 454 Coro::cede;
425 goto next_job; 455 goto next_job;
426 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 458 }
428 } 459 }
429 460
430 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
431 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
432 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 464 $signal->wait;
434 } else { 465 } else {
466 $busy = 0;
435 Coro::schedule; 467 Coro::schedule;
436 } 468 }
437 } 469 }
438}; 470};
439 471
440sub get_slot($;$$) { 472sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
442 474
443 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
444 476
445 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
446 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
447 480
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
477 510
478sub sync_job(&) { 511sub sync_job(&) {
479 my ($job) = @_; 512 my ($job) = @_;
480 513
481 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
482 my $time = EV::time; 515 my $time = AE::time;
483 516
484 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
486 519
487 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
504 } else { 537 } else {
505 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
506 } 539 }
507 } 540 }
508 541
509 my $time = EV::time - $time; 542 my $time = AE::time - $time;
510 543
511 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
512 545
513 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
514 } else { 547 } else {
558 reset_signals; 591 reset_signals;
559 &$cb 592 &$cb
560 }, @args; 593 }, @args;
561 594
562 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
563} 607}
564 608
565=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
566 610
567=cut 611=cut
1153 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1154 1198
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1159 aio_close $fh; 1206 aio_close $fh;
1160 1207
1161 if (@$objs) { 1208 if (@$objs) {
1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1163 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1166 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1167 aio_close $fh; 1217 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1219 }
1170 } else { 1220 } else {
1171 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1172 } 1222 }
1173 1223
1174 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1228 } else {
1176 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1177 } 1230 }
1178 } else { 1231 } else {
1179 aio_unlink $filename; 1232 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1181 } 1234 }
1272 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1273 1326
1274 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1275} 1328}
1276 1329
1330use File::Glob ();
1331
1277cf::player->attach ( 1332cf::player->attach (
1278 on_command => sub { 1333 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1280 1335
1281 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1282 or return; 1337 or return;
1283 1338
1313 1368
1314 cf::override; 1369 cf::override;
1315 }, 1370 },
1316); 1371);
1317 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1318sub load_extensions { 1386sub load_extensions {
1319 cf::sync_job { 1387 cf::sync_job {
1320 my %todo; 1388 my %todo;
1321 1389
1322 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1349 . "\n};\n1"; 1417 . "\n};\n1";
1350 1418
1351 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1352 } 1420 }
1353 1421
1422 my $pass = 0;
1354 my %done; 1423 my %done;
1355 while (%todo) { 1424 while (%todo) {
1356 my $progress; 1425 my $progress;
1357 1426
1427 ++$pass;
1428
1429 ext:
1358 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1432 next ext
1361 unless exists $done{$_}; 1433 unless exists $done{$_};
1362 } 1434 }
1363 1435
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1437
1366 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1442
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1444 if exists $v->{meta}{mandatory};
1374 1445
1375 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1376 } 1455 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1456 }
1382 1457
1383 skip: 1458 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1386 } 1466 }
1387 }; 1467 };
1388} 1468}
1389 1469
1390############################################################################# 1470#############################################################################
1444 1524
1445sub exists($) { 1525sub exists($) {
1446 my ($login) = @_; 1526 my ($login) = @_;
1447 1527
1448 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1450} 1530}
1451 1531
1452sub find($) { 1532sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1534 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1475 } 1555 }
1476 } 1556 }
1477} 1557}
1478 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1479sub save($) { 1572sub save($) {
1480 my ($pl) = @_; 1573 my ($pl) = @_;
1481 1574
1482 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1483 1576
1488 1581
1489 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1491 1584
1492 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1493 1589
1494 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1591 cf::cede_to_tick;
1496} 1592}
1497 1593
1599 \@logins 1695 \@logins
1600} 1696}
1601 1697
1602=item $player->maps 1698=item $player->maps
1603 1699
1700=item cf::player::maps $login
1701
1604Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1605player. May block. 1703player. May block.
1606 1704
1607=cut 1705=cut
1608 1706
1670=cut 1768=cut
1671 1769
1672sub find_by_path($) { 1770sub find_by_path($) {
1673 my ($path) = @_; 1771 my ($path) = @_;
1674 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1675 my ($match, $specificity); 1775 my ($match, $specificity);
1676 1776
1677 for my $region (list) { 1777 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711 1811
1712 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1813 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1850 1950
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1853} 1953}
1854 1954
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1955sub decay_objects {
1865 my ($self) = @_; 1956 my ($self) = @_;
1866 1957
1867 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1868 1959
1950sub find { 2041sub find {
1951 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1952 2043
1953 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1954 2045
1955 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2048
1958 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1963 or return; 2051 or return;
1964 2052
1965 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1966 2054
1978 2066
1979 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1980 } 2068 }
1981} 2069}
1982 2070
1983sub pre_load { } 2071sub pre_load { }
1984sub post_load { } 2072#sub post_load { } # XS
1985 2073
1986sub load { 2074sub load {
1987 my ($self) = @_; 2075 my ($self) = @_;
1988 2076
1989 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2034 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2123 $self->decay_objects;
2036 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2037 $self->update_buttons; 2125 $self->update_buttons;
2038 cf::cede_to_tick; 2126 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2127 $self->activate;
2042 } 2128 }
2043 2129
2044 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2048 } 2134 }
2049 2135
2050 $self->post_load; 2136 $self->post_load;
2051} 2137}
2052 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2053sub customise_for { 2142sub customise_for {
2054 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2055 2144
2056 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2146 if $self->per_player;
2134 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2135 2224
2136 () 2225 ()
2137} 2226}
2138 2227
2228# common code, used by both ->save and ->swapout
2139sub save { 2229sub _save {
2140 my ($self) = @_; 2230 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2231
2144 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2145 2233
2146 return unless $self->dirty; 2234 return unless $self->dirty;
2147 2235
2167 } else { 2255 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2257 }
2170} 2258}
2171 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2172sub swap_out { 2268sub swap_out {
2173 my ($self) = @_; 2269 my ($self) = @_;
2174 2270
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2272
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2183 2276
2184 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2185
2186 $self->deactivate; 2278 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2188 $self->clear; 2286 $self->clear;
2189} 2287}
2190 2288
2191sub reset_at { 2289sub reset_at {
2192 my ($self) = @_; 2290 my ($self) = @_;
2211 2309
2212 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213 2311
2214 return if $self->players; 2312 return if $self->players;
2215 2313
2216 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2217 2315
2218 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2219 2317
2220 # need to save uniques path 2318 # need to save uniques path
2221 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
2312 : normalise $_ 2410 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2412 ]
2315} 2413}
2316 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2317=back 2447=back
2318 2448
2319=head3 cf::object 2449=head3 cf::object
2320 2450
2321=cut 2451=cut
2386 2516
2387our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2388 id => "say", 2518 id => "say",
2389 title => "Map", 2519 title => "Map",
2390 reply => "say ", 2520 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2522};
2393 2523
2394our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2395 id => "chat", 2525 id => "chat",
2396 title => "Chat", 2526 title => "Chat",
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2620
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2493 2623
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2625}
2496 2626
2497sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2499 2629
2516 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2518 2648
2519 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2522 2652
2523 $map->load; 2653 $map->load;
2524 $map->load_neighbours; 2654 $map->load_neighbours;
2525 2655
2526 return unless $self->contr->active; 2656 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2657
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2532} 2663}
2533 2664
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535 2666
2536Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2724 2855
2725 utf8::encode $text; 2856 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2727} 2858}
2728 2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2883}
2884
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2886
2731Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2732client if neccessary. C<$type> should be a string identifying the type of 2888client if neccessary. C<$type> should be a string identifying the type of
2733the message, with C<log> being the default. If C<$color> is negative, suppress 2889the message, with C<log> being the default. If C<$color> is negative, suppress
2735 2891
2736=cut 2892=cut
2737 2893
2738# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2740 "c/identify" => { 2902 "c/identify" => {
2741 id => "infobox", 2903 id => "infobox",
2742 title => "Identify", 2904 title => "Identify",
2743 reply => undef, 2905 reply => undef,
2744 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2746 "c/examine" => { 2908 "c/examine" => {
2747 id => "infobox", 2909 id => "infobox",
2748 title => "Examine", 2910 title => "Examine",
2749 reply => undef, 2911 reply => undef,
2750 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 2919 },
2752 "c/book" => { 2920 "c/book" => {
2753 id => "infobox", 2921 id => "infobox",
2754 title => "Book", 2922 title => "Book",
2755 reply => undef, 2923 reply => undef,
2771 id => "infobox", 2939 id => "infobox",
2772 title => "Body Parts", 2940 title => "Body Parts",
2773 reply => undef, 2941 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2775 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2776 "c/uptime" => { 2980 "c/uptime" => {
2777 id => "infobox", 2981 id => "infobox",
2778 title => "Uptime", 2982 title => "Uptime",
2779 reply => undef, 2983 reply => undef,
2780 tooltip => "How long the server has been running since last restart", 2984 tooltip => "How long the server has been running since last restart",
2789 id => "party", 2993 id => "party",
2790 title => "Party", 2994 title => "Party",
2791 reply => "gsay ", 2995 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party", 2996 tooltip => "Messages and chat related to your party",
2793 }, 2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2794); 3006);
2795 3007
2796sub cf::client::send_msg { 3008sub cf::client::send_msg {
2797 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2798 3010
2803 3015
2804 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2807 3019
2808 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2812 3022
2813 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2818 if $self->can_msg;
2819 } 3028 }
2820 3029
2821 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2822 } 3031 }
2823 3032
2824 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2825 3034
2826 if ($self->can_msg) {
2827 # default colour, mask it out 3035 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2830 3038
2831 my $pkt = "msg " 3039 my $pkt = "msg "
2832 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 ); 3042 );
2835 3043
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2847 } else {
2848 if ($color >= 0) {
2849 # replace some tags by gcfclient-compatible ones
2850 for ($msg) {
2851 1 while
2852 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857 }
2858
2859 $color &= cf::NDI_COLOR_MASK;
2860
2861 utf8::encode $msg;
2862
2863 if (0 && $msg =~ /\[/) {
2864 # COMMAND/INFO
2865 $self->send_packet ("drawextinfo $color 10 8 $msg")
2866 } else {
2867 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2868 $self->send_packet ("drawinfo $color $msg")
2869 }
2870 }
2871 }
2872} 3045}
2873 3046
2874=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2875 3048
2876Sends an ext event to the client. 3049Sends an ext event to the client.
2879 3052
2880sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2881 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2882 3055
2883 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2885 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2886 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2888 } 3061 }
2889} 3062}
2890 3063
2891=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2892 3065
2896 3069
2897sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2898 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2899 3072
2900 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2902 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2903 #TODO: version 1, remove 3076 #TODO: version 1, remove
2904 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2905 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2906 } 3079 }
2907} 3080}
2908 3081
2909=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2910 3083
3011 3184
3012 $coro 3185 $coro
3013} 3186}
3014 3187
3015cf::client->attach ( 3188cf::client->attach (
3016 on_destroy => sub { 3189 on_client_destroy => sub {
3017 my ($ns) = @_; 3190 my ($ns) = @_;
3018 3191
3019 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3020 }, 3193 },
3021); 3194);
3037our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3038 3211
3039$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3040 3213
3041$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3042 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3043 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3044 sort time 3217 sort time
3045)); 3218));
3046 3219
3047# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3051The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3052 3225
3053 cf::object 3226 cf::object
3054 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3055 insert remove name archname title slaying race decrease split 3228 insert remove name archname title slaying race decrease split
3229 value
3056 3230
3057 cf::object::player 3231 cf::object::player
3058 player 3232 player
3059 3233
3060 cf::player 3234 cf::player
3066=cut 3240=cut
3067 3241
3068for ( 3242for (
3069 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3070 insert remove inv nrof name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3072 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3073 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3074 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3075) { 3249) {
3076 no strict 'refs'; 3250 no strict 'refs';
3077 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3078 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 3270
3097 my $qcode = $code; 3271 my $qcode = $code;
3098 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3099 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3100 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3101 local $_; 3278 local $_;
3102 local @safe::cf::_safe_eval_args = values %vars;
3103 3279
3104 my $eval = 3280 my $eval =
3105 "do {\n" 3281 "do {\n"
3106 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3107 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3108 . $code 3284 . $code
3109 . "\n}" 3285 . "\n}"
3110 ; 3286 ;
3111 3287
3288 if ($CFG{safe_eval}) {
3112 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3113 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3114 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3115 3297
3116 if ($@) { 3298 if ($@) {
3117 warn "$@"; 3299 warn "$@";
3118 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3119 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3138=cut 3320=cut
3139 3321
3140sub register_script_function { 3322sub register_script_function {
3141 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3142 3324
3143 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3144 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3145} 3327}
3146 3328
3147=back 3329=back
3148 3330
3149=cut 3331=cut
3170 3352
3171 $facedata->{version} == 2 3353 $facedata->{version} == 2
3172 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3173 3355
3174 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3175 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3176 type => FT_RSRC, 3359 type => FT_RSRC,
3177 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3178 }; 3362 };
3179 cf::cede_to_tick; 3363 cf::cede_to_tick;
3180 3364
3181 { 3365 {
3182 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3184 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3185 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3186 3370
3187 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3188 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3189 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3190 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3191 3375
3192 cf::cede_to_tick; 3376 cf::cede_to_tick;
3193 } 3377 }
3194 3378
3195 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3219 3403
3220 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3221 } 3405 }
3222 3406
3223 { 3407 {
3224 # TODO: for gcfclient pleasure, we should give resources
3225 # that gcfclient doesn't grok a >10000 face index.
3226 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3227 3409
3228 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3229 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3230 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3231 my $data;
3232 3413
3233 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3234 # prepend meta info
3235
3236 my $meta = $enc->encode ({
3237 name => $name,
3238 %{ $info->{meta} || {} },
3239 });
3240
3241 $data = pack "(w/a*)*", $meta, $info->{data};
3242 } else {
3243 $data = $info->{data};
3244 }
3245
3246 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3247 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3248 } else { 3416 } else {
3249 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3250 } 3418 }
3251 3419
3334 reload_treasures; 3502 reload_treasures;
3335 3503
3336 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3337} 3505}
3338 3506
3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3344 reload_resources;
3345}
3346
3347sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3511 or return;
3350 3512
3351 local $/; 3513 local $/;
3352 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3353 3515
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3355 3517
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3525 };
3364 warn $@ if $@; 3526 warn $@ if $@;
3365 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3366} 3530}
3367 3531
3368sub pidfile() { 3532sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
3382 3546
3383 seek $fh, 0, 0; 3547 seek $fh, 0, 0;
3384 print $fh $$; 3548 print $fh $$;
3385} 3549}
3386 3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3558}
3559
3387sub main { 3560sub main {
3388 atomic; 3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3389 3569
3390 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3391 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3393 (async { 3573 (async {
3394 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT; 3575 EV::loop EV::LOOP_ONESHOT;
3396 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3397 }; 3577 };
3398 3578
3399 { 3579 evthread_start IO::AIO::poll_fileno;
3400 my $guard = freeze_mainloop; 3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3401 reload_config; 3591 reload_config;
3402 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3403 load_extensions; 3602 load_extensions;
3404 3603
3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE; 3604 utime time, time, $RUNTIMEFILE;
3409 3605
3410 # no (long-running) fork's whatsoever before this point(!) 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412 3609
3413 EV::loop; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3414} 3617}
3415 3618
3416############################################################################# 3619#############################################################################
3417# initialisation and cleanup 3620# initialisation and cleanup
3418 3621
3419# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3420BEGIN { 3623BEGIN {
3421 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3422 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3423 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3424 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3425 }; 3628 };
3426 } 3629 }
3427} 3630}
3428 3631
3429sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3430 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3432 3637
3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434 3639
3435 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3436 3641
3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3438 or return; 3643 or return;
3439 3644
3440 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3455 or return; 3660 or return;
3456 3661
3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return; 3663 and return;
3459 3664
3460 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3461 3666
3462 1 3667 1
3463} 3668}
3464 3669
3465our $uuid_lock; 3670our $uuid_lock;
3474 my $uuid = "$LOCALDIR/uuid"; 3679 my $uuid = "$LOCALDIR/uuid";
3475 3680
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3682 or return;
3478 3683
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3692 $uuid_skip = 0;
3481 3693
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3695 and return;
3484 3696
3506} 3718}
3507 3719
3508sub emergency_save() { 3720sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3510 3722
3511 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3512 3724
3513 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3514 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3737 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3739 $pl->save;
3523 } 3740 }
3524 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3525 3742
3526 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3746 $map->valid or next;
3530 $map->save; 3747 $map->save;
3531 } 3748 }
3532 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3533 3750
3534 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3537 3754
3538 warn "begin write uuid\n"; 3755 warn "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3756 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3757 warn "emergency_perl_save: end write uuid\n";
3541 }; 3758 };
3542 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3543 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3544} 3766}
3545 3767
3546sub post_cleanup { 3768sub post_cleanup {
3547 my ($make_core) = @_; 3769 my ($make_core) = @_;
3548 3770
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 } 3800 }
3579 warn "cleared package #$pkg\n";#d#
3580} 3801}
3581
3582our $RELOAD; # how many times to reload
3583 3802
3584sub do_reload_perl() { 3803sub do_reload_perl() {
3585 # can/must only be called in main 3804 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3587 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3588 return; 3807 return;
3589 } 3808 }
3590 3809
3591 return if $RELOAD++; 3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3592 3813
3593 while ($RELOAD) { 3814 while ($RELOAD) {
3594 warn "reloading..."; 3815 warn "reloading...";
3595 3816
3596 warn "entering sync_job"; 3817 warn "entering sync_job";
3657 clear_package "safe::$_" 3878 clear_package "safe::$_"
3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3659 3880
3660 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3661 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3662 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3663 3884
3664 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3665 # and global variables created in xs 3886 # and global variables created in xs
3666 #clear_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3667 3888
3668 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3669 3890
3670 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3671 require cf; 3892 require cf;
3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3673 3894
3674 warn "loading config and database again"; 3895 warn "loading config and database again";
3675 cf::reload_config; 3896 cf::reload_config;
3676 3897
3677 warn "loading extensions"; 3898 warn "loading extensions";
3678 cf::load_extensions; 3899 cf::load_extensions;
3679 3900
3901 if ($REATTACH_ON_RELOAD) {
3680 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3681 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3682 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3683 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3684 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3685 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3686 3912
3687 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3688 3914
3689 1 3915 1
3690 } or do { 3916 } or do {
3693 }; 3919 };
3694 3920
3695 warn "reloaded"; 3921 warn "reloaded";
3696 --$RELOAD; 3922 --$RELOAD;
3697 } 3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3698}; 3927};
3699 3928
3700our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3701 3930
3702sub reload_perl() { 3931sub reload_perl() {
3703 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3704 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3705 3934
3935 $RELOAD_WATCHER ||= cf::async {
3936 Coro::AIO::aio_wait cache_extensions;
3937
3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3707 do_reload_perl; 3939 do_reload_perl;
3708 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3941 };
3709 }; 3942 };
3710} 3943}
3711 3944
3712register_command "reload" => sub { 3945register_command "reload" => sub {
3713 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3727 3960
3728our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3729our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3730 3963
3731sub wait_for_tick { 3964sub wait_for_tick {
3732 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3733 3966
3734 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3735 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3736 $signal->wait; 3969 $signal->wait;
3737} 3970}
3738 3971
3739sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 3974
3742 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3744 $signal->wait; 3977 $signal->wait;
3745} 3978}
3750 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3751 return; 3984 return;
3752 } 3985 }
3753 3986
3754 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3755 3990
3756 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3757 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3758 Coro::async_pool { 3993 Coro::async_pool {
3759 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3782} 4017}
3783 4018
3784{ 4019{
3785 # configure BDB 4020 # configure BDB
3786 4021
3787 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3788 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3789 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3790 4025
3791 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3792 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3873 } 4108 }
3874} 4109}
3875 4110
3876# load additional modules 4111# load additional modules
3877use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3878 4114
3879END { cf::emergency_save } 4115END { cf::emergency_save }
3880 4116
38811 41171
3882 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines