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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.520 by root, Fri Apr 16 02:37:50 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
97our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 110
100our %RESOURCE; 111our %RESOURCE;
101 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 118our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
106 120
107our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 124our $DB_ENV;
111 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
112our %CFG; 128our %CFG;
113 129
114our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 131our $RUNTIME;
116our $NOW; 132our $NOW;
124 140
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 143our $JITTER; # average jitter
128our $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 :)
129 150
130binmode STDOUT; 151binmode STDOUT;
131binmode STDERR; 152binmode STDERR;
132 153
133# read virtual server time, if available 154# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
138} 159}
139 160
161eval "sub TICK() { $TICK } 1" or die;
162
140mkdir $_ 163mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 165
143our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
144 167
145sub 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::"} };
146 180
147############################################################################# 181#############################################################################
148 182
149=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
150 184
197returns 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
198per 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.
199 233
200=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
201 235
202This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
203C<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
204that call. 238that call.
205 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
206=back 246=back
207 247
208=cut 248=cut
209 249
210BEGIN { 250$Coro::State::WARNHOOK = sub {
211 *CORE::GLOBAL::warn = sub {
212 my $msg = join "", @_; 251 my $msg = join "", @_;
213 252
214 $msg .= "\n" 253 $msg .= "\n"
215 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
216 255
217 $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;
218 257
219 LOG llevError, $msg; 258 LOG llevError, $msg;
220 }; 259};
221}
222 260
223$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
225 265
226 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 268 return;#d#
229 }#d# 269 }#d#
230 270
231 # kill coroutine otherwise 271 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 272 Coro::terminate
234}; 273};
235
236$SIG{__DIE__} = sub { }; #d#?
237 274
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 292)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 294}
258 295
259$EV::DIED = sub { 296$EV::DIED = sub {
260 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
261}; 298};
262 299
263############################################################################# 300#############################################################################
264 301
265=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
302our $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
303 340
304sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
306 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
307=item cf::lock_wait $string 358=item cf::lock_wait $string
308 359
309Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
310 361
311=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
312 363
313Wait 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
314a 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,
315for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
316returned. 367returned.
317 368
318Locks 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
319deadlocked coro. 370deadlocked coro.
325 376
326Return 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.
327 378
328=cut 379=cut
329 380
330our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 382
333sub lock_wait($) { 383sub lock_wait($) {
334 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 385}
347 386
348sub lock_acquire($) { 387sub lock_acquire($) {
349 my ($key) = @_; 388 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 389}
363 390
364sub lock_active($) { 391sub lock_active($) {
365 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 393}
369 394
370sub freeze_mainloop { 395sub freeze_mainloop {
371 tick_inhibit_inc; 396 tick_inhibit_inc;
372 397
373 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
374} 399}
375 400
376=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
377 402
378Like 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
379get spread over timer. 404get spread over time.
380 405
381=cut 406=cut
382 407
383sub periodic($$) { 408sub periodic($$) {
384 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
401 426
402=cut 427=cut
403 428
404our @SLOT_QUEUE; 429our @SLOT_QUEUE;
405our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
406 432
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
410 436
411 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
412 439
413 while () { 440 while () {
414 next_job: 441 next_job:
442
415 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 444
417 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 449 $job->[2]->send;
421 Coro::cede; 450 Coro::cede;
422 goto next_job; 451 goto next_job;
423 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 454 }
425 } 455 }
426 456
427 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
428 # 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
429 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 460 $signal->wait;
431 } else { 461 } else {
462 $busy = 0;
432 Coro::schedule; 463 Coro::schedule;
433 } 464 }
434 } 465 }
435}; 466};
436 467
437sub get_slot($;$$) { 468sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
439 470
440 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
441 472
442 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
443 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
444 476
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
474 506
475sub sync_job(&) { 507sub sync_job(&) {
476 my ($job) = @_; 508 my ($job) = @_;
477 509
478 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
479 my $time = EV::time; 511 my $time = AE::time;
480 512
481 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
483 515
484 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
501 } else { 533 } else {
502 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
503 } 535 }
504 } 536 }
505 537
506 my $time = EV::time - $time; 538 my $time = AE::time - $time;
507 539
508 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
509 541
510 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
511 } else { 543 } else {
555 reset_signals; 587 reset_signals;
556 &$cb 588 &$cb
557 }, @args; 589 }, @args;
558 590
559 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
560} 603}
561 604
562=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
563 606
564=cut 607=cut
1150 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1151 1194
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 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 }
1156 aio_close $fh; 1202 aio_close $fh;
1157 1203
1158 if (@$objs) { 1204 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1164 aio_close $fh; 1213 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1215 }
1167 } else { 1216 } else {
1168 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1169 } 1218 }
1170 1219
1171 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1224 } else {
1173 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1174 } 1226 }
1175 } else { 1227 } else {
1176 aio_unlink $filename; 1228 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1178 } 1230 }
1269 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1270 1322
1271 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1272} 1324}
1273 1325
1326use File::Glob ();
1327
1274cf::player->attach ( 1328cf::player->attach (
1275 on_command => sub { 1329 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1277 1331
1278 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1279 or return; 1333 or return;
1280 1334
1310 1364
1311 cf::override; 1365 cf::override;
1312 }, 1366 },
1313); 1367);
1314 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1315sub load_extensions { 1382sub load_extensions {
1316 cf::sync_job { 1383 cf::sync_job {
1317 my %todo; 1384 my %todo;
1318 1385
1319 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1346 . "\n};\n1"; 1413 . "\n};\n1";
1347 1414
1348 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1349 } 1416 }
1350 1417
1418 my $pass = 0;
1351 my %done; 1419 my %done;
1352 while (%todo) { 1420 while (%todo) {
1353 my $progress; 1421 my $progress;
1354 1422
1423 ++$pass;
1424
1425 ext:
1355 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1428 next ext
1358 unless exists $done{$_}; 1429 unless exists $done{$_};
1359 } 1430 }
1360 1431
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1433
1363 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1438
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1440 if exists $v->{meta}{mandatory};
1371 1441 } else {
1372 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1373 } 1448 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1449 }
1379 1450
1380 skip: 1451 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1383 } 1459 }
1384 }; 1460 };
1385} 1461}
1386 1462
1387############################################################################# 1463#############################################################################
1441 1517
1442sub exists($) { 1518sub exists($) {
1443 my ($login) = @_; 1519 my ($login) = @_;
1444 1520
1445 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1447} 1523}
1448 1524
1449sub find($) { 1525sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1527 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1472 } 1548 }
1473 } 1549 }
1474} 1550}
1475 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1476sub save($) { 1565sub save($) {
1477 my ($pl) = @_; 1566 my ($pl) = @_;
1478 1567
1479 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1480 1569
1485 1574
1486 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1488 1577
1489 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1582
1491 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1584 cf::cede_to_tick;
1493} 1585}
1494 1586
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1800
1709 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1802 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1847 1939
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1850} 1942}
1851 1943
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1944sub decay_objects {
1862 my ($self) = @_; 1945 my ($self) = @_;
1863 1946
1864 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1865 1948
1947sub find { 2030sub find {
1948 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1949 2032
1950 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1951 2034
1952 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2037
1955 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1960 or return; 2040 or return;
1961 2041
1962 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1963 2043
1975 2055
1976 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1977 } 2057 }
1978} 2058}
1979 2059
1980sub pre_load { } 2060sub pre_load { }
1981sub post_load { } 2061#sub post_load { } # XS
1982 2062
1983sub load { 2063sub load {
1984 my ($self) = @_; 2064 my ($self) = @_;
1985 2065
1986 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2112 $self->decay_objects;
2033 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2034 $self->update_buttons; 2114 $self->update_buttons;
2035 cf::cede_to_tick; 2115 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2116 $self->activate;
2039 } 2117 }
2040 2118
2041 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2045 } 2123 }
2046 2124
2047 $self->post_load; 2125 $self->post_load;
2048} 2126}
2049 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2050sub customise_for { 2131sub customise_for {
2051 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2052 2133
2053 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2135 if $self->per_player;
2131 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2132 2213
2133 () 2214 ()
2134} 2215}
2135 2216
2217# common code, used by both ->save and ->swapout
2136sub save { 2218sub _save {
2137 my ($self) = @_; 2219 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2220
2141 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2142 2222
2143 return unless $self->dirty; 2223 return unless $self->dirty;
2144 2224
2164 } else { 2244 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2246 }
2167} 2247}
2168 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2169sub swap_out { 2257sub swap_out {
2170 my ($self) = @_; 2258 my ($self) = @_;
2171 2259
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2261
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2264 return if $self->players;
2180 2265
2181 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2182
2183 $self->deactivate; 2267 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2185 $self->clear; 2275 $self->clear;
2186} 2276}
2187 2277
2188sub reset_at { 2278sub reset_at {
2189 my ($self) = @_; 2279 my ($self) = @_;
2208 2298
2209 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2300
2211 return if $self->players; 2301 return if $self->players;
2212 2302
2213 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2214 2304
2215 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2216 2306
2217 # need to save uniques path 2307 # need to save uniques path
2218 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
2309 : normalise $_ 2399 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2401 ]
2312} 2402}
2313 2403
2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2435
2314=back 2436=back
2315 2437
2316=head3 cf::object 2438=head3 cf::object
2317 2439
2318=cut 2440=cut
2383 2505
2384our $SAY_CHANNEL = { 2506our $SAY_CHANNEL = {
2385 id => "say", 2507 id => "say",
2386 title => "Map", 2508 title => "Map",
2387 reply => "say ", 2509 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2511};
2390 2512
2391our $CHAT_CHANNEL = { 2513our $CHAT_CHANNEL = {
2392 id => "chat", 2514 id => "chat",
2393 title => "Chat", 2515 title => "Chat",
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2608 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2609
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2611 if $self->map && $self->map->{path} ne "{link}";
2490 2612
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2613 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2614}
2493 2615
2494sub cf::object::player::leave_link { 2616sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2617 my ($self, $map, $x, $y) = @_;
2496 2618
2513 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2515 2637
2516 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2519 2641
2520 $map->load; 2642 $map->load;
2521 $map->load_neighbours; 2643 $map->load_neighbours;
2522 2644
2523 return unless $self->contr->active; 2645 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2646
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2529} 2652}
2530 2653
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2655
2533Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
2721 2844
2722 utf8::encode $text; 2845 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2724} 2847}
2725 2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2872}
2873
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 2875
2728Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
2729client if neccessary. C<$type> should be a string identifying the type of 2877client if neccessary. C<$type> should be a string identifying the type of
2730the message, with C<log> being the default. If C<$color> is negative, suppress 2878the message, with C<log> being the default. If C<$color> is negative, suppress
2732 2880
2733=cut 2881=cut
2734 2882
2735# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2737 "c/identify" => { 2891 "c/identify" => {
2738 id => "infobox", 2892 id => "infobox",
2739 title => "Identify", 2893 title => "Identify",
2740 reply => undef, 2894 reply => undef,
2741 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
2743 "c/examine" => { 2897 "c/examine" => {
2744 id => "infobox", 2898 id => "infobox",
2745 title => "Examine", 2899 title => "Examine",
2746 reply => undef, 2900 reply => undef,
2747 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 2908 },
2749 "c/book" => { 2909 "c/book" => {
2750 id => "infobox", 2910 id => "infobox",
2751 title => "Book", 2911 title => "Book",
2752 reply => undef, 2912 reply => undef,
2768 id => "infobox", 2928 id => "infobox",
2769 title => "Body Parts", 2929 title => "Body Parts",
2770 reply => undef, 2930 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 2931 tooltip => "Shows which body parts you posess and are available",
2772 }, 2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2939 "c/skills" => {
2940 id => "infobox",
2941 title => "Skills",
2942 reply => undef,
2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2968 },
2773 "c/uptime" => { 2969 "c/uptime" => {
2774 id => "infobox", 2970 id => "infobox",
2775 title => "Uptime", 2971 title => "Uptime",
2776 reply => undef, 2972 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 2973 tooltip => "How long the server has been running since last restart",
2786 id => "party", 2982 id => "party",
2787 title => "Party", 2983 title => "Party",
2788 reply => "gsay ", 2984 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 2985 tooltip => "Messages and chat related to your party",
2790 }, 2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2791); 2995);
2792 2996
2793sub cf::client::send_msg { 2997sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2795 2999
2800 3004
2801 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3006 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3007 $channel = $CHANNEL{$channel};
2804 3008
2805 $self->ext_msg (channel_info => $channel) 3009 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2809 3011
2810 } elsif (ref $channel) { 3012 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3017 }
2817 3018
2818 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2819 } 3020 }
2820 3021
2821 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2822 3023
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3024 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2827 3027
2828 my $pkt = "msg " 3028 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3029 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3031 );
2832 3032
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt); 3033 $self->send_big_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 3034}
2870 3035
2871=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2872 3037
2873Sends an ext event to the client. 3038Sends an ext event to the client.
2876 3041
2877sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2879 3044
2880 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 } 3050 }
2886} 3051}
2887 3052
2888=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2889 3054
2893 3058
2894sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2896 3061
2897 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove 3065 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3068 }
2904} 3069}
2905 3070
2906=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2907 3072
3008 3173
3009 $coro 3174 $coro
3010} 3175}
3011 3176
3012cf::client->attach ( 3177cf::client->attach (
3013 on_destroy => sub { 3178 on_client_destroy => sub {
3014 my ($ns) = @_; 3179 my ($ns) = @_;
3015 3180
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3182 },
3018); 3183);
3034our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3035 3200
3036$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3037 3202
3038$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3041 sort time 3206 sort time
3042)); 3207));
3043 3208
3044# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
3049 3214
3050 cf::object 3215 cf::object
3051 contr pay_amount pay_player map x y force_find force_add destroy 3216 contr pay_amount pay_player map x y force_find force_add destroy
3052 insert remove name archname title slaying race decrease split 3217 insert remove name archname title slaying race decrease split
3218 value
3053 3219
3054 cf::object::player 3220 cf::object::player
3055 player 3221 player
3056 3222
3057 cf::player 3223 cf::player
3063=cut 3229=cut
3064 3230
3065for ( 3231for (
3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067 insert remove inv nrof name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3234 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
3072) { 3238) {
3073 no strict 'refs'; 3239 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3093 3259
3094 my $qcode = $code; 3260 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3097 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
3098 local $_; 3267 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3268
3101 my $eval = 3269 my $eval =
3102 "do {\n" 3270 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3273 . $code
3106 . "\n}" 3274 . "\n}"
3107 ; 3275 ;
3108 3276
3277 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3112 3286
3113 if ($@) { 3287 if ($@) {
3114 warn "$@"; 3288 warn "$@";
3115 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
3135=cut 3309=cut
3136 3310
3137sub register_script_function { 3311sub register_script_function {
3138 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3139 3313
3140 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3142} 3316}
3143 3317
3144=back 3318=back
3145 3319
3146=cut 3320=cut
3167 3341
3168 $facedata->{version} == 2 3342 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3170 3344
3171 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3172 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC, 3348 type => FT_RSRC,
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3175 }; 3351 };
3176 cf::cede_to_tick; 3352 cf::cede_to_tick;
3177 3353
3178 { 3354 {
3179 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
3181 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3359
3184 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3188 3364
3189 cf::cede_to_tick; 3365 cf::cede_to_tick;
3190 } 3366 }
3191 3367
3192 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3216 3392
3217 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3218 } 3394 }
3219 3395
3220 { 3396 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3224 3398
3225 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3402
3230 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3231 # prepend meta info
3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type}; 3404 cf::face::set_type $idx, $info->{type};
3245 } else { 3405 } else {
3246 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3247 } 3407 }
3248 3408
3331 reload_treasures; 3491 reload_treasures;
3332 3492
3333 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3334} 3494}
3335 3495
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342}
3343
3344sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3346 or return; 3500 or return;
3347 3501
3348 local $/; 3502 local $/;
3349 *CFG = YAML::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3350 3504
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3352 3506
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3359 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3360 }; 3514 };
3361 warn $@ if $@; 3515 warn $@ if $@;
3362 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3363} 3519}
3364 3520
3365sub pidfile() { 3521sub pidfile() {
3366 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367 or die "$PIDFILE: $!"; 3523 or die "$PIDFILE: $!";
3379 3535
3380 seek $fh, 0, 0; 3536 seek $fh, 0, 0;
3381 print $fh $$; 3537 print $fh $$;
3382} 3538}
3383 3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3547}
3548
3384sub main { 3549sub main {
3385 atomic; 3550 cf::init_globals; # initialise logging
3551
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3558
3387 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3561 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3562 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3563 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3564 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3565 })->prio (Coro::PRIO_MAX);
3394 }; 3566 };
3395 3567
3396 { 3568 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3569
3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3579 reload_resources;
3398 reload_config; 3580 reload_config;
3399 db_init; 3581 db_init;
3582
3583 cf::init_uuid;
3584 cf::init_signals;
3585 cf::init_skills;
3586
3587 cf::init_beforeplay;
3588
3589 atomic;
3590
3400 load_extensions; 3591 load_extensions;
3401 3592
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3593 utime time, time, $RUNTIMEFILE;
3406 3594
3407 # no (long-running) fork's whatsoever before this point(!) 3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3598
3410 EV::loop; 3599 (pop @POST_INIT)->(0) while @POST_INIT;
3600 };
3601
3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3411} 3606}
3412 3607
3413############################################################################# 3608#############################################################################
3414# initialisation and cleanup 3609# initialisation and cleanup
3415 3610
3416# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3417BEGIN { 3612BEGIN {
3418 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3422 }; 3617 };
3423 } 3618 }
3424} 3619}
3425 3620
3426sub write_runtime_sync { 3621sub write_runtime_sync {
3622 my $t0 = AE::time;
3623
3427 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3429 3626
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3628
3432 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3433 3630
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3632 or return;
3436 3633
3437 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
3452 or return; 3649 or return;
3453 3650
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3652 and return;
3456 3653
3457 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3655
3459 1 3656 1
3460} 3657}
3461 3658
3462our $uuid_lock; 3659our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3668 my $uuid = "$LOCALDIR/uuid";
3472 3669
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3670 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3671 or return;
3475 3672
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3673 my $value = uuid_seq uuid_cur;
3674
3675 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n";
3677 return;
3678 }
3679
3680 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3681 $uuid_skip = 0;
3478 3682
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3683 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3684 and return;
3481 3685
3503} 3707}
3504 3708
3505sub emergency_save() { 3709sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3507 3711
3508 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3509 3713
3510 cf::sync_job { 3714 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3511 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3726 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3728 $pl->save;
3520 } 3729 }
3521 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3522 3731
3523 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3735 $map->valid or next;
3527 $map->save; 3736 $map->save;
3528 } 3737 }
3529 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3530 3739
3531 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3742 warn "emergency_perl_save: end database checkpoint\n";
3534 3743
3535 warn "begin write uuid\n"; 3744 warn "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3745 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3746 warn "emergency_perl_save: end write uuid\n";
3538 }; 3747 };
3539 3748
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3540 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3541} 3755}
3542 3756
3543sub post_cleanup { 3757sub post_cleanup {
3544 my ($make_core) = @_; 3758 my ($make_core) = @_;
3545 3759
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3786 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3787 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3789 }
3576 warn "cleared package #$pkg\n";#d#
3577} 3790}
3578
3579our $RELOAD; # how many times to reload
3580 3791
3581sub do_reload_perl() { 3792sub do_reload_perl() {
3582 # can/must only be called in main 3793 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 3794 if ($Coro::current != $Coro::main) {
3584 warn "can only reload from main coroutine"; 3795 warn "can only reload from main coroutine";
3585 return; 3796 return;
3586 } 3797 }
3587 3798
3588 return if $RELOAD++; 3799 return if $RELOAD++;
3800
3801 my $t1 = AE::time;
3589 3802
3590 while ($RELOAD) { 3803 while ($RELOAD) {
3591 warn "reloading..."; 3804 warn "reloading...";
3592 3805
3593 warn "entering sync_job"; 3806 warn "entering sync_job";
3654 clear_package "safe::$_" 3867 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3868 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3869
3657 warn "unloading cf.pm \"a bit\""; 3870 warn "unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3871 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3872 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 3873
3661 # don't, removes xs symbols, too, 3874 # don't, removes xs symbols, too,
3662 # and global variables created in xs 3875 # and global variables created in xs
3663 #clear_package __PACKAGE__; 3876 #clear_package __PACKAGE__;
3664 3877
3665 warn "unload completed, starting to reload now"; 3878 warn "unload completed, starting to reload now";
3666 3879
3667 warn "reloading cf.pm"; 3880 warn "reloading cf.pm";
3668 require cf; 3881 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3882 cf::_connect_to_perl_1;
3670 3883
3671 warn "loading config and database again"; 3884 warn "loading config and database again";
3672 cf::reload_config; 3885 cf::reload_config;
3673 3886
3674 warn "loading extensions"; 3887 warn "loading extensions";
3675 cf::load_extensions; 3888 cf::load_extensions;
3676 3889
3890 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 3891 warn "reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3892 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3893 warn "reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3894 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3895 warn "reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3896 reattach $_ for values %PLAYER;
3897 }
3898
3899 warn "running post_init jobs";
3900 (pop @POST_INIT)->(1) while @POST_INIT;
3683 3901
3684 warn "leaving sync_job"; 3902 warn "leaving sync_job";
3685 3903
3686 1 3904 1
3687 } or do { 3905 } or do {
3690 }; 3908 };
3691 3909
3692 warn "reloaded"; 3910 warn "reloaded";
3693 --$RELOAD; 3911 --$RELOAD;
3694 } 3912 }
3913
3914 $t1 = AE::time - $t1;
3915 warn "reload completed in ${t1}s\n";
3695}; 3916};
3696 3917
3697our $RELOAD_WATCHER; # used only during reload 3918our $RELOAD_WATCHER; # used only during reload
3698 3919
3699sub reload_perl() { 3920sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 3921 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 3922 # coro crashes during coro_state_free->destroy here.
3702 3923
3924 $RELOAD_WATCHER ||= cf::async {
3925 Coro::AIO::aio_wait cache_extensions;
3926
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3927 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 3928 do_reload_perl;
3705 undef $RELOAD_WATCHER; 3929 undef $RELOAD_WATCHER;
3930 };
3706 }; 3931 };
3707} 3932}
3708 3933
3709register_command "reload" => sub { 3934register_command "reload" => sub {
3710 my ($who, $arg) = @_; 3935 my ($who, $arg) = @_;
3724 3949
3725our @WAIT_FOR_TICK; 3950our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN; 3951our @WAIT_FOR_TICK_BEGIN;
3727 3952
3728sub wait_for_tick { 3953sub wait_for_tick {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3730 3955
3731 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3732 push @WAIT_FOR_TICK, $signal; 3957 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait; 3958 $signal->wait;
3734} 3959}
3735 3960
3736sub wait_for_tick_begin { 3961sub wait_for_tick_begin {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3962 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3963
3739 my $signal = new Coro::Signal; 3964 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 3965 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 3966 $signal->wait;
3742} 3967}
3747 unless ++$bug_warning > 10; 3972 unless ++$bug_warning > 10;
3748 return; 3973 return;
3749 } 3974 }
3750 3975
3751 cf::server_tick; # one server iteration 3976 cf::server_tick; # one server iteration
3977
3978 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3752 3979
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3980 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3981 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 3982 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 3983 $Coro::current->{desc} = "runtime saver";
3779} 4006}
3780 4007
3781{ 4008{
3782 # configure BDB 4009 # configure BDB
3783 4010
3784 BDB::min_parallel 8; 4011 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4012 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4013 $AnyEvent::BDB::WATCHER->priority (1);
3787 4014
3788 unless ($DB_ENV) { 4015 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4016 $DB_ENV = BDB::db_env_create;
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4096 LOG llevInfo, "[ABT] [suppressed]\n";
3870 } 4097 }
3871} 4098}
3872 4099
3873# load additional modules 4100# load additional modules
3874use cf::pod; 4101require "cf/$_.pm" for @EXTRA_MODULES;
4102cf::_connect_to_perl_2;
3875 4103
3876END { cf::emergency_save } 4104END { cf::emergency_save }
3877 4105
38781 41061
3879 4107

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines