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.453 by root, Tue Sep 23 04:29:11 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
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;
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
132 145
133our @POST_INIT; 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 :)
134 150
135binmode STDOUT; 151binmode STDOUT;
136binmode STDERR; 152binmode STDERR;
137 153
138# read virtual server time, if available 154# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
143} 159}
144 160
161eval "sub TICK() { $TICK } 1" or die;
162
145mkdir $_ 163mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 165
148our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
149 167
150sub 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::"} };
151 180
152############################################################################# 181#############################################################################
153 182
154=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
155 184
202returns 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
203per 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.
204 233
205=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
206 235
207This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 238that call.
210 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
211=back 246=back
212 247
213=cut 248=cut
214 249
215BEGIN { 250$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 251 my $msg = join "", @_;
218 252
219 $msg .= "\n" 253 $msg .= "\n"
220 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
221 255
222 $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;
223 257
224 LOG llevError, $msg; 258 LOG llevError, $msg;
225 }; 259};
226}
227 260
228$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
230 265
231 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 268 return;#d#
234 }#d# 269 }#d#
235 270
236 # kill coroutine otherwise 271 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 272 Coro::terminate
239}; 273};
240
241$SIG{__DIE__} = sub { }; #d#?
242 274
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 292)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 294}
263 295
264$EV::DIED = sub { 296$EV::DIED = sub {
265 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
266}; 298};
267 299
268############################################################################# 300#############################################################################
269 301
270=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
328Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
329 361
330=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
331 363
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
335returned. 367returned.
336 368
337Locks 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
338deadlocked coro. 370deadlocked coro.
344 376
345Return 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.
346 378
347=cut 379=cut
348 380
349our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 382
352sub lock_wait($) { 383sub lock_wait($) {
353 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 385}
367 386
368sub lock_acquire($) { 387sub lock_acquire($) {
369 my ($key) = @_; 388 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 389}
383 390
384sub lock_active($) { 391sub lock_active($) {
385 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 393}
389 394
390sub freeze_mainloop { 395sub freeze_mainloop {
391 tick_inhibit_inc; 396 tick_inhibit_inc;
392 397
393 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
394} 399}
395 400
396=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
397 402
398Like 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
399get spread over timer. 404get spread over time.
400 405
401=cut 406=cut
402 407
403sub periodic($$) { 408sub periodic($$) {
404 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
421 426
422=cut 427=cut
423 428
424our @SLOT_QUEUE; 429our @SLOT_QUEUE;
425our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
426 432
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
430 436
431 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
432 439
433 while () { 440 while () {
434 next_job: 441 next_job:
442
435 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 444
437 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 449 $job->[2]->send;
441 Coro::cede; 450 Coro::cede;
442 goto next_job; 451 goto next_job;
443 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 454 }
445 } 455 }
446 456
447 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 460 $signal->wait;
451 } else { 461 } else {
462 $busy = 0;
452 Coro::schedule; 463 Coro::schedule;
453 } 464 }
454 } 465 }
455}; 466};
456 467
457sub get_slot($;$$) { 468sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
459 470
460 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
461 472
462 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
463 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
464 476
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
494 506
495sub sync_job(&) { 507sub sync_job(&) {
496 my ($job) = @_; 508 my ($job) = @_;
497 509
498 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
499 my $time = EV::time; 511 my $time = AE::time;
500 512
501 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
503 515
504 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
521 } else { 533 } else {
522 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
523 } 535 }
524 } 536 }
525 537
526 my $time = EV::time - $time; 538 my $time = AE::time - $time;
527 539
528 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
529 541
530 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
531 } else { 543 } else {
575 reset_signals; 587 reset_signals;
576 &$cb 588 &$cb
577 }, @args; 589 }, @args;
578 590
579 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 )
580} 603}
581 604
582=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
583 606
584=cut 607=cut
1170 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1171 1194
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1202 aio_close $fh;
1177 1203
1178 if (@$objs) { 1204 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1213 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1215 }
1187 } else { 1216 } else {
1188 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1189 } 1218 }
1190 1219
1191 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1224 } else {
1193 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1194 } 1226 }
1195 } else { 1227 } else {
1196 aio_unlink $filename; 1228 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1198 } 1230 }
1289 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1290 1322
1291 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1292} 1324}
1293 1325
1326use File::Glob ();
1327
1294cf::player->attach ( 1328cf::player->attach (
1295 on_command => sub { 1329 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1297 1331
1298 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1299 or return; 1333 or return;
1300 1334
1330 1364
1331 cf::override; 1365 cf::override;
1332 }, 1366 },
1333); 1367);
1334 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
1335sub load_extensions { 1382sub load_extensions {
1336 cf::sync_job { 1383 cf::sync_job {
1337 my %todo; 1384 my %todo;
1338 1385
1339 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1366 . "\n};\n1"; 1413 . "\n};\n1";
1367 1414
1368 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1369 } 1416 }
1370 1417
1418 my $pass = 0;
1371 my %done; 1419 my %done;
1372 while (%todo) { 1420 while (%todo) {
1373 my $progress; 1421 my $progress;
1374 1422
1423 ++$pass;
1424
1425 ext:
1375 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1428 next ext
1378 unless exists $done{$_}; 1429 unless exists $done{$_};
1379 } 1430 }
1380 1431
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1433
1383 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1438
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1440 if exists $v->{meta}{mandatory};
1391 1441 } else {
1392 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;
1393 } 1448 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1449 }
1399 1450
1400 skip: 1451 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1459 }
1404 }; 1460 };
1405} 1461}
1406 1462
1407############################################################################# 1463#############################################################################
1491 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1492 } 1548 }
1493 } 1549 }
1494} 1550}
1495 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
1496sub save($) { 1565sub save($) {
1497 my ($pl) = @_; 1566 my ($pl) = @_;
1498 1567
1499 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1500 1569
1505 1574
1506 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1508 1577
1509 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];
1510 1582
1511 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1584 cf::cede_to_tick;
1513} 1585}
1514 1586
1727 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
1728 1800
1729 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1802 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1867 1939
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1870} 1942}
1871 1943
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1944sub decay_objects {
1882 my ($self) = @_; 1945 my ($self) = @_;
1883 1946
1884 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1885 1948
1967sub find { 2030sub find {
1968 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1969 2032
1970 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1971 2034
1972 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2037
1975 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1980 or return; 2040 or return;
1981 2041
1982 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1983 2043
1995 2055
1996 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1997 } 2057 }
1998} 2058}
1999 2059
2000sub pre_load { } 2060sub pre_load { }
2001sub post_load { } 2061#sub post_load { } # XS
2002 2062
2003sub load { 2063sub load {
2004 my ($self) = @_; 2064 my ($self) = @_;
2005 2065
2006 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2112 $self->decay_objects;
2053 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2054 $self->update_buttons; 2114 $self->update_buttons;
2055 cf::cede_to_tick; 2115 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2116 $self->activate;
2059 } 2117 }
2060 2118
2061 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2065 } 2123 }
2066 2124
2067 $self->post_load; 2125 $self->post_load;
2068} 2126}
2069 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
2070sub customise_for { 2131sub customise_for {
2071 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2072 2133
2073 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2135 if $self->per_player;
2228 2289
2229 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230 2291
2231 return if $self->players; 2292 return if $self->players;
2232 2293
2233 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2234 2295
2235 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2236 2297
2237 # need to save uniques path 2298 # need to save uniques path
2238 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2329 : normalise $_ 2390 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2392 ]
2332} 2393}
2333 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
2334=back 2427=back
2335 2428
2336=head3 cf::object 2429=head3 cf::object
2337 2430
2338=cut 2431=cut
2403 2496
2404our $SAY_CHANNEL = { 2497our $SAY_CHANNEL = {
2405 id => "say", 2498 id => "say",
2406 title => "Map", 2499 title => "Map",
2407 reply => "say ", 2500 reply => "say ",
2408 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.",
2409}; 2502};
2410 2503
2411our $CHAT_CHANNEL = { 2504our $CHAT_CHANNEL = {
2412 id => "chat", 2505 id => "chat",
2413 title => "Chat", 2506 title => "Chat",
2533 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2535 2628
2536 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2539 2632
2540 $map->load; 2633 $map->load;
2541 $map->load_neighbours; 2634 $map->load_neighbours;
2542 2635
2543 return unless $self->contr->active; 2636 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2637
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $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;
2549} 2643}
2550 2644
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2646
2553Moves 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
2741 2835
2742 utf8::encode $text; 2836 utf8::encode $text;
2743 $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);
2744} 2838}
2745 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
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2866
2748Send 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
2749client 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
2750the 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
2752 2871
2753=cut 2872=cut
2754 2873
2755# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2757 "c/identify" => { 2882 "c/identify" => {
2758 id => "infobox", 2883 id => "infobox",
2759 title => "Identify", 2884 title => "Identify",
2760 reply => undef, 2885 reply => undef,
2761 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2763 "c/examine" => { 2888 "c/examine" => {
2764 id => "infobox", 2889 id => "infobox",
2765 title => "Examine", 2890 title => "Examine",
2766 reply => undef, 2891 reply => undef,
2767 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",
2768 }, 2899 },
2769 "c/book" => { 2900 "c/book" => {
2770 id => "infobox", 2901 id => "infobox",
2771 title => "Book", 2902 title => "Book",
2772 reply => undef, 2903 reply => undef,
2788 id => "infobox", 2919 id => "infobox",
2789 title => "Body Parts", 2920 title => "Body Parts",
2790 reply => undef, 2921 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2792 }, 2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2793 "c/skills" => { 2930 "c/skills" => {
2794 id => "infobox", 2931 id => "infobox",
2795 title => "Skills", 2932 title => "Skills",
2796 reply => undef, 2933 reply => undef,
2797 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",
2798 }, 2959 },
2799 "c/uptime" => { 2960 "c/uptime" => {
2800 id => "infobox", 2961 id => "infobox",
2801 title => "Uptime", 2962 title => "Uptime",
2802 reply => undef, 2963 reply => undef,
2812 id => "party", 2973 id => "party",
2813 title => "Party", 2974 title => "Party",
2814 reply => "gsay ", 2975 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2976 tooltip => "Messages and chat related to your party",
2816 }, 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,
2817); 2986);
2818 2987
2819sub cf::client::send_msg { 2988sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2990
2826 2995
2827 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2830 2999
2831 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2835 3002
2836 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3008 }
2843 3009
2844 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2845 } 3011 }
2846 3012
2847 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2848 3014
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3015 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2853 3018
2854 my $pkt = "msg " 3019 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3020 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3022 );
2858 3023
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3024 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3025}
2896 3026
2897=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2898 3028
2899Sends an ext event to the client. 3029Sends an ext event to the client.
2902 3032
2903sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2905 3035
2906 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3041 }
2912} 3042}
2913 3043
2914=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2915 3045
2919 3049
2920sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2922 3052
2923 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3056 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3059 }
2930} 3060}
2931 3061
2932=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2933 3063
3034 3164
3035 $coro 3165 $coro
3036} 3166}
3037 3167
3038cf::client->attach ( 3168cf::client->attach (
3039 on_destroy => sub { 3169 on_client_destroy => sub {
3040 my ($ns) = @_; 3170 my ($ns) = @_;
3041 3171
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3173 },
3044); 3174);
3060our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3061 3191
3062$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3063 3193
3064$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3067 sort time 3197 sort time
3068)); 3198));
3069 3199
3070# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3075 3205
3076 cf::object 3206 cf::object
3077 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
3078 insert remove name archname title slaying race decrease split 3208 insert remove name archname title slaying race decrease split
3209 value
3079 3210
3080 cf::object::player 3211 cf::object::player
3081 player 3212 player
3082 3213
3083 cf::player 3214 cf::player
3089=cut 3220=cut
3090 3221
3091for ( 3222for (
3092 ["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
3093 insert remove inv nrof name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3098) { 3229) {
3099 no strict 'refs'; 3230 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3119 3250
3120 my $qcode = $code; 3251 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3123 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3124 local $_; 3258 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3259
3127 my $eval = 3260 my $eval =
3128 "do {\n" 3261 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3264 . $code
3132 . "\n}" 3265 . "\n}"
3133 ; 3266 ;
3134 3267
3268 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 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 }
3138 3277
3139 if ($@) { 3278 if ($@) {
3140 warn "$@"; 3279 warn "$@";
3141 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3161=cut 3300=cut
3162 3301
3163sub register_script_function { 3302sub register_script_function {
3164 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3165 3304
3166 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3168} 3307}
3169 3308
3170=back 3309=back
3171 3310
3172=cut 3311=cut
3193 3332
3194 $facedata->{version} == 2 3333 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3335
3197 # 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]);
3198 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3339 type => FT_RSRC,
3200 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),
3201 }; 3342 };
3202 cf::cede_to_tick; 3343 cf::cede_to_tick;
3203 3344
3204 { 3345 {
3205 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3350
3210 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3355
3215 cf::cede_to_tick; 3356 cf::cede_to_tick;
3216 } 3357 }
3217 3358
3218 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3242 3383
3243 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3244 } 3385 }
3245 3386
3246 { 3387 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3250 3389
3251 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3393
3256 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3271 } else { 3396 } else {
3272 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3273 } 3398 }
3274 3399
3358 3483
3359 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3360} 3485}
3361 3486
3362sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3491 or return;
3365 3492
3366 local $/; 3493 local $/;
3367 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3368 3495
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3370 3497
3371 $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};
3372 $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};
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3505 };
3379 warn $@ if $@; 3506 warn $@ if $@;
3380 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3381} 3510}
3382 3511
3383sub pidfile() { 3512sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3514 or die "$PIDFILE: $!";
3397 3526
3398 seek $fh, 0, 0; 3527 seek $fh, 0, 0;
3399 print $fh $$; 3528 print $fh $$;
3400} 3529}
3401 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
3402sub main { 3540sub main {
3403 cf::init_globals; # initialise logging 3541 cf::init_globals; # initialise logging
3404 3542
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3409 3547
3410 cf::init_experience; 3548 cf::init_experience;
3411 cf::init_anim; 3549 cf::init_anim;
3412 cf::init_attackmess; 3550 cf::init_attackmess;
3413 cf::init_dynamic; 3551 cf::init_dynamic;
3414 cf::init_block;
3415 3552
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3553 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3554
3418 # we must not ever block the main coroutine 3555 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3556 local $Coro::idle = sub {
3425 }; 3562 };
3426 3563
3427 evthread_start IO::AIO::poll_fileno; 3564 evthread_start IO::AIO::poll_fileno;
3428 3565
3429 cf::sync_job { 3566 cf::sync_job {
3567 cf::load_settings;
3568 cf::load_materials;
3569
3430 reload_resources; 3570 reload_resources;
3431 reload_config; 3571 reload_config;
3432 db_init; 3572 db_init;
3433 3573
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3574 cf::init_uuid;
3437 cf::init_signals; 3575 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3576 cf::init_skills;
3440 3577
3441 cf::init_beforeplay; 3578 cf::init_beforeplay;
3442 3579
3443 atomic; 3580 atomic;
3445 load_extensions; 3582 load_extensions;
3446 3583
3447 utime time, time, $RUNTIMEFILE; 3584 utime time, time, $RUNTIMEFILE;
3448 3585
3449 # no (long-running) fork's whatsoever before this point(!) 3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3450 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};
3451 3589
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3590 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3591 };
3454 3592
3455 EV::loop; 3593 main_loop;
3456} 3594}
3457 3595
3458############################################################################# 3596#############################################################################
3459# initialisation and cleanup 3597# initialisation and cleanup
3460 3598
3461# install some emergency cleanup handlers 3599# install some emergency cleanup handlers
3462BEGIN { 3600BEGIN {
3463 our %SIGWATCHER = (); 3601 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3602 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3603 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3604 cf::cleanup "SIG$signal";
3467 }; 3605 };
3468 } 3606 }
3469} 3607}
3470 3608
3471sub write_runtime_sync { 3609sub write_runtime_sync {
3610 my $t0 = AE::time;
3611
3472 # first touch the runtime file to show we are still running: 3612 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3613 # the fsync below can take a very very long time.
3474 3614
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3615 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3616
3477 my $guard = cf::lock_acquire "write_runtime"; 3617 my $guard = cf::lock_acquire "write_runtime";
3478 3618
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3619 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3620 or return;
3481 3621
3482 my $value = $cf::RUNTIME + 90 + 10; 3622 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3623 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3624 # 60 allows for the watchdog to kill the server.
3497 or return; 3637 or return;
3498 3638
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3640 and return;
3501 3641
3502 warn "runtime file written.\n"; 3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3643
3504 1 3644 1
3505} 3645}
3506 3646
3507our $uuid_lock; 3647our $uuid_lock;
3516 my $uuid = "$LOCALDIR/uuid"; 3656 my $uuid = "$LOCALDIR/uuid";
3517 3657
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3659 or return;
3520 3660
3521 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;
3522 $uuid_skip = 0; 3669 $uuid_skip = 0;
3523 3670
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3671 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3672 and return;
3526 3673
3548} 3695}
3549 3696
3550sub emergency_save() { 3697sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3698 my $freeze_guard = cf::freeze_mainloop;
3552 3699
3553 warn "enter emergency perl save\n"; 3700 warn "emergency_perl_save: enter\n";
3554 3701
3555 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
3556 # use a peculiar iteration method to avoid tripping on perl 3708 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3709 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3710 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3711 warn "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3712 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3713 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3714 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3716 $pl->save;
3565 } 3717 }
3566 warn "end emergency player save\n"; 3718 warn "emergency_perl_save: end player save\n";
3567 3719
3568 warn "begin emergency map save\n"; 3720 warn "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3721 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3722 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3723 $map->valid or next;
3572 $map->save; 3724 $map->save;
3573 } 3725 }
3574 warn "end emergency map save\n"; 3726 warn "emergency_perl_save: end map save\n";
3575 3727
3576 warn "begin emergency database checkpoint\n"; 3728 warn "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3729 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3730 warn "emergency_perl_save: end database checkpoint\n";
3579 3731
3580 warn "begin write uuid\n"; 3732 warn "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3733 write_uuid_sync 1;
3582 warn "end write uuid\n"; 3734 warn "emergency_perl_save: end write uuid\n";
3583 }; 3735 };
3584 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
3585 warn "leave emergency perl save\n"; 3742 warn "emergency_perl_save: leave\n";
3586} 3743}
3587 3744
3588sub post_cleanup { 3745sub post_cleanup {
3589 my ($make_core) = @_; 3746 my ($make_core) = @_;
3590 3747
3627 warn "can only reload from main coroutine"; 3784 warn "can only reload from main coroutine";
3628 return; 3785 return;
3629 } 3786 }
3630 3787
3631 return if $RELOAD++; 3788 return if $RELOAD++;
3789
3790 my $t1 = AE::time;
3632 3791
3633 while ($RELOAD) { 3792 while ($RELOAD) {
3634 warn "reloading..."; 3793 warn "reloading...";
3635 3794
3636 warn "entering sync_job"; 3795 warn "entering sync_job";
3697 clear_package "safe::$_" 3856 clear_package "safe::$_"
3698 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);
3699 3858
3700 warn "unloading cf.pm \"a bit\""; 3859 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3860 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3862
3704 # don't, removes xs symbols, too, 3863 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3864 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3865 #clear_package __PACKAGE__;
3707 3866
3708 warn "unload completed, starting to reload now"; 3867 warn "unload completed, starting to reload now";
3709 3868
3710 warn "reloading cf.pm"; 3869 warn "reloading cf.pm";
3711 require cf; 3870 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3871 cf::_connect_to_perl_1;
3713 3872
3714 warn "loading config and database again"; 3873 warn "loading config and database again";
3715 cf::reload_config; 3874 cf::reload_config;
3716 3875
3717 warn "loading extensions"; 3876 warn "loading extensions";
3718 cf::load_extensions; 3877 cf::load_extensions;
3719 3878
3879 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3880 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3881 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3882 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3883 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3884 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3885 reattach $_ for values %PLAYER;
3886 }
3726 3887
3727 warn "running post_load"; 3888 warn "running post_init jobs";
3728 (pop @POST_INIT)->(1) while @POST_INIT; 3889 (pop @POST_INIT)->(1) while @POST_INIT;
3729 3890
3730 warn "leaving sync_job"; 3891 warn "leaving sync_job";
3731 3892
3732 1 3893 1
3736 }; 3897 };
3737 3898
3738 warn "reloaded"; 3899 warn "reloaded";
3739 --$RELOAD; 3900 --$RELOAD;
3740 } 3901 }
3902
3903 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n";
3741}; 3905};
3742 3906
3743our $RELOAD_WATCHER; # used only during reload 3907our $RELOAD_WATCHER; # used only during reload
3744 3908
3745sub reload_perl() { 3909sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 3910 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 3911 # coro crashes during coro_state_free->destroy here.
3748 3912
3913 $RELOAD_WATCHER ||= cf::async {
3914 Coro::AIO::aio_wait cache_extensions;
3915
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3916 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 3917 do_reload_perl;
3751 undef $RELOAD_WATCHER; 3918 undef $RELOAD_WATCHER;
3919 };
3752 }; 3920 };
3753} 3921}
3754 3922
3755register_command "reload" => sub { 3923register_command "reload" => sub {
3756 my ($who, $arg) = @_; 3924 my ($who, $arg) = @_;
3770 3938
3771our @WAIT_FOR_TICK; 3939our @WAIT_FOR_TICK;
3772our @WAIT_FOR_TICK_BEGIN; 3940our @WAIT_FOR_TICK_BEGIN;
3773 3941
3774sub wait_for_tick { 3942sub wait_for_tick {
3775 return if tick_inhibit || $Coro::current == $Coro::main; 3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3776 3944
3777 my $signal = new Coro::Signal; 3945 my $signal = new Coro::Signal;
3778 push @WAIT_FOR_TICK, $signal; 3946 push @WAIT_FOR_TICK, $signal;
3779 $signal->wait; 3947 $signal->wait;
3780} 3948}
3781 3949
3782sub wait_for_tick_begin { 3950sub wait_for_tick_begin {
3783 return if tick_inhibit || $Coro::current == $Coro::main; 3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3784 3952
3785 my $signal = new Coro::Signal; 3953 my $signal = new Coro::Signal;
3786 push @WAIT_FOR_TICK_BEGIN, $signal; 3954 push @WAIT_FOR_TICK_BEGIN, $signal;
3787 $signal->wait; 3955 $signal->wait;
3788} 3956}
3793 unless ++$bug_warning > 10; 3961 unless ++$bug_warning > 10;
3794 return; 3962 return;
3795 } 3963 }
3796 3964
3797 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#
3798 3968
3799 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3800 $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.;
3801 Coro::async_pool { 3971 Coro::async_pool {
3802 $Coro::current->{desc} = "runtime saver"; 3972 $Coro::current->{desc} = "runtime saver";
3825} 3995}
3826 3996
3827{ 3997{
3828 # configure BDB 3998 # configure BDB
3829 3999
3830 BDB::min_parallel 8; 4000 BDB::min_parallel 16;
3831 BDB::max_poll_reqs $TICK * 0.1; 4001 BDB::max_poll_reqs $TICK * 0.1;
3832 $AnyEvent::BDB::WATCHER->priority (1); 4002 $AnyEvent::BDB::WATCHER->priority (1);
3833 4003
3834 unless ($DB_ENV) { 4004 unless ($DB_ENV) {
3835 $DB_ENV = BDB::db_env_create; 4005 $DB_ENV = BDB::db_env_create;
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 4085 LOG llevInfo, "[ABT] [suppressed]\n";
3916 } 4086 }
3917} 4087}
3918 4088
3919# load additional modules 4089# load additional modules
3920use cf::pod; 4090require "cf/$_.pm" for @EXTRA_MODULES;
4091cf::_connect_to_perl_2;
3921 4092
3922END { cf::emergency_save } 4093END { cf::emergency_save }
3923 4094
39241 40951
3925 4096

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines