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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 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";
… …
103our %RESOURCE; 111our %RESOURCE;
104 112
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 115our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
109 117
110our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 121our $DB_ENV;
114 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
115our %CFG; 125our %CFG;
116 126
117our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 128our $RUNTIME;
119our $NOW; 129our $NOW;
… …
129our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 140our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
132 142
133our @POST_INIT; 143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
134 147
135binmode STDOUT; 148binmode STDOUT;
136binmode STDERR; 149binmode STDERR;
137 150
138# read virtual server time, if available 151# read virtual server time, if available
… …
140 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
143} 156}
144 157
158eval "sub TICK() { $TICK } 1" or die;
159
145mkdir $_ 160mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 162
148our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
149 164
150sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
151 177
152############################################################################# 178#############################################################################
153 179
154=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
155 181
… …
202returns directly I<after> the tick processing (and consequently, can only wake one process 228returns 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. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
204 230
205=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
206 232
207This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 235that call.
210 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
211=back 243=back
212 244
213=cut 245=cut
214 246
215BEGIN { 247$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 248 my $msg = join "", @_;
218 249
219 $msg .= "\n" 250 $msg .= "\n"
220 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
221 252
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 254
224 LOG llevError, $msg; 255 LOG llevError, $msg;
225 }; 256};
226}
227 257
228$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
230 262
231 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 265 return;#d#
234 }#d# 266 }#d#
235 267
236 # kill coroutine otherwise 268 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 269 Coro::terminate
239}; 270};
240
241$SIG{__DIE__} = sub { }; #d#?
242 271
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
260)) { 289)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 291}
263 292
264$EV::DIED = sub { 293$EV::DIED = sub {
265 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
266}; 295};
267 296
268############################################################################# 297#############################################################################
269 298
270=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
328Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
329 358
330=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
331 360
332Wait until the given lock is available and then acquires it and returns 361Wait 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, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
335returned. 364returned.
336 365
337Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 367deadlocked coro.
… …
344 373
345Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
346 375
347=cut 376=cut
348 377
349our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 379
352sub lock_wait($) { 380sub lock_wait($) {
353 my ($key) = @_; 381 $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} 382}
367 383
368sub lock_acquire($) { 384sub lock_acquire($) {
369 my ($key) = @_; 385 $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} 386}
383 387
384sub lock_active($) { 388sub lock_active($) {
385 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 390}
389 391
390sub freeze_mainloop { 392sub freeze_mainloop {
391 tick_inhibit_inc; 393 tick_inhibit_inc;
392 394
393 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
394} 396}
395 397
396=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
397 399
398Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
… …
421 423
422=cut 424=cut
423 425
424our @SLOT_QUEUE; 426our @SLOT_QUEUE;
425our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
426 429
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
430 433
431 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
432 436
433 while () { 437 while () {
434 next_job: 438 next_job:
439
435 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 441
437 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 446 $job->[2]->send;
441 Coro::cede; 447 Coro::cede;
442 goto next_job; 448 goto next_job;
443 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 451 }
445 } 452 }
446 453
447 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 457 $signal->wait;
451 } else { 458 } else {
459 $busy = 0;
452 Coro::schedule; 460 Coro::schedule;
453 } 461 }
454 } 462 }
455}; 463};
456 464
457sub get_slot($;$$) { 465sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
459 467
460 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
461 469
462 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
463 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
464 473
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
494 503
495sub sync_job(&) { 504sub sync_job(&) {
496 my ($job) = @_; 505 my ($job) = @_;
497 506
498 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
499 my $time = EV::time; 508 my $time = AE::time;
500 509
501 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
503 512
504 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
… …
521 } else { 530 } else {
522 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
523 } 532 }
524 } 533 }
525 534
526 my $time = EV::time - $time; 535 my $time = AE::time - $time;
527 536
528 $TICK_START += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
529 538
530 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
531 } else { 540 } else {
… …
1170 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1171 1180
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1176 aio_close $fh; 1188 aio_close $fh;
1177 1189
1178 if (@$objs) { 1190 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1184 aio_close $fh; 1199 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1201 }
1187 } else { 1202 } else {
1188 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1189 } 1204 }
1190 1205
1191 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1192 1207
1193 $filename =~ s%/[^/]+$%%; 1208 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1209 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1210 } else {
1196 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1197 } 1212 }
1198 } else { 1213 } else {
1199 aio_unlink $filename; 1214 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1201 } 1216 }
… …
1292 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1293 1308
1294 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1295} 1310}
1296 1311
1312use File::Glob ();
1313
1297cf::player->attach ( 1314cf::player->attach (
1298 on_command => sub { 1315 on_unknown_command => sub {
1299 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1300 1317
1301 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1302 or return; 1319 or return;
1303 1320
… …
1333 1350
1334 cf::override; 1351 cf::override;
1335 }, 1352 },
1336); 1353);
1337 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1338sub load_extensions { 1368sub load_extensions {
1339 cf::sync_job { 1369 cf::sync_job {
1340 my %todo; 1370 my %todo;
1341 1371
1342 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1369 . "\n};\n1"; 1399 . "\n};\n1";
1370 1400
1371 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1372 } 1402 }
1373 1403
1404 my $pass = 0;
1374 my %done; 1405 my %done;
1375 while (%todo) { 1406 while (%todo) {
1376 my $progress; 1407 my $progress;
1377 1408
1409 ++$pass;
1410
1411 ext:
1378 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1414 next ext
1381 unless exists $done{$_}; 1415 unless exists $done{$_};
1382 } 1416 }
1383 1417
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1419
1386 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n";
1389 1424
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1426 if exists $v->{meta}{mandatory};
1394 1427 } else {
1395 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1396 } 1434 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1435 }
1402 1436
1403 skip: 1437 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1406 } 1445 }
1407 }; 1446 };
1408} 1447}
1409 1448
1410############################################################################# 1449#############################################################################
… …
1494 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1495 } 1534 }
1496 } 1535 }
1497} 1536}
1498 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1499sub save($) { 1551sub save($) {
1500 my ($pl) = @_; 1552 my ($pl) = @_;
1501 1553
1502 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1503 1555
… …
1508 1560
1509 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1510 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1511 1563
1512 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1513 1568
1514 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1515 cf::cede_to_tick; 1570 cf::cede_to_tick;
1516} 1571}
1517 1572
… …
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731 1786
1732 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1788 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1870 1925
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1873} 1928}
1874 1929
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 1930sub decay_objects {
1885 my ($self) = @_; 1931 my ($self) = @_;
1886 1932
1887 return if $self->{deny_reset}; 1933 return if $self->{deny_reset};
1888 1934
… …
1970sub find { 2016sub find {
1971 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1972 2018
1973 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1974 2020
1975 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2023
1978 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1983 or return; 2026 or return;
1984 2027
1985 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1986 2029
… …
1998 2041
1999 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
2000 } 2043 }
2001} 2044}
2002 2045
2003sub pre_load { } 2046sub pre_load { }
2004sub post_load { } 2047#sub post_load { } # XS
2005 2048
2006sub load { 2049sub load {
2007 my ($self) = @_; 2050 my ($self) = @_;
2008 2051
2009 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2054 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2098 $self->decay_objects;
2056 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2057 $self->update_buttons; 2100 $self->update_buttons;
2058 cf::cede_to_tick; 2101 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2102 $self->activate;
2062 } 2103 }
2063 2104
2064 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
… …
2068 } 2109 }
2069 2110
2070 $self->post_load; 2111 $self->post_load;
2071} 2112}
2072 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2073sub customise_for { 2117sub customise_for {
2074 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2075 2119
2076 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2121 if $self->per_player;
… …
2231 2275
2232 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233 2277
2234 return if $self->players; 2278 return if $self->players;
2235 2279
2236 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2237 2281
2238 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2239 2283
2240 # need to save uniques path 2284 # need to save uniques path
2241 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
… …
2332 : normalise $_ 2376 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2378 ]
2335} 2379}
2336 2380
2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2412
2337=back 2413=back
2338 2414
2339=head3 cf::object 2415=head3 cf::object
2340 2416
2341=cut 2417=cut
… …
2406 2482
2407our $SAY_CHANNEL = { 2483our $SAY_CHANNEL = {
2408 id => "say", 2484 id => "say",
2409 title => "Map", 2485 title => "Map",
2410 reply => "say ", 2486 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2488};
2413 2489
2414our $CHAT_CHANNEL = { 2490our $CHAT_CHANNEL = {
2415 id => "chat", 2491 id => "chat",
2416 title => "Chat", 2492 title => "Chat",
… …
2536 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2538 2614
2539 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2542 2618
2543 $map->load; 2619 $map->load;
2544 $map->load_neighbours; 2620 $map->load_neighbours;
2545 2621
2546 return unless $self->contr->active; 2622 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2623
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2552} 2629}
2553 2630
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2555 2632
2556Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
… …
2744 2821
2745 utf8::encode $text; 2822 utf8::encode $text;
2746 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2747} 2824}
2748 2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2849}
2850
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 2852
2751Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2752client if neccessary. C<$type> should be a string identifying the type of 2854client if neccessary. C<$type> should be a string identifying the type of
2753the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2755 2857
2756=cut 2858=cut
2757 2859
2758# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2760 "c/identify" => { 2868 "c/identify" => {
2761 id => "infobox", 2869 id => "infobox",
2762 title => "Identify", 2870 title => "Identify",
2763 reply => undef, 2871 reply => undef,
2764 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
… …
2766 "c/examine" => { 2874 "c/examine" => {
2767 id => "infobox", 2875 id => "infobox",
2768 title => "Examine", 2876 title => "Examine",
2769 reply => undef, 2877 reply => undef,
2770 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2771 }, 2885 },
2772 "c/book" => { 2886 "c/book" => {
2773 id => "infobox", 2887 id => "infobox",
2774 title => "Book", 2888 title => "Book",
2775 reply => undef, 2889 reply => undef,
… …
2791 id => "infobox", 2905 id => "infobox",
2792 title => "Body Parts", 2906 title => "Body Parts",
2793 reply => undef, 2907 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2795 }, 2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2796 "c/skills" => { 2916 "c/skills" => {
2797 id => "infobox", 2917 id => "infobox",
2798 title => "Skills", 2918 title => "Skills",
2799 reply => undef, 2919 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2945 },
2802 "c/uptime" => { 2946 "c/uptime" => {
2803 id => "infobox", 2947 id => "infobox",
2804 title => "Uptime", 2948 title => "Uptime",
2805 reply => undef, 2949 reply => undef,
… …
2815 id => "party", 2959 id => "party",
2816 title => "Party", 2960 title => "Party",
2817 reply => "gsay ", 2961 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 2962 tooltip => "Messages and chat related to your party",
2819 }, 2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2820); 2972);
2821 2973
2822sub cf::client::send_msg { 2974sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2824 2976
… …
2829 2981
2830 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2833 2985
2834 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2838 2988
2839 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 2994 }
2846 2995
2847 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2848 } 2997 }
2849 2998
2850 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2851 3000
2852 if ($self->can_msg) {
2853 # default colour, mask it out 3001 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2856 3004
2857 my $pkt = "msg " 3005 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3008 );
2861 3009
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 3011}
2899 3012
2900=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2901 3014
2902Sends an ext event to the client. 3015Sends an ext event to the client.
… …
2905 3018
2906sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2908 3021
2909 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 3027 }
2915} 3028}
2916 3029
2917=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2918 3031
… …
2922 3035
2923sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2925 3038
2926 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove 3042 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3045 }
2933} 3046}
2934 3047
2935=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2936 3049
… …
3037 3150
3038 $coro 3151 $coro
3039} 3152}
3040 3153
3041cf::client->attach ( 3154cf::client->attach (
3042 on_destroy => sub { 3155 on_client_destroy => sub {
3043 my ($ns) = @_; 3156 my ($ns) = @_;
3044 3157
3045 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3046 }, 3159 },
3047); 3160);
… …
3063our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3064 3177
3065$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3066 3179
3067$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3070 sort time 3183 sort time
3071)); 3184));
3072 3185
3073# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3077The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3078 3191
3079 cf::object 3192 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3193 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3194 insert remove name archname title slaying race decrease split
3195 value
3082 3196
3083 cf::object::player 3197 cf::object::player
3084 player 3198 player
3085 3199
3086 cf::player 3200 cf::player
… …
3092=cut 3206=cut
3093 3207
3094for ( 3208for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3096 insert remove inv nrof name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3101) { 3215) {
3102 no strict 'refs'; 3216 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3122 3236
3123 my $qcode = $code; 3237 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3126 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3127 local $_; 3244 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3245
3130 my $eval = 3246 my $eval =
3131 "do {\n" 3247 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3250 . $code
3135 . "\n}" 3251 . "\n}"
3136 ; 3252 ;
3137 3253
3254 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3141 3263
3142 if ($@) { 3264 if ($@) {
3143 warn "$@"; 3265 warn "$@";
3144 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3164=cut 3286=cut
3165 3287
3166sub register_script_function { 3288sub register_script_function {
3167 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3168 3290
3169 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3171} 3293}
3172 3294
3173=back 3295=back
3174 3296
3175=cut 3297=cut
… …
3196 3318
3197 $facedata->{version} == 2 3319 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3321
3200 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3201 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3325 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3204 }; 3328 };
3205 cf::cede_to_tick; 3329 cf::cede_to_tick;
3206 3330
3207 { 3331 {
3208 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3210 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3336
3213 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217 3341
3218 cf::cede_to_tick; 3342 cf::cede_to_tick;
3219 } 3343 }
3220 3344
3221 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
… …
3245 3369
3246 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3247 } 3371 }
3248 3372
3249 { 3373 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3253 3375
3254 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3379
3259 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3274 } else { 3382 } else {
3275 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3276 } 3384 }
3277 3385
… …
3361 3469
3362 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3363} 3471}
3364 3472
3365sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3367 or return; 3477 or return;
3368 3478
3369 local $/; 3479 local $/;
3370 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3371 3481
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3373 3483
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3379 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3381 }; 3491 };
3382 warn $@ if $@; 3492 warn $@ if $@;
3383 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3384} 3496}
3385 3497
3386sub pidfile() { 3498sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
… …
3400 3512
3401 seek $fh, 0, 0; 3513 seek $fh, 0, 0;
3402 print $fh $$; 3514 print $fh $$;
3403} 3515}
3404 3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3524}
3525
3405sub main { 3526sub main {
3406 cf::init_globals; # initialise logging 3527 cf::init_globals; # initialise logging
3407 3528
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3412 3533
3413 cf::init_experience; 3534 cf::init_experience;
3414 cf::init_anim; 3535 cf::init_anim;
3415 cf::init_attackmess; 3536 cf::init_attackmess;
3416 cf::init_dynamic; 3537 cf::init_dynamic;
3417 cf::init_block;
3418 3538
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3540
3421 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
… …
3428 }; 3548 };
3429 3549
3430 evthread_start IO::AIO::poll_fileno; 3550 evthread_start IO::AIO::poll_fileno;
3431 3551
3432 cf::sync_job { 3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3433 reload_resources; 3556 reload_resources;
3434 reload_config; 3557 reload_config;
3435 db_init; 3558 db_init;
3436 3559
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3560 cf::init_uuid;
3440 cf::init_signals; 3561 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills; 3562 cf::init_skills;
3443 3563
3444 cf::init_beforeplay; 3564 cf::init_beforeplay;
3445 3565
3446 atomic; 3566 atomic;
… …
3448 load_extensions; 3568 load_extensions;
3449 3569
3450 utime time, time, $RUNTIMEFILE; 3570 utime time, time, $RUNTIMEFILE;
3451 3571
3452 # no (long-running) fork's whatsoever before this point(!) 3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3575
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3576 (pop @POST_INIT)->(0) while @POST_INIT;
3456 }; 3577 };
3457 3578
3458 EV::loop; 3579 main_loop;
3459} 3580}
3460 3581
3461############################################################################# 3582#############################################################################
3462# initialisation and cleanup 3583# initialisation and cleanup
3463 3584
3464# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3465BEGIN { 3586BEGIN {
3466 our %SIGWATCHER = (); 3587 our %SIGWATCHER = ();
3467 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3468 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3469 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3470 }; 3591 };
3471 } 3592 }
3472} 3593}
3473 3594
3474sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = AE::time;
3597
3475 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3477 3600
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3602
3480 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3481 3604
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3606 or return;
3484 3607
3485 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3500 or return; 3623 or return;
3501 3624
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3626 and return;
3504 3627
3505 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3506 3629
3507 1 3630 1
3508} 3631}
3509 3632
3510our $uuid_lock; 3633our $uuid_lock;
… …
3558} 3681}
3559 3682
3560sub emergency_save() { 3683sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3562 3685
3563 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3564 3687
3565 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3566 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3700 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3702 $pl->save;
3575 } 3703 }
3576 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3577 3705
3578 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3709 $map->valid or next;
3582 $map->save; 3710 $map->save;
3583 } 3711 }
3584 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3585 3713
3586 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3589 3717
3590 warn "begin write uuid\n"; 3718 warn "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3719 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3720 warn "emergency_perl_save: end write uuid\n";
3593 }; 3721 };
3594 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3595 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3596} 3729}
3597 3730
3598sub post_cleanup { 3731sub post_cleanup {
3599 my ($make_core) = @_; 3732 my ($make_core) = @_;
3600 3733
… …
3637 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3638 return; 3771 return;
3639 } 3772 }
3640 3773
3641 return if $RELOAD++; 3774 return if $RELOAD++;
3775
3776 my $t1 = AE::time;
3642 3777
3643 while ($RELOAD) { 3778 while ($RELOAD) {
3644 warn "reloading..."; 3779 warn "reloading...";
3645 3780
3646 warn "entering sync_job"; 3781 warn "entering sync_job";
… …
3707 clear_package "safe::$_" 3842 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3844
3710 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3848
3714 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3850 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3717 3852
3718 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3719 3854
3720 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3721 require cf; 3856 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3723 3858
3724 warn "loading config and database again"; 3859 warn "loading config and database again";
3725 cf::reload_config; 3860 cf::reload_config;
3726 3861
3727 warn "loading extensions"; 3862 warn "loading extensions";
3728 cf::load_extensions; 3863 cf::load_extensions;
3729 3864
3865 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3736 3873
3737 warn "running post_load"; 3874 warn "running post_init jobs";
3738 (pop @POST_INIT)->(1) while @POST_INIT; 3875 (pop @POST_INIT)->(1) while @POST_INIT;
3739 3876
3740 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3741 3878
3742 1 3879 1
… …
3746 }; 3883 };
3747 3884
3748 warn "reloaded"; 3885 warn "reloaded";
3749 --$RELOAD; 3886 --$RELOAD;
3750 } 3887 }
3888
3889 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3751}; 3891};
3752 3892
3753our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3754 3894
3755sub reload_perl() { 3895sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3758 3898
3899 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions;
3901
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 3903 do_reload_perl;
3761 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3905 };
3762 }; 3906 };
3763} 3907}
3764 3908
3765register_command "reload" => sub { 3909register_command "reload" => sub {
3766 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
… …
3780 3924
3781our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3783 3927
3784sub wait_for_tick { 3928sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 3930
3787 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 3933 $signal->wait;
3790} 3934}
3791 3935
3792sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 3938
3795 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 3941 $signal->wait;
3798} 3942}
… …
3803 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3804 return; 3948 return;
3805 } 3949 }
3806 3950
3807 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 3954
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 3957 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3835} 3981}
3836 3982
3837{ 3983{
3838 # configure BDB 3984 # configure BDB
3839 3985
3840 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3843 3989
3844 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4072 }
3927} 4073}
3928 4074
3929# load additional modules 4075# load additional modules
3930use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3931 4078
3932END { cf::emergency_save } 4079END { cf::emergency_save }
3933 4080
39341 40811
3935 4082

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines