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.514 by root, Mon Apr 12 17:13:36 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;
2208 2289
2209 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2291
2211 return if $self->players; 2292 return if $self->players;
2212 2293
2213 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2214 2295
2215 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2216 2297
2217 # need to save uniques path 2298 # need to save uniques path
2218 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2309 : normalise $_ 2390 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2392 ]
2312} 2393}
2313 2394
2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2426
2314=back 2427=back
2315 2428
2316=head3 cf::object 2429=head3 cf::object
2317 2430
2318=cut 2431=cut
2383 2496
2384our $SAY_CHANNEL = { 2497our $SAY_CHANNEL = {
2385 id => "say", 2498 id => "say",
2386 title => "Map", 2499 title => "Map",
2387 reply => "say ", 2500 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2502};
2390 2503
2391our $CHAT_CHANNEL = { 2504our $CHAT_CHANNEL = {
2392 id => "chat", 2505 id => "chat",
2393 title => "Chat", 2506 title => "Chat",
2513 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2515 2628
2516 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2519 2632
2520 $map->load; 2633 $map->load;
2521 $map->load_neighbours; 2634 $map->load_neighbours;
2522 2635
2523 return unless $self->contr->active; 2636 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2637
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2529} 2643}
2530 2644
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2646
2533Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2721 2835
2722 utf8::encode $text; 2836 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2724} 2838}
2725 2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2863}
2864
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 2866
2728Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send 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 2868client 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 2869the message, with C<log> being the default. If C<$color> is negative, suppress
2732 2871
2733=cut 2872=cut
2734 2873
2735# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2737 "c/identify" => { 2882 "c/identify" => {
2738 id => "infobox", 2883 id => "infobox",
2739 title => "Identify", 2884 title => "Identify",
2740 reply => undef, 2885 reply => undef,
2741 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2743 "c/examine" => { 2888 "c/examine" => {
2744 id => "infobox", 2889 id => "infobox",
2745 title => "Examine", 2890 title => "Examine",
2746 reply => undef, 2891 reply => undef,
2747 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 2899 },
2749 "c/book" => { 2900 "c/book" => {
2750 id => "infobox", 2901 id => "infobox",
2751 title => "Book", 2902 title => "Book",
2752 reply => undef, 2903 reply => undef,
2768 id => "infobox", 2919 id => "infobox",
2769 title => "Body Parts", 2920 title => "Body Parts",
2770 reply => undef, 2921 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2772 }, 2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2773 "c/uptime" => { 2960 "c/uptime" => {
2774 id => "infobox", 2961 id => "infobox",
2775 title => "Uptime", 2962 title => "Uptime",
2776 reply => undef, 2963 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 2964 tooltip => "How long the server has been running since last restart",
2786 id => "party", 2973 id => "party",
2787 title => "Party", 2974 title => "Party",
2788 reply => "gsay ", 2975 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 2976 tooltip => "Messages and chat related to your party",
2790 }, 2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2791); 2986);
2792 2987
2793sub cf::client::send_msg { 2988sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2795 2990
2800 2995
2801 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2804 2999
2805 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2809 3002
2810 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3008 }
2817 3009
2818 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2819 } 3011 }
2820 3012
2821 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2822 3014
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3015 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2827 3018
2828 my $pkt = "msg " 3019 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3020 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3022 );
2832 3023
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); 3024 $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} 3025}
2870 3026
2871=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2872 3028
2873Sends an ext event to the client. 3029Sends an ext event to the client.
2876 3032
2877sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2879 3035
2880 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 } 3041 }
2886} 3042}
2887 3043
2888=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2889 3045
2893 3049
2894sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2896 3052
2897 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove 3056 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3059 }
2904} 3060}
2905 3061
2906=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2907 3063
3008 3164
3009 $coro 3165 $coro
3010} 3166}
3011 3167
3012cf::client->attach ( 3168cf::client->attach (
3013 on_destroy => sub { 3169 on_client_destroy => sub {
3014 my ($ns) = @_; 3170 my ($ns) = @_;
3015 3171
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3173 },
3018); 3174);
3034our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3035 3191
3036$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3037 3193
3038$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3041 sort time 3197 sort time
3042)); 3198));
3043 3199
3044# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3049 3205
3050 cf::object 3206 cf::object
3051 contr pay_amount pay_player map x y force_find force_add destroy 3207 contr pay_amount pay_player map x y force_find force_add destroy
3052 insert remove name archname title slaying race decrease split 3208 insert remove name archname title slaying race decrease split
3209 value
3053 3210
3054 cf::object::player 3211 cf::object::player
3055 player 3212 player
3056 3213
3057 cf::player 3214 cf::player
3063=cut 3220=cut
3064 3221
3065for ( 3222for (
3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["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 3224 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3072) { 3229) {
3073 no strict 'refs'; 3230 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3093 3250
3094 my $qcode = $code; 3251 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3097 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3098 local $_; 3258 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3259
3101 my $eval = 3260 my $eval =
3102 "do {\n" 3261 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3264 . $code
3106 . "\n}" 3265 . "\n}"
3107 ; 3266 ;
3108 3267
3268 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
3112 3277
3113 if ($@) { 3278 if ($@) {
3114 warn "$@"; 3279 warn "$@";
3115 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3135=cut 3300=cut
3136 3301
3137sub register_script_function { 3302sub register_script_function {
3138 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3139 3304
3140 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3142} 3307}
3143 3308
3144=back 3309=back
3145 3310
3146=cut 3311=cut
3167 3332
3168 $facedata->{version} == 2 3333 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3170 3335
3171 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3172 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC, 3339 type => FT_RSRC,
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3175 }; 3342 };
3176 cf::cede_to_tick; 3343 cf::cede_to_tick;
3177 3344
3178 { 3345 {
3179 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3181 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3350
3184 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3188 3355
3189 cf::cede_to_tick; 3356 cf::cede_to_tick;
3190 } 3357 }
3191 3358
3192 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3216 3383
3217 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3218 } 3385 }
3219 3386
3220 { 3387 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3224 3389
3225 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3393
3230 if ($info->{type} & 1) { 3394 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}; 3395 cf::face::set_type $idx, $info->{type};
3245 } else { 3396 } else {
3246 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3247 } 3398 }
3248 3399
3331 reload_treasures; 3482 reload_treasures;
3332 3483
3333 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3334} 3485}
3335 3486
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342}
3343
3344sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3346 or return; 3491 or return;
3347 3492
3348 local $/; 3493 local $/;
3349 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3350 3495
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3352 3497
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $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}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3359 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3360 }; 3505 };
3361 warn $@ if $@; 3506 warn $@ if $@;
3362 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3363} 3510}
3364 3511
3365sub pidfile() { 3512sub pidfile() {
3366 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367 or die "$PIDFILE: $!"; 3514 or die "$PIDFILE: $!";
3379 3526
3380 seek $fh, 0, 0; 3527 seek $fh, 0, 0;
3381 print $fh $$; 3528 print $fh $$;
3382} 3529}
3383 3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3538}
3539
3384sub main { 3540sub main {
3385 atomic; 3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 cf::init_experience;
3549 cf::init_anim;
3550 cf::init_attackmess;
3551 cf::init_dynamic;
3552
3553 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3554
3387 # we must not ever block the main coroutine 3555 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3556 local $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3557 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3558 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3559 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3560 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3561 })->prio (Coro::PRIO_MAX);
3394 }; 3562 };
3395 3563
3396 { 3564 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3565
3566 cf::sync_job {
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3398 reload_config; 3571 reload_config;
3399 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3400 load_extensions; 3582 load_extensions;
3401 3583
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3584 utime time, time, $RUNTIMEFILE;
3406 3585
3407 # no (long-running) fork's whatsoever before this point(!) 3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3589
3410 EV::loop; 3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 main_loop;
3411} 3594}
3412 3595
3413############################################################################# 3596#############################################################################
3414# initialisation and cleanup 3597# initialisation and cleanup
3415 3598
3416# install some emergency cleanup handlers 3599# install some emergency cleanup handlers
3417BEGIN { 3600BEGIN {
3418 our %SIGWATCHER = (); 3601 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3602 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3603 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3604 cf::cleanup "SIG$signal";
3422 }; 3605 };
3423 } 3606 }
3424} 3607}
3425 3608
3426sub write_runtime_sync { 3609sub write_runtime_sync {
3610 my $t0 = AE::time;
3611
3427 # first touch the runtime file to show we are still running: 3612 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3613 # the fsync below can take a very very long time.
3429 3614
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3615 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3616
3432 my $guard = cf::lock_acquire "write_runtime"; 3617 my $guard = cf::lock_acquire "write_runtime";
3433 3618
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3619 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3620 or return;
3436 3621
3437 my $value = $cf::RUNTIME + 90 + 10; 3622 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3623 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3624 # 60 allows for the watchdog to kill the server.
3452 or return; 3637 or return;
3453 3638
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3640 and return;
3456 3641
3457 warn "runtime file written.\n"; 3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3643
3459 1 3644 1
3460} 3645}
3461 3646
3462our $uuid_lock; 3647our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3656 my $uuid = "$LOCALDIR/uuid";
3472 3657
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3659 or return;
3475 3660
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3661 my $value = uuid_seq uuid_cur;
3662
3663 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n";
3665 return;
3666 }
3667
3668 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3669 $uuid_skip = 0;
3478 3670
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3671 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3672 and return;
3481 3673
3503} 3695}
3504 3696
3505sub emergency_save() { 3697sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3698 my $freeze_guard = cf::freeze_mainloop;
3507 3699
3508 warn "enter emergency perl save\n"; 3700 warn "emergency_perl_save: enter\n";
3509 3701
3510 cf::sync_job { 3702 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707
3511 # use a peculiar iteration method to avoid tripping on perl 3708 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3709 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3710 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3711 warn "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3712 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3713 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3714 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3716 $pl->save;
3520 } 3717 }
3521 warn "end emergency player save\n"; 3718 warn "emergency_perl_save: end player save\n";
3522 3719
3523 warn "begin emergency map save\n"; 3720 warn "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 3721 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3722 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3723 $map->valid or next;
3527 $map->save; 3724 $map->save;
3528 } 3725 }
3529 warn "end emergency map save\n"; 3726 warn "emergency_perl_save: end map save\n";
3530 3727
3531 warn "begin emergency database checkpoint\n"; 3728 warn "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3729 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3730 warn "emergency_perl_save: end database checkpoint\n";
3534 3731
3535 warn "begin write uuid\n"; 3732 warn "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3733 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3734 warn "emergency_perl_save: end write uuid\n";
3538 }; 3735 };
3539 3736
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3540 warn "leave emergency perl save\n"; 3742 warn "emergency_perl_save: leave\n";
3541} 3743}
3542 3744
3543sub post_cleanup { 3745sub post_cleanup {
3544 my ($make_core) = @_; 3746 my ($make_core) = @_;
3545 3747
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3774 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3775 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3777 }
3576 warn "cleared package #$pkg\n";#d# 3778 warn "cleared package $pkg\n";#d#
3577} 3779}
3578
3579our $RELOAD; # how many times to reload
3580 3780
3581sub do_reload_perl() { 3781sub do_reload_perl() {
3582 # can/must only be called in main 3782 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 3783 if ($Coro::current != $Coro::main) {
3584 warn "can only reload from main coroutine"; 3784 warn "can only reload from main coroutine";
3585 return; 3785 return;
3586 } 3786 }
3587 3787
3588 return if $RELOAD++; 3788 return if $RELOAD++;
3789
3790 my $t1 = AE::time;
3589 3791
3590 while ($RELOAD) { 3792 while ($RELOAD) {
3591 warn "reloading..."; 3793 warn "reloading...";
3592 3794
3593 warn "entering sync_job"; 3795 warn "entering sync_job";
3654 clear_package "safe::$_" 3856 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3858
3657 warn "unloading cf.pm \"a bit\""; 3859 warn "unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3860 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 3862
3661 # don't, removes xs symbols, too, 3863 # don't, removes xs symbols, too,
3662 # and global variables created in xs 3864 # and global variables created in xs
3663 #clear_package __PACKAGE__; 3865 #clear_package __PACKAGE__;
3664 3866
3665 warn "unload completed, starting to reload now"; 3867 warn "unload completed, starting to reload now";
3666 3868
3667 warn "reloading cf.pm"; 3869 warn "reloading cf.pm";
3668 require cf; 3870 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3871 cf::_connect_to_perl_1;
3670 3872
3671 warn "loading config and database again"; 3873 warn "loading config and database again";
3672 cf::reload_config; 3874 cf::reload_config;
3673 3875
3674 warn "loading extensions"; 3876 warn "loading extensions";
3675 cf::load_extensions; 3877 cf::load_extensions;
3676 3878
3879 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 3880 warn "reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3881 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3882 warn "reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3883 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3884 warn "reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3885 reattach $_ for values %PLAYER;
3886 }
3887
3888 warn "running post_init jobs";
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3683 3890
3684 warn "leaving sync_job"; 3891 warn "leaving sync_job";
3685 3892
3686 1 3893 1
3687 } or do { 3894 } or do {
3690 }; 3897 };
3691 3898
3692 warn "reloaded"; 3899 warn "reloaded";
3693 --$RELOAD; 3900 --$RELOAD;
3694 } 3901 }
3902
3903 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n";
3695}; 3905};
3696 3906
3697our $RELOAD_WATCHER; # used only during reload 3907our $RELOAD_WATCHER; # used only during reload
3698 3908
3699sub reload_perl() { 3909sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 3910 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 3911 # coro crashes during coro_state_free->destroy here.
3702 3912
3913 $RELOAD_WATCHER ||= cf::async {
3914 Coro::AIO::aio_wait cache_extensions;
3915
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3916 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 3917 do_reload_perl;
3705 undef $RELOAD_WATCHER; 3918 undef $RELOAD_WATCHER;
3919 };
3706 }; 3920 };
3707} 3921}
3708 3922
3709register_command "reload" => sub { 3923register_command "reload" => sub {
3710 my ($who, $arg) = @_; 3924 my ($who, $arg) = @_;
3724 3938
3725our @WAIT_FOR_TICK; 3939our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN; 3940our @WAIT_FOR_TICK_BEGIN;
3727 3941
3728sub wait_for_tick { 3942sub wait_for_tick {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3730 3944
3731 my $signal = new Coro::Signal; 3945 my $signal = new Coro::Signal;
3732 push @WAIT_FOR_TICK, $signal; 3946 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait; 3947 $signal->wait;
3734} 3948}
3735 3949
3736sub wait_for_tick_begin { 3950sub wait_for_tick_begin {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3952
3739 my $signal = new Coro::Signal; 3953 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 3954 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 3955 $signal->wait;
3742} 3956}
3747 unless ++$bug_warning > 10; 3961 unless ++$bug_warning > 10;
3748 return; 3962 return;
3749 } 3963 }
3750 3964
3751 cf::server_tick; # one server iteration 3965 cf::server_tick; # one server iteration
3966
3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3752 3968
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 3971 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 3972 $Coro::current->{desc} = "runtime saver";
3779} 3995}
3780 3996
3781{ 3997{
3782 # configure BDB 3998 # configure BDB
3783 3999
3784 BDB::min_parallel 8; 4000 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4001 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4002 $AnyEvent::BDB::WATCHER->priority (1);
3787 4003
3788 unless ($DB_ENV) { 4004 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4005 $DB_ENV = BDB::db_env_create;
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4085 LOG llevInfo, "[ABT] [suppressed]\n";
3870 } 4086 }
3871} 4087}
3872 4088
3873# load additional modules 4089# load additional modules
3874use cf::pod; 4090require "cf/$_.pm" for @EXTRA_MODULES;
4091cf::_connect_to_perl_2;
3875 4092
3876END { cf::emergency_save } 4093END { cf::emergency_save }
3877 4094
38781 40951
3879 4096

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines