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.452 by root, Tue Sep 23 00:24:52 2008 UTC vs.
Revision 1.517 by root, Thu Apr 15 06:07:51 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE;
104 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 118our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
109 120
110our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 124our $DB_ENV;
114 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
115our %CFG; 128our %CFG;
116 129
117our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 131our $RUNTIME;
119our $NOW; 132our $NOW;
127 140
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 143our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
132 150
133binmode STDOUT; 151binmode STDOUT;
134binmode STDERR; 152binmode STDERR;
135 153
136# read virtual server time, if available 154# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
141} 159}
142 160
161eval "sub TICK() { $TICK } 1" or die;
162
143mkdir $_ 163mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 165
146our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
147 167
148sub cf::map::normalise; 168sub cf::map::normalise;
169
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::"} };
149 180
150############################################################################# 181#############################################################################
151 182
152=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
153 184
200returns 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
201per 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.
202 233
203=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
204 235
205This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 238that call.
208 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
209=back 246=back
210 247
211=cut 248=cut
212 249
213BEGIN { 250$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 251 my $msg = join "", @_;
216 252
217 $msg .= "\n" 253 $msg .= "\n"
218 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
219 255
220 $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;
221 257
222 LOG llevError, $msg; 258 LOG llevError, $msg;
223 }; 259};
224}
225 260
226$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
228 265
229 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 268 return;#d#
232 }#d# 269 }#d#
233 270
234 # kill coroutine otherwise 271 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 272 Coro::terminate
237}; 273};
238
239$SIG{__DIE__} = sub { }; #d#?
240 274
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 292)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 294}
261 295
262$EV::DIED = sub { 296$EV::DIED = sub {
263 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
264}; 298};
265 299
266############################################################################# 300#############################################################################
267 301
268=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
305our $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
306 340
307sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
310=item cf::lock_wait $string 358=item cf::lock_wait $string
311 359
312Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
313 361
314=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
315 363
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
319returned. 367returned.
320 368
321Locks 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
322deadlocked coro. 370deadlocked coro.
328 376
329Return 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.
330 378
331=cut 379=cut
332 380
333our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 382
336sub lock_wait($) { 383sub lock_wait($) {
337 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 385}
351 386
352sub lock_acquire($) { 387sub lock_acquire($) {
353 my ($key) = @_; 388 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 389}
367 390
368sub lock_active($) { 391sub lock_active($) {
369 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 393}
373 394
374sub freeze_mainloop { 395sub freeze_mainloop {
375 tick_inhibit_inc; 396 tick_inhibit_inc;
376 397
377 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
378} 399}
379 400
380=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
381 402
382Like 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
383get spread over timer. 404get spread over time.
384 405
385=cut 406=cut
386 407
387sub periodic($$) { 408sub periodic($$) {
388 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
405 426
406=cut 427=cut
407 428
408our @SLOT_QUEUE; 429our @SLOT_QUEUE;
409our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
410 432
411$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
414 436
415 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
416 439
417 while () { 440 while () {
418 next_job: 441 next_job:
442
419 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
420 if ($avail > 0.01) { 444
421 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
423 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send; 449 $job->[2]->send;
425 Coro::cede; 450 Coro::cede;
426 goto next_job; 451 goto next_job;
427 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428 } 454 }
429 } 455 }
430 456
431 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
432 # 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
433 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
434 $signal->wait; 460 $signal->wait;
435 } else { 461 } else {
462 $busy = 0;
436 Coro::schedule; 463 Coro::schedule;
437 } 464 }
438 } 465 }
439}; 466};
440 467
441sub get_slot($;$$) { 468sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
443 470
444 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
445 472
446 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
447 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
448 476
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
478 506
479sub sync_job(&) { 507sub sync_job(&) {
480 my ($job) = @_; 508 my ($job) = @_;
481 509
482 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
483 my $time = EV::time; 511 my $time = AE::time;
484 512
485 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
486 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
487 515
488 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
505 } else { 533 } else {
506 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
507 } 535 }
508 } 536 }
509 537
510 my $time = EV::time - $time; 538 my $time = AE::time - $time;
511 539
512 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
513 541
514 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
515 } else { 543 } else {
559 reset_signals; 587 reset_signals;
560 &$cb 588 &$cb
561 }, @args; 589 }, @args;
562 590
563 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 )
564} 603}
565 604
566=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
567 606
568=cut 607=cut
1154 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1155 1194
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1202 aio_close $fh;
1161 1203
1162 if (@$objs) { 1204 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1213 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1215 }
1171 } else { 1216 } else {
1172 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1173 } 1218 }
1174 1219
1175 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1224 } else {
1177 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1178 } 1226 }
1179 } else { 1227 } else {
1180 aio_unlink $filename; 1228 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1182 } 1230 }
1273 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1274 1322
1275 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1276} 1324}
1277 1325
1326use File::Glob ();
1327
1278cf::player->attach ( 1328cf::player->attach (
1279 on_command => sub { 1329 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1281 1331
1282 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1283 or return; 1333 or return;
1284 1334
1314 1364
1315 cf::override; 1365 cf::override;
1316 }, 1366 },
1317); 1367);
1318 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
1319sub load_extensions { 1382sub load_extensions {
1320 cf::sync_job { 1383 cf::sync_job {
1321 my %todo; 1384 my %todo;
1322 1385
1323 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1350 . "\n};\n1"; 1413 . "\n};\n1";
1351 1414
1352 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1353 } 1416 }
1354 1417
1418 my $pass = 0;
1355 my %done; 1419 my %done;
1356 while (%todo) { 1420 while (%todo) {
1357 my $progress; 1421 my $progress;
1358 1422
1423 ++$pass;
1424
1425 ext:
1359 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1360 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1361 goto skip 1428 next ext
1362 unless exists $done{$_}; 1429 unless exists $done{$_};
1363 } 1430 }
1364 1431
1365 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366 1433
1367 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1368 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1369 : "$v->{base}: extension inactive.\n";
1370 1438
1371 if (exists $v->{meta}{mandatory}) {
1372 warn $msg;
1373 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374 } 1440 if exists $v->{meta}{mandatory};
1375 1441 } else {
1376 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;
1377 } 1448 }
1378
1379 $done{$k} = delete $todo{$k};
1380 push @EXTS, $v->{pkg};
1381 $progress = 1;
1382 } 1449 }
1383 1450
1384 skip: 1451 unless ($progress) {
1385 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386 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 }
1387 } 1459 }
1388 }; 1460 };
1389} 1461}
1390 1462
1391############################################################################# 1463#############################################################################
1475 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1476 } 1548 }
1477 } 1549 }
1478} 1550}
1479 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
1480sub save($) { 1565sub save($) {
1481 my ($pl) = @_; 1566 my ($pl) = @_;
1482 1567
1483 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1484 1569
1489 1574
1490 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1491 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1492 1577
1493 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];
1494 1582
1495 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1496 cf::cede_to_tick; 1584 cf::cede_to_tick;
1497} 1585}
1498 1586
1711 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
1712 1800
1713 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1714 $self->_create_random_map ( 1802 $self->_create_random_map (
1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1719 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1720 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1851 1939
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1854} 1942}
1855 1943
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1944sub decay_objects {
1866 my ($self) = @_; 1945 my ($self) = @_;
1867 1946
1868 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1869 1948
1951sub find { 2030sub find {
1952 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1953 2032
1954 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1955 2034
1956 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1958 2037
1959 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1964 or return; 2040 or return;
1965 2041
1966 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1967 2043
1979 2055
1980 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1981 } 2057 }
1982} 2058}
1983 2059
1984sub pre_load { } 2060sub pre_load { }
1985sub post_load { } 2061#sub post_load { } # XS
1986 2062
1987sub load { 2063sub load {
1988 my ($self) = @_; 2064 my ($self) = @_;
1989 2065
1990 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2035 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2112 $self->decay_objects;
2037 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2038 $self->update_buttons; 2114 $self->update_buttons;
2039 cf::cede_to_tick; 2115 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick;
2042 $self->activate; 2116 $self->activate;
2043 } 2117 }
2044 2118
2045 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2049 } 2123 }
2050 2124
2051 $self->post_load; 2125 $self->post_load;
2052} 2126}
2053 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
2054sub customise_for { 2131sub customise_for {
2055 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2056 2133
2057 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2058 if $self->per_player; 2135 if $self->per_player;
2212 2289
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2291
2215 return if $self->players; 2292 return if $self->players;
2216 2293
2217 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2218 2295
2219 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2220 2297
2221 # need to save uniques path 2298 # need to save uniques path
2222 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2313 : normalise $_ 2390 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2392 ]
2316} 2393}
2317 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
2318=back 2427=back
2319 2428
2320=head3 cf::object 2429=head3 cf::object
2321 2430
2322=cut 2431=cut
2387 2496
2388our $SAY_CHANNEL = { 2497our $SAY_CHANNEL = {
2389 id => "say", 2498 id => "say",
2390 title => "Map", 2499 title => "Map",
2391 reply => "say ", 2500 reply => "say ",
2392 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.",
2393}; 2502};
2394 2503
2395our $CHAT_CHANNEL = { 2504our $CHAT_CHANNEL = {
2396 id => "chat", 2505 id => "chat",
2397 title => "Chat", 2506 title => "Chat",
2517 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2518 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2519 2628
2520 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2521 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2522 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2523 2632
2524 $map->load; 2633 $map->load;
2525 $map->load_neighbours; 2634 $map->load_neighbours;
2526 2635
2527 return unless $self->contr->active; 2636 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2637
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $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;
2533} 2643}
2534 2644
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2646
2537Moves 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
2725 2835
2726 utf8::encode $text; 2836 utf8::encode $text;
2727 $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);
2728} 2838}
2729 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
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2866
2732Send 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
2733client 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
2734the 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
2736 2871
2737=cut 2872=cut
2738 2873
2739# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2741 "c/identify" => { 2882 "c/identify" => {
2742 id => "infobox", 2883 id => "infobox",
2743 title => "Identify", 2884 title => "Identify",
2744 reply => undef, 2885 reply => undef,
2745 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2747 "c/examine" => { 2888 "c/examine" => {
2748 id => "infobox", 2889 id => "infobox",
2749 title => "Examine", 2890 title => "Examine",
2750 reply => undef, 2891 reply => undef,
2751 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",
2752 }, 2899 },
2753 "c/book" => { 2900 "c/book" => {
2754 id => "infobox", 2901 id => "infobox",
2755 title => "Book", 2902 title => "Book",
2756 reply => undef, 2903 reply => undef,
2772 id => "infobox", 2919 id => "infobox",
2773 title => "Body Parts", 2920 title => "Body Parts",
2774 reply => undef, 2921 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2776 }, 2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2777 "c/skills" => { 2930 "c/skills" => {
2778 id => "infobox", 2931 id => "infobox",
2779 title => "Skills", 2932 title => "Skills",
2780 reply => undef, 2933 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 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",
2782 }, 2959 },
2783 "c/uptime" => { 2960 "c/uptime" => {
2784 id => "infobox", 2961 id => "infobox",
2785 title => "Uptime", 2962 title => "Uptime",
2786 reply => undef, 2963 reply => undef,
2796 id => "party", 2973 id => "party",
2797 title => "Party", 2974 title => "Party",
2798 reply => "gsay ", 2975 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2976 tooltip => "Messages and chat related to your party",
2800 }, 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,
2801); 2986);
2802 2987
2803sub cf::client::send_msg { 2988sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2990
2810 2995
2811 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2814 2999
2815 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2819 3002
2820 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 3008 }
2827 3009
2828 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2829 } 3011 }
2830 3012
2831 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2832 3014
2833 if ($self->can_msg) {
2834 # default colour, mask it out 3015 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2837 3018
2838 my $pkt = "msg " 3019 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 3020 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 3022 );
2842 3023
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt); 3024 $self->send_big_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 3025}
2880 3026
2881=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2882 3028
2883Sends an ext event to the client. 3029Sends an ext event to the client.
2886 3032
2887sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2888 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2889 3035
2890 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2893 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 } 3041 }
2896} 3042}
2897 3043
2898=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2899 3045
2903 3049
2904sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2906 3052
2907 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove 3056 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3059 }
2914} 3060}
2915 3061
2916=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2917 3063
3018 3164
3019 $coro 3165 $coro
3020} 3166}
3021 3167
3022cf::client->attach ( 3168cf::client->attach (
3023 on_destroy => sub { 3169 on_client_destroy => sub {
3024 my ($ns) = @_; 3170 my ($ns) = @_;
3025 3171
3026 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027 }, 3173 },
3028); 3174);
3044our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3045 3191
3046$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3047 3193
3048$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3049 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3050 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3051 sort time 3197 sort time
3052)); 3198));
3053 3199
3054# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3058The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3059 3205
3060 cf::object 3206 cf::object
3061 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
3062 insert remove name archname title slaying race decrease split 3208 insert remove name archname title slaying race decrease split
3209 value
3063 3210
3064 cf::object::player 3211 cf::object::player
3065 player 3212 player
3066 3213
3067 cf::player 3214 cf::player
3073=cut 3220=cut
3074 3221
3075for ( 3222for (
3076 ["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
3077 insert remove inv nrof name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3082) { 3229) {
3083 no strict 'refs'; 3230 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 3250
3104 my $qcode = $code; 3251 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3107 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3108 local $_; 3258 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars;
3110 3259
3111 my $eval = 3260 my $eval =
3112 "do {\n" 3261 "do {\n"
3113 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3115 . $code 3264 . $code
3116 . "\n}" 3265 . "\n}"
3117 ; 3266 ;
3118 3267
3268 if ($CFG{safe_eval}) {
3119 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3120 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121 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 }
3122 3277
3123 if ($@) { 3278 if ($@) {
3124 warn "$@"; 3279 warn "$@";
3125 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3126 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3145=cut 3300=cut
3146 3301
3147sub register_script_function { 3302sub register_script_function {
3148 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3149 3304
3150 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3151 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3152} 3307}
3153 3308
3154=back 3309=back
3155 3310
3156=cut 3311=cut
3177 3332
3178 $facedata->{version} == 2 3333 $facedata->{version} == 2
3179 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3180 3335
3181 # 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]);
3182 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC, 3339 type => FT_RSRC,
3184 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),
3185 }; 3342 };
3186 cf::cede_to_tick; 3343 cf::cede_to_tick;
3187 3344
3188 { 3345 {
3189 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3191 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3192 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193 3350
3194 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3198 3355
3199 cf::cede_to_tick; 3356 cf::cede_to_tick;
3200 } 3357 }
3201 3358
3202 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3226 3383
3227 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3228 } 3385 }
3229 3386
3230 { 3387 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3234 3389
3235 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239 3393
3240 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3241 # prepend meta info
3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
3248 $data = pack "(w/a*)*", $meta, $info->{data};
3249 } else {
3250 $data = $info->{data};
3251 }
3252
3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3255 } else { 3396 } else {
3256 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3257 } 3398 }
3258 3399
3341 reload_treasures; 3482 reload_treasures;
3342 3483
3343 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3344} 3485}
3345 3486
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3491 or return;
3357 3492
3358 local $/; 3493 local $/;
3359 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3360 3495
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3362 3497
3363 $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};
3364 $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};
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3505 };
3371 warn $@ if $@; 3506 warn $@ if $@;
3372 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3373} 3510}
3374 3511
3375sub pidfile() { 3512sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3514 or die "$PIDFILE: $!";
3389 3526
3390 seek $fh, 0, 0; 3527 seek $fh, 0, 0;
3391 print $fh $$; 3528 print $fh $$;
3392} 3529}
3393 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
3394sub main { 3540sub main {
3395 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 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3549
3397 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3553 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3555 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3404 }; 3557 };
3405 3558
3406 { 3559 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3408 reload_config; 3571 reload_config;
3409 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
3410 load_extensions; 3582 load_extensions;
3411 3583
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3584 utime time, time, $RUNTIMEFILE;
3416 3585
3417 # no (long-running) fork's whatsoever before this point(!) 3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3418 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};
3419 3589
3420 EV::loop; 3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 cf::object::thawer::errors_are_fatal 0;
3594 warn "parse errors in files are no longer fatal from this point on.\n";
3595
3596 main_loop;
3421} 3597}
3422 3598
3423############################################################################# 3599#############################################################################
3424# initialisation and cleanup 3600# initialisation and cleanup
3425 3601
3426# install some emergency cleanup handlers 3602# install some emergency cleanup handlers
3427BEGIN { 3603BEGIN {
3428 our %SIGWATCHER = (); 3604 our %SIGWATCHER = ();
3429 for my $signal (qw(INT HUP TERM)) { 3605 for my $signal (qw(INT HUP TERM)) {
3430 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3606 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3431 cf::cleanup "SIG$signal"; 3607 cf::cleanup "SIG$signal";
3432 }; 3608 };
3433 } 3609 }
3434} 3610}
3435 3611
3436sub write_runtime_sync { 3612sub write_runtime_sync {
3613 my $t0 = AE::time;
3614
3437 # first touch the runtime file to show we are still running: 3615 # first touch the runtime file to show we are still running:
3438 # the fsync below can take a very very long time. 3616 # the fsync below can take a very very long time.
3439 3617
3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3618 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441 3619
3442 my $guard = cf::lock_acquire "write_runtime"; 3620 my $guard = cf::lock_acquire "write_runtime";
3443 3621
3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3622 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445 or return; 3623 or return;
3446 3624
3447 my $value = $cf::RUNTIME + 90 + 10; 3625 my $value = $cf::RUNTIME + 90 + 10;
3448 # 10 is the runtime save interval, for a monotonic clock 3626 # 10 is the runtime save interval, for a monotonic clock
3449 # 60 allows for the watchdog to kill the server. 3627 # 60 allows for the watchdog to kill the server.
3462 or return; 3640 or return;
3463 3641
3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3642 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465 and return; 3643 and return;
3466 3644
3467 warn "runtime file written.\n"; 3645 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3468 3646
3469 1 3647 1
3470} 3648}
3471 3649
3472our $uuid_lock; 3650our $uuid_lock;
3481 my $uuid = "$LOCALDIR/uuid"; 3659 my $uuid = "$LOCALDIR/uuid";
3482 3660
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3661 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3662 or return;
3485 3663
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3664 my $value = uuid_seq uuid_cur;
3665
3666 unless ($value) {
3667 warn "cowardly refusing to write zero uuid value!\n";
3668 return;
3669 }
3670
3671 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3672 $uuid_skip = 0;
3488 3673
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3674 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3675 and return;
3491 3676
3513} 3698}
3514 3699
3515sub emergency_save() { 3700sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3701 my $freeze_guard = cf::freeze_mainloop;
3517 3702
3518 warn "enter emergency perl save\n"; 3703 warn "emergency_perl_save: enter\n";
3519 3704
3520 cf::sync_job { 3705 cf::sync_job {
3706 # this is a trade-off: we want to be very quick here, so
3707 # save all maps without fsync, and later call a global sync
3708 # (which in turn might be very very slow)
3709 local $USE_FSYNC = 0;
3710
3521 # use a peculiar iteration method to avoid tripping on perl 3711 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3712 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3713 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3714 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3715 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3716 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3717 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3718 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3719 $pl->save;
3530 } 3720 }
3531 warn "end emergency player save\n"; 3721 warn "emergency_perl_save: end player save\n";
3532 3722
3533 warn "begin emergency map save\n"; 3723 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3724 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3725 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3726 $map->valid or next;
3537 $map->save; 3727 $map->save;
3538 } 3728 }
3539 warn "end emergency map save\n"; 3729 warn "emergency_perl_save: end map save\n";
3540 3730
3541 warn "begin emergency database checkpoint\n"; 3731 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3732 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3733 warn "emergency_perl_save: end database checkpoint\n";
3544 3734
3545 warn "begin write uuid\n"; 3735 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3736 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3737 warn "emergency_perl_save: end write uuid\n";
3548 }; 3738 };
3549 3739
3740 warn "emergency_perl_save: starting sync()\n";
3741 IO::AIO::aio_sync sub {
3742 warn "emergency_perl_save: finished sync()\n";
3743 };
3744
3550 warn "leave emergency perl save\n"; 3745 warn "emergency_perl_save: leave\n";
3551} 3746}
3552 3747
3553sub post_cleanup { 3748sub post_cleanup {
3554 my ($make_core) = @_; 3749 my ($make_core) = @_;
3555 3750
3592 warn "can only reload from main coroutine"; 3787 warn "can only reload from main coroutine";
3593 return; 3788 return;
3594 } 3789 }
3595 3790
3596 return if $RELOAD++; 3791 return if $RELOAD++;
3792
3793 my $t1 = AE::time;
3597 3794
3598 while ($RELOAD) { 3795 while ($RELOAD) {
3599 warn "reloading..."; 3796 warn "reloading...";
3600 3797
3601 warn "entering sync_job"; 3798 warn "entering sync_job";
3662 clear_package "safe::$_" 3859 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3860 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3861
3665 warn "unloading cf.pm \"a bit\""; 3862 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3863 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3864 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3865
3669 # don't, removes xs symbols, too, 3866 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3867 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3868 #clear_package __PACKAGE__;
3672 3869
3673 warn "unload completed, starting to reload now"; 3870 warn "unload completed, starting to reload now";
3674 3871
3675 warn "reloading cf.pm"; 3872 warn "reloading cf.pm";
3676 require cf; 3873 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3874 cf::_connect_to_perl_1;
3678 3875
3679 warn "loading config and database again"; 3876 warn "loading config and database again";
3680 cf::reload_config; 3877 cf::reload_config;
3681 3878
3682 warn "loading extensions"; 3879 warn "loading extensions";
3683 cf::load_extensions; 3880 cf::load_extensions;
3684 3881
3882 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3883 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3884 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3885 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3886 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3887 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3888 reattach $_ for values %PLAYER;
3889 }
3890
3891 warn "running post_init jobs";
3892 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3893
3692 warn "leaving sync_job"; 3894 warn "leaving sync_job";
3693 3895
3694 1 3896 1
3695 } or do { 3897 } or do {
3698 }; 3900 };
3699 3901
3700 warn "reloaded"; 3902 warn "reloaded";
3701 --$RELOAD; 3903 --$RELOAD;
3702 } 3904 }
3905
3906 $t1 = AE::time - $t1;
3907 warn "reload completed in ${t1}s\n";
3703}; 3908};
3704 3909
3705our $RELOAD_WATCHER; # used only during reload 3910our $RELOAD_WATCHER; # used only during reload
3706 3911
3707sub reload_perl() { 3912sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3913 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3914 # coro crashes during coro_state_free->destroy here.
3710 3915
3916 $RELOAD_WATCHER ||= cf::async {
3917 Coro::AIO::aio_wait cache_extensions;
3918
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3919 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3920 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3921 undef $RELOAD_WATCHER;
3922 };
3714 }; 3923 };
3715} 3924}
3716 3925
3717register_command "reload" => sub { 3926register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3927 my ($who, $arg) = @_;
3732 3941
3733our @WAIT_FOR_TICK; 3942our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3943our @WAIT_FOR_TICK_BEGIN;
3735 3944
3736sub wait_for_tick { 3945sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3946 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3947
3739 my $signal = new Coro::Signal; 3948 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3949 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3950 $signal->wait;
3742} 3951}
3743 3952
3744sub wait_for_tick_begin { 3953sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3955
3747 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3957 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3958 $signal->wait;
3750} 3959}
3755 unless ++$bug_warning > 10; 3964 unless ++$bug_warning > 10;
3756 return; 3965 return;
3757 } 3966 }
3758 3967
3759 cf::server_tick; # one server iteration 3968 cf::server_tick; # one server iteration
3969
3970 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760 3971
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3972 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3973 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 3974 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 3975 $Coro::current->{desc} = "runtime saver";
3787} 3998}
3788 3999
3789{ 4000{
3790 # configure BDB 4001 # configure BDB
3791 4002
3792 BDB::min_parallel 8; 4003 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4004 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4005 $AnyEvent::BDB::WATCHER->priority (1);
3795 4006
3796 unless ($DB_ENV) { 4007 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4008 $DB_ENV = BDB::db_env_create;
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4088 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 4089 }
3879} 4090}
3880 4091
3881# load additional modules 4092# load additional modules
3882use cf::pod; 4093require "cf/$_.pm" for @EXTRA_MODULES;
4094cf::_connect_to_perl_2;
3883 4095
3884END { cf::emergency_save } 4096END { cf::emergency_save }
3885 4097
38861 40981
3887 4099

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines