ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.452 by root, Tue Sep 23 00:24:52 2008 UTC vs.
Revision 1.508 by root, Sun Mar 28 22:29:50 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
… …
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;
… …
127 137
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
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
142
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 :)
132 147
133binmode STDOUT; 148binmode STDOUT;
134binmode STDERR; 149binmode STDERR;
135 150
136# read virtual server time, if available 151# read virtual server time, if available
… …
138 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
141} 156}
142 157
158eval "sub TICK() { $TICK } 1" or die;
159
143mkdir $_ 160mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 162
146our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
147 164
148sub 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::"} };
149 177
150############################################################################# 178#############################################################################
151 179
152=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
153 181
… …
200returns 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
201per 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.
202 230
203=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
204 232
205This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 235that call.
208 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
209=back 243=back
210 244
211=cut 245=cut
212 246
213BEGIN { 247$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 248 my $msg = join "", @_;
216 249
217 $msg .= "\n" 250 $msg .= "\n"
218 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
219 252
220 $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;
221 254
222 LOG llevError, $msg; 255 LOG llevError, $msg;
223 }; 256};
224}
225 257
226$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
228 262
229 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 265 return;#d#
232 }#d# 266 }#d#
233 267
234 # kill coroutine otherwise 268 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 269 Coro::terminate
237}; 270};
238
239$SIG{__DIE__} = sub { }; #d#?
240 271
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
258)) { 289)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 291}
261 292
262$EV::DIED = sub { 293$EV::DIED = sub {
263 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
264}; 295};
265 296
266############################################################################# 297#############################################################################
267 298
268=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 337
307sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
309 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
310=item cf::lock_wait $string 355=item cf::lock_wait $string
311 356
312Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
313 358
314=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
315 360
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
319returned. 364returned.
320 365
321Locks 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
322deadlocked coro. 367deadlocked coro.
… …
328 373
329Return 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.
330 375
331=cut 376=cut
332 377
333our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 379
336sub lock_wait($) { 380sub lock_wait($) {
337 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 382}
351 383
352sub lock_acquire($) { 384sub lock_acquire($) {
353 my ($key) = @_; 385 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 386}
367 387
368sub lock_active($) { 388sub lock_active($) {
369 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 390}
373 391
374sub freeze_mainloop { 392sub freeze_mainloop {
375 tick_inhibit_inc; 393 tick_inhibit_inc;
376 394
377 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
378} 396}
379 397
380=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
381 399
382Like 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
… …
405 423
406=cut 424=cut
407 425
408our @SLOT_QUEUE; 426our @SLOT_QUEUE;
409our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
410 429
411$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
414 433
415 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
416 436
417 while () { 437 while () {
418 next_job: 438 next_job:
439
419 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
420 if ($avail > 0.01) { 441
421 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
423 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send; 446 $job->[2]->send;
425 Coro::cede; 447 Coro::cede;
426 goto next_job; 448 goto next_job;
427 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428 } 451 }
429 } 452 }
430 453
431 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
432 # 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
433 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
434 $signal->wait; 457 $signal->wait;
435 } else { 458 } else {
459 $busy = 0;
436 Coro::schedule; 460 Coro::schedule;
437 } 461 }
438 } 462 }
439}; 463};
440 464
441sub get_slot($;$$) { 465sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
443 467
444 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
445 469
446 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
447 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
448 473
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1154 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1155 1180
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1188 aio_close $fh;
1161 1189
1162 if (@$objs) { 1190 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1199 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1201 }
1171 } else { 1202 } else {
1172 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1173 } 1204 }
1174 1205
1175 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1210 } else {
1177 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1178 } 1212 }
1179 } else { 1213 } else {
1180 aio_unlink $filename; 1214 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1182 } 1216 }
… …
1273 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1274 1308
1275 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1276} 1310}
1277 1311
1312use File::Glob ();
1313
1278cf::player->attach ( 1314cf::player->attach (
1279 on_command => sub { 1315 on_command => sub {
1280 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1281 1317
1282 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1314 1350
1315 cf::override; 1351 cf::override;
1316 }, 1352 },
1317); 1353);
1318 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
1319sub load_extensions { 1368sub load_extensions {
1320 cf::sync_job { 1369 cf::sync_job {
1321 my %todo; 1370 my %todo;
1322 1371
1323 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1350 . "\n};\n1"; 1399 . "\n};\n1";
1351 1400
1352 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1353 } 1402 }
1354 1403
1404 my $pass = 0;
1355 my %done; 1405 my %done;
1356 while (%todo) { 1406 while (%todo) {
1357 my $progress; 1407 my $progress;
1358 1408
1409 ++$pass;
1410
1411 ext:
1359 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1360 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1361 goto skip 1414 next ext
1362 unless exists $done{$_}; 1415 unless exists $done{$_};
1363 } 1416 }
1364 1417
1365 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366 1419
1367 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1368 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1369 : "$v->{base}: extension inactive.\n";
1370 1424
1371 if (exists $v->{meta}{mandatory}) {
1372 warn $msg;
1373 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374 } 1426 if exists $v->{meta}{mandatory};
1375 1427 } else {
1376 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;
1377 } 1434 }
1378
1379 $done{$k} = delete $todo{$k};
1380 push @EXTS, $v->{pkg};
1381 $progress = 1;
1382 } 1435 }
1383 1436
1384 skip: 1437 unless ($progress) {
1385 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386 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 }
1387 } 1445 }
1388 }; 1446 };
1389} 1447}
1390 1448
1391############################################################################# 1449#############################################################################
… …
1711 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1712 1770
1713 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1714 $self->_create_random_map ( 1772 $self->_create_random_map (
1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1719 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1720 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1851 1909
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1854} 1912}
1855 1913
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1914sub decay_objects {
1866 my ($self) = @_; 1915 my ($self) = @_;
1867 1916
1868 return if $self->{deny_reset}; 1917 return if $self->{deny_reset};
1869 1918
… …
1951sub find { 2000sub find {
1952 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1953 2002
1954 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1955 2004
1956 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1958 2007
1959 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1964 or return; 2010 or return;
1965 2011
1966 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1967 2013
… …
1979 2025
1980 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1981 } 2027 }
1982} 2028}
1983 2029
1984sub pre_load { } 2030sub pre_load { }
1985sub post_load { } 2031#sub post_load { } # XS
1986 2032
1987sub load { 2033sub load {
1988 my ($self) = @_; 2034 my ($self) = @_;
1989 2035
1990 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2035 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2082 $self->decay_objects;
2037 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2038 $self->update_buttons; 2084 $self->update_buttons;
2039 cf::cede_to_tick; 2085 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick;
2042 $self->activate; 2086 $self->activate;
2043 } 2087 }
2044 2088
2045 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
… …
2049 } 2093 }
2050 2094
2051 $self->post_load; 2095 $self->post_load;
2052} 2096}
2053 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
2054sub customise_for { 2101sub customise_for {
2055 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2056 2103
2057 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2058 if $self->per_player; 2105 if $self->per_player;
… …
2212 2259
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2261
2215 return if $self->players; 2262 return if $self->players;
2216 2263
2217 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2218 2265
2219 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2220 2267
2221 # need to save uniques path 2268 # need to save uniques path
2222 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
… …
2313 : normalise $_ 2360 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2362 ]
2316} 2363}
2317 2364
2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2396
2318=back 2397=back
2319 2398
2320=head3 cf::object 2399=head3 cf::object
2321 2400
2322=cut 2401=cut
… …
2387 2466
2388our $SAY_CHANNEL = { 2467our $SAY_CHANNEL = {
2389 id => "say", 2468 id => "say",
2390 title => "Map", 2469 title => "Map",
2391 reply => "say ", 2470 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393}; 2472};
2394 2473
2395our $CHAT_CHANNEL = { 2474our $CHAT_CHANNEL = {
2396 id => "chat", 2475 id => "chat",
2397 title => "Chat", 2476 title => "Chat",
… …
2517 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2518 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2519 2598
2520 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2521 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2522 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2523 2602
2524 $map->load; 2603 $map->load;
2525 $map->load_neighbours; 2604 $map->load_neighbours;
2526 2605
2527 return unless $self->contr->active; 2606 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2607
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2533} 2613}
2534 2614
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2616
2537Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
… …
2725 2805
2726 utf8::encode $text; 2806 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2728} 2808}
2729 2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2833}
2834
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2836
2732Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2733client if neccessary. C<$type> should be a string identifying the type of 2838client if neccessary. C<$type> should be a string identifying the type of
2734the message, with C<log> being the default. If C<$color> is negative, suppress 2839the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2736 2841
2737=cut 2842=cut
2738 2843
2739# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2741 "c/identify" => { 2852 "c/identify" => {
2742 id => "infobox", 2853 id => "infobox",
2743 title => "Identify", 2854 title => "Identify",
2744 reply => undef, 2855 reply => undef,
2745 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
… …
2747 "c/examine" => { 2858 "c/examine" => {
2748 id => "infobox", 2859 id => "infobox",
2749 title => "Examine", 2860 title => "Examine",
2750 reply => undef, 2861 reply => undef,
2751 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 2869 },
2753 "c/book" => { 2870 "c/book" => {
2754 id => "infobox", 2871 id => "infobox",
2755 title => "Book", 2872 title => "Book",
2756 reply => undef, 2873 reply => undef,
… …
2772 id => "infobox", 2889 id => "infobox",
2773 title => "Body Parts", 2890 title => "Body Parts",
2774 reply => undef, 2891 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2892 tooltip => "Shows which body parts you posess and are available",
2776 }, 2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2777 "c/skills" => { 2900 "c/skills" => {
2778 id => "infobox", 2901 id => "infobox",
2779 title => "Skills", 2902 title => "Skills",
2780 reply => undef, 2903 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 2904 tooltip => "Shows your experience per skill and item power",
2905 },
2906 "c/shopitems" => {
2907 id => "infobox",
2908 title => "Shop Items",
2909 reply => undef,
2910 tooltip => "Shows the items currently for sale in this shop",
2911 },
2912 "c/resistances" => {
2913 id => "infobox",
2914 title => "Resistances",
2915 reply => undef,
2916 tooltip => "Shows your resistances",
2917 },
2918 "c/pets" => {
2919 id => "infobox",
2920 title => "Pets",
2921 reply => undef,
2922 tooltip => "Shows information abotu your pets/a specific pet",
2923 },
2924 "c/perceiveself" => {
2925 id => "infobox",
2926 title => "Perceive Self",
2927 reply => undef,
2928 tooltip => "You gained detailed knowledge about yourself",
2782 }, 2929 },
2783 "c/uptime" => { 2930 "c/uptime" => {
2784 id => "infobox", 2931 id => "infobox",
2785 title => "Uptime", 2932 title => "Uptime",
2786 reply => undef, 2933 reply => undef,
… …
2796 id => "party", 2943 id => "party",
2797 title => "Party", 2944 title => "Party",
2798 reply => "gsay ", 2945 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2946 tooltip => "Messages and chat related to your party",
2800 }, 2947 },
2948 "c/death" => {
2949 id => "death",
2950 title => "Death",
2951 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death",
2953 },
2954 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL,
2801); 2956);
2802 2957
2803sub cf::client::send_msg { 2958sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2960
… …
2810 2965
2811 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 2967 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 2968 $channel = $CHANNEL{$channel};
2814 2969
2815 $self->ext_msg (channel_info => $channel) 2970 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 2971 $channel = $channel->{id};
2819 2972
2820 } elsif (ref $channel) { 2973 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 2978 }
2827 2979
2828 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2829 } 2981 }
2830 2982
2831 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2832 2984
2833 if ($self->can_msg) {
2834 # default colour, mask it out 2985 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2837 2988
2838 my $pkt = "msg " 2989 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 2990 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 2992 );
2842 2993
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt); 2994 $self->send_big_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 2995}
2880 2996
2881=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2882 2998
2883Sends an ext event to the client. 2999Sends an ext event to the client.
… …
2886 3002
2887sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2888 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2889 3005
2890 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2893 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 } 3011 }
2896} 3012}
2897 3013
2898=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2899 3015
… …
2903 3019
2904sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2906 3022
2907 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove 3026 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3029 }
2914} 3030}
2915 3031
2916=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2917 3033
… …
3044our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3045 3161
3046$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3047 3163
3048$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3049 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3050 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3051 sort time 3167 sort time
3052)); 3168));
3053 3169
3054# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
… …
3058The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
3059 3175
3060 cf::object 3176 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3177 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3178 insert remove name archname title slaying race decrease split
3179 value
3063 3180
3064 cf::object::player 3181 cf::object::player
3065 player 3182 player
3066 3183
3067 cf::player 3184 cf::player
… …
3073=cut 3190=cut
3074 3191
3075for ( 3192for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3193 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3195 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
3082) { 3199) {
3083 no strict 'refs'; 3200 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3103 3220
3104 my $qcode = $code; 3221 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3107 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
3108 local $_; 3228 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars;
3110 3229
3111 my $eval = 3230 my $eval =
3112 "do {\n" 3231 "do {\n"
3113 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3115 . $code 3234 . $code
3116 . "\n}" 3235 . "\n}"
3117 ; 3236 ;
3118 3237
3238 if ($CFG{safe_eval}) {
3119 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3120 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
3122 3247
3123 if ($@) { 3248 if ($@) {
3124 warn "$@"; 3249 warn "$@";
3125 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3126 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
… …
3145=cut 3270=cut
3146 3271
3147sub register_script_function { 3272sub register_script_function {
3148 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3149 3274
3150 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3151 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3152} 3277}
3153 3278
3154=back 3279=back
3155 3280
3156=cut 3281=cut
… …
3177 3302
3178 $facedata->{version} == 2 3303 $facedata->{version} == 2
3179 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3180 3305
3181 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3182 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC, 3309 type => FT_RSRC,
3184 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3185 }; 3312 };
3186 cf::cede_to_tick; 3313 cf::cede_to_tick;
3187 3314
3188 { 3315 {
3189 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
… …
3191 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3192 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193 3320
3194 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3198 3325
3199 cf::cede_to_tick; 3326 cf::cede_to_tick;
3200 } 3327 }
3201 3328
3202 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
… …
3226 3353
3227 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3228 } 3355 }
3229 3356
3230 { 3357 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3234 3359
3235 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239 3363
3240 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3241 # prepend meta info
3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
3248 $data = pack "(w/a*)*", $meta, $info->{data};
3249 } else {
3250 $data = $info->{data};
3251 }
3252
3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3255 } else { 3366 } else {
3256 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3257 } 3368 }
3258 3369
… …
3341 reload_treasures; 3452 reload_treasures;
3342 3453
3343 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3344} 3455}
3345 3456
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3461 or return;
3357 3462
3358 local $/; 3463 local $/;
3359 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3360 3465
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3362 3467
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3475 };
3371 warn $@ if $@; 3476 warn $@ if $@;
3372 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3373} 3480}
3374 3481
3375sub pidfile() { 3482sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3484 or die "$PIDFILE: $!";
… …
3389 3496
3390 seek $fh, 0, 0; 3497 seek $fh, 0, 0;
3391 print $fh $$; 3498 print $fh $$;
3392} 3499}
3393 3500
3501sub main_loop {
3502 warn "EV::loop starting\n";
3503 if (1) {
3504 EV::loop;
3505 }
3506 warn "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP;
3508}
3509
3394sub main { 3510sub main {
3395 atomic; 3511 cf::init_globals; # initialise logging
3512
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3524
3397 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3528 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3529 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3530 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3531 })->prio (Coro::PRIO_MAX);
3404 }; 3532 };
3405 3533
3406 { 3534 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3535
3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3540 reload_resources;
3408 reload_config; 3541 reload_config;
3409 db_init; 3542 db_init;
3543
3544 cf::init_uuid;
3545 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills;
3548
3549 cf::init_beforeplay;
3550
3551 atomic;
3552
3410 load_extensions; 3553 load_extensions;
3411 3554
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3555 utime time, time, $RUNTIMEFILE;
3416 3556
3417 # no (long-running) fork's whatsoever before this point(!) 3557 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX ();
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419 3560
3420 EV::loop; 3561 (pop @POST_INIT)->(0) while @POST_INIT;
3562 };
3563
3564 main_loop;
3421} 3565}
3422 3566
3423############################################################################# 3567#############################################################################
3424# initialisation and cleanup 3568# initialisation and cleanup
3425 3569
… …
3432 }; 3576 };
3433 } 3577 }
3434} 3578}
3435 3579
3436sub write_runtime_sync { 3580sub write_runtime_sync {
3581 my $t0 = EV::time;
3582
3437 # first touch the runtime file to show we are still running: 3583 # first touch the runtime file to show we are still running:
3438 # the fsync below can take a very very long time. 3584 # the fsync below can take a very very long time.
3439 3585
3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441 3587
3442 my $guard = cf::lock_acquire "write_runtime"; 3588 my $guard = cf::lock_acquire "write_runtime";
3443 3589
3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3590 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445 or return; 3591 or return;
3446 3592
3447 my $value = $cf::RUNTIME + 90 + 10; 3593 my $value = $cf::RUNTIME + 90 + 10;
3448 # 10 is the runtime save interval, for a monotonic clock 3594 # 10 is the runtime save interval, for a monotonic clock
3449 # 60 allows for the watchdog to kill the server. 3595 # 60 allows for the watchdog to kill the server.
… …
3462 or return; 3608 or return;
3463 3609
3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465 and return; 3611 and return;
3466 3612
3467 warn "runtime file written.\n"; 3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3468 3614
3469 1 3615 1
3470} 3616}
3471 3617
3472our $uuid_lock; 3618our $uuid_lock;
… …
3481 my $uuid = "$LOCALDIR/uuid"; 3627 my $uuid = "$LOCALDIR/uuid";
3482 3628
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3629 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3630 or return;
3485 3631
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3632 my $value = uuid_seq uuid_cur;
3633
3634 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n";
3636 return;
3637 }
3638
3639 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3640 $uuid_skip = 0;
3488 3641
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3642 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3643 and return;
3491 3644
… …
3513} 3666}
3514 3667
3515sub emergency_save() { 3668sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3669 my $freeze_guard = cf::freeze_mainloop;
3517 3670
3518 warn "enter emergency perl save\n"; 3671 warn "emergency_perl_save: enter\n";
3519 3672
3520 cf::sync_job { 3673 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678
3521 # use a peculiar iteration method to avoid tripping on perl 3679 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3680 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3681 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3682 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3683 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3684 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3685 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3687 $pl->save;
3530 } 3688 }
3531 warn "end emergency player save\n"; 3689 warn "emergency_perl_save: end player save\n";
3532 3690
3533 warn "begin emergency map save\n"; 3691 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3692 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3693 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3694 $map->valid or next;
3537 $map->save; 3695 $map->save;
3538 } 3696 }
3539 warn "end emergency map save\n"; 3697 warn "emergency_perl_save: end map save\n";
3540 3698
3541 warn "begin emergency database checkpoint\n"; 3699 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3700 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3701 warn "emergency_perl_save: end database checkpoint\n";
3544 3702
3545 warn "begin write uuid\n"; 3703 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3704 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3705 warn "emergency_perl_save: end write uuid\n";
3548 }; 3706 };
3549 3707
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3550 warn "leave emergency perl save\n"; 3713 warn "emergency_perl_save: leave\n";
3551} 3714}
3552 3715
3553sub post_cleanup { 3716sub post_cleanup {
3554 my ($make_core) = @_; 3717 my ($make_core) = @_;
3555 3718
… …
3592 warn "can only reload from main coroutine"; 3755 warn "can only reload from main coroutine";
3593 return; 3756 return;
3594 } 3757 }
3595 3758
3596 return if $RELOAD++; 3759 return if $RELOAD++;
3760
3761 my $t1 = EV::time;
3597 3762
3598 while ($RELOAD) { 3763 while ($RELOAD) {
3599 warn "reloading..."; 3764 warn "reloading...";
3600 3765
3601 warn "entering sync_job"; 3766 warn "entering sync_job";
… …
3662 clear_package "safe::$_" 3827 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3829
3665 warn "unloading cf.pm \"a bit\""; 3830 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3831 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3833
3669 # don't, removes xs symbols, too, 3834 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3835 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3836 #clear_package __PACKAGE__;
3672 3837
3673 warn "unload completed, starting to reload now"; 3838 warn "unload completed, starting to reload now";
3674 3839
3675 warn "reloading cf.pm"; 3840 warn "reloading cf.pm";
3676 require cf; 3841 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3842 cf::_connect_to_perl_1;
3678 3843
3679 warn "loading config and database again"; 3844 warn "loading config and database again";
3680 cf::reload_config; 3845 cf::reload_config;
3681 3846
3682 warn "loading extensions"; 3847 warn "loading extensions";
3683 cf::load_extensions; 3848 cf::load_extensions;
3684 3849
3850 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3851 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3852 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3853 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3854 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3855 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3856 reattach $_ for values %PLAYER;
3857 }
3858
3859 warn "running post_init jobs";
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3861
3692 warn "leaving sync_job"; 3862 warn "leaving sync_job";
3693 3863
3694 1 3864 1
3695 } or do { 3865 } or do {
… …
3698 }; 3868 };
3699 3869
3700 warn "reloaded"; 3870 warn "reloaded";
3701 --$RELOAD; 3871 --$RELOAD;
3702 } 3872 }
3873
3874 $t1 = EV::time - $t1;
3875 warn "reload completed in ${t1}s\n";
3703}; 3876};
3704 3877
3705our $RELOAD_WATCHER; # used only during reload 3878our $RELOAD_WATCHER; # used only during reload
3706 3879
3707sub reload_perl() { 3880sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3881 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3882 # coro crashes during coro_state_free->destroy here.
3710 3883
3884 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions;
3886
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3888 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3889 undef $RELOAD_WATCHER;
3890 };
3714 }; 3891 };
3715} 3892}
3716 3893
3717register_command "reload" => sub { 3894register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3895 my ($who, $arg) = @_;
… …
3732 3909
3733our @WAIT_FOR_TICK; 3910our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3911our @WAIT_FOR_TICK_BEGIN;
3735 3912
3736sub wait_for_tick { 3913sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3915
3739 my $signal = new Coro::Signal; 3916 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3917 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3918 $signal->wait;
3742} 3919}
3743 3920
3744sub wait_for_tick_begin { 3921sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3923
3747 my $signal = new Coro::Signal; 3924 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3925 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3926 $signal->wait;
3750} 3927}
… …
3755 unless ++$bug_warning > 10; 3932 unless ++$bug_warning > 10;
3756 return; 3933 return;
3757 } 3934 }
3758 3935
3759 cf::server_tick; # one server iteration 3936 cf::server_tick; # one server iteration
3937
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3760 3939
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3940 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 3942 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 3943 $Coro::current->{desc} = "runtime saver";
… …
3787} 3966}
3788 3967
3789{ 3968{
3790 # configure BDB 3969 # configure BDB
3791 3970
3792 BDB::min_parallel 8; 3971 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 3972 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3973 $AnyEvent::BDB::WATCHER->priority (1);
3795 3974
3796 unless ($DB_ENV) { 3975 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3976 $DB_ENV = BDB::db_env_create;
… …
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4056 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 4057 }
3879} 4058}
3880 4059
3881# load additional modules 4060# load additional modules
3882use cf::pod; 4061require "cf/$_.pm" for @EXTRA_MODULES;
4062cf::_connect_to_perl_2;
3883 4063
3884END { cf::emergency_save } 4064END { cf::emergency_save }
3885 4065
38861 40661
3887 4067

Diff Legend

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