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.477 by root, Wed Sep 2 22:52:36 2009 UTC vs.
Revision 1.521 by root, Fri Apr 16 23:28:42 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;
… …
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
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %RESOURCE; 111our %RESOURCE;
109 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 118our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
114 120
115our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 124our $DB_ENV;
119 125
120our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
121 127
122our %CFG; 128our %CFG;
123 129
124our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 131our $RUNTIME;
… …
161 167
162sub cf::map::normalise; 168sub cf::map::normalise;
163 169
164############################################################################# 170#############################################################################
165 171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
180
181#############################################################################
182
166=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
167 184
168=over 4 185=over 4
169 186
170=item $cf::UPTIME 187=item $cf::UPTIME
… …
214returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 233
217=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
218 235
219This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 238that call.
239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
222 245
223=back 246=back
224 247
225=cut 248=cut
226 249
… …
269)) { 292)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 294}
272 295
273$EV::DIED = sub { 296$EV::DIED = sub {
274 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
275}; 298};
276 299
277############################################################################# 300#############################################################################
278 301
279=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
376} 399}
377 400
378=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
379 402
380Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
381get spread over timer. 404get spread over time.
382 405
383=cut 406=cut
384 407
385sub periodic($$) { 408sub periodic($$) {
386 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
403 426
404=cut 427=cut
405 428
406our @SLOT_QUEUE; 429our @SLOT_QUEUE;
407our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
408 432
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
412 436
413 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
414 439
415 while () { 440 while () {
416 next_job: 441 next_job:
442
417 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 444
419 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 449 $job->[2]->send;
423 Coro::cede; 450 Coro::cede;
424 goto next_job; 451 goto next_job;
425 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 454 }
427 } 455 }
428 456
429 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
430 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
431 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
432 $signal->wait; 460 $signal->wait;
433 } else { 461 } else {
462 $busy = 0;
434 Coro::schedule; 463 Coro::schedule;
435 } 464 }
436 } 465 }
437}; 466};
438 467
439sub get_slot($;$$) { 468sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
441 470
442 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
443 472
444 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
445 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
446 476
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
476 506
477sub sync_job(&) { 507sub sync_job(&) {
478 my ($job) = @_; 508 my ($job) = @_;
479 509
480 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
481 my $time = EV::time; 511 my $time = AE::time;
482 512
483 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
485 515
486 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
503 } else { 533 } else {
504 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
505 } 535 }
506 } 536 }
507 537
508 my $time = EV::time - $time; 538 my $time = AE::time - $time;
509 539
510 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
511 541
512 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
513 } else { 543 } else {
… …
557 reset_signals; 587 reset_signals;
558 &$cb 588 &$cb
559 }, @args; 589 }, @args;
560 590
561 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
562} 603}
563 604
564=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
565 606
566=cut 607=cut
… …
1283} 1324}
1284 1325
1285use File::Glob (); 1326use File::Glob ();
1286 1327
1287cf::player->attach ( 1328cf::player->attach (
1288 on_command => sub { 1329 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1290 1331
1291 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1292 or return; 1333 or return;
1293 1334
… …
1372 . "\n};\n1"; 1413 . "\n};\n1";
1373 1414
1374 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1375 } 1416 }
1376 1417
1418 my $pass = 0;
1377 my %done; 1419 my %done;
1378 while (%todo) { 1420 while (%todo) {
1379 my $progress; 1421 my $progress;
1380 1422
1423 ++$pass;
1424
1425 ext:
1381 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1428 next ext
1384 unless exists $done{$_}; 1429 unless exists $done{$_};
1385 } 1430 }
1386 1431
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1433
1389 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n";
1392 1438
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1440 if exists $v->{meta}{mandatory};
1397 1441
1398 warn $msg; 1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1443 delete $todo{$k};
1444 } else {
1445 $done{$k} = delete $todo{$k};
1446 push @EXTS, $v->{pkg};
1447 $progress = 1;
1448
1449 warn "$v->{base}: extension inactive.\n"
1450 unless $active;
1399 } 1451 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1452 }
1405 1453
1406 skip: 1454 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1455 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 unless $progress; 1456
1457 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory};
1460 }
1461 }
1409 } 1462 }
1410 }; 1463 };
1411} 1464}
1412 1465
1413############################################################################# 1466#############################################################################
… …
1497 $cf::PLAYER{$login} = $pl 1550 $cf::PLAYER{$login} = $pl
1498 } 1551 }
1499 } 1552 }
1500} 1553}
1501 1554
1555cf::player->attach (
1556 on_load => sub {
1557 my ($pl, $path) = @_;
1558
1559 # restore slots saved in save, below
1560 my $slots = delete $pl->{_slots};
1561
1562 $pl->ob->current_weapon ($slots->[0]);
1563 $pl->combat_ob ($slots->[1]);
1564 $pl->ranged_ob ($slots->[2]);
1565 },
1566);
1567
1502sub save($) { 1568sub save($) {
1503 my ($pl) = @_; 1569 my ($pl) = @_;
1504 1570
1505 return if $pl->{deny_save}; 1571 return if $pl->{deny_save};
1506 1572
… …
1511 1577
1512 aio_mkdir playerdir $pl, 0770; 1578 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1579 $pl->{last_save} = $cf::RUNTIME;
1514 1580
1515 cf::get_slot 0.01; 1581 cf::get_slot 0.01;
1582
1583 # save slots, to be restored later
1584 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1516 1585
1517 $pl->save_pl ($path); 1586 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1587 cf::cede_to_tick;
1519} 1588}
1520 1589
… …
1733 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1734 1803
1735 # mit "rum" bekleckern, nicht 1804 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1805 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1809 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1810 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1989 2058
1990 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1991 } 2060 }
1992} 2061}
1993 2062
1994sub pre_load { } 2063sub pre_load { }
1995sub post_load { } 2064#sub post_load { } # XS
1996 2065
1997sub load { 2066sub load {
1998 my ($self) = @_; 2067 my ($self) = @_;
1999 2068
2000 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
… …
2057 } 2126 }
2058 2127
2059 $self->post_load; 2128 $self->post_load;
2060} 2129}
2061 2130
2131# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath
2062sub customise_for { 2134sub customise_for {
2063 my ($self, $ob) = @_; 2135 my ($self, $ob) = @_;
2064 2136
2065 return find "~" . $ob->name . "/" . $self->{path} 2137 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2138 if $self->per_player;
… …
2143 $MAP_PREFETCHER->prio (6); 2215 $MAP_PREFETCHER->prio (6);
2144 2216
2145 () 2217 ()
2146} 2218}
2147 2219
2220# common code, used by both ->save and ->swapout
2148sub save { 2221sub _save {
2149 my ($self) = @_; 2222 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2223
2153 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
2154 2225
2155 return unless $self->dirty; 2226 return unless $self->dirty;
2156 2227
… …
2176 } else { 2247 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2249 }
2179} 2250}
2180 2251
2252sub save {
2253 my ($self) = @_;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256
2257 $self->_save;
2258}
2259
2181sub swap_out { 2260sub swap_out {
2182 my ($self) = @_; 2261 my ($self) = @_;
2183 2262
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2264
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2265 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2266 return if $self->{deny_save};
2267 return if $self->players;
2192 2268
2193 $self->in_memory (cf::MAP_SWAPPED); 2269 # first deactivate the map and "unlink" it from the core
2194
2195 $self->deactivate; 2270 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2271 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED);
2273
2274 # then atomically save
2275 $self->_save;
2276
2277 # then free the map
2197 $self->clear; 2278 $self->clear;
2198} 2279}
2199 2280
2200sub reset_at { 2281sub reset_at {
2201 my ($self) = @_; 2282 my ($self) = @_;
… …
2220 2301
2221 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2302 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222 2303
2223 return if $self->players; 2304 return if $self->players;
2224 2305
2225 warn "resetting map ", $self->path; 2306 warn "resetting map ", $self->path, "\n";
2226 2307
2227 $self->in_memory (cf::MAP_SWAPPED); 2308 $self->in_memory (cf::MAP_SWAPPED);
2228 2309
2229 # need to save uniques path 2310 # need to save uniques path
2230 unless ($self->{deny_save}) { 2311 unless ($self->{deny_save}) {
… …
2321 : normalise $_ 2402 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2403 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2404 ]
2324} 2405}
2325 2406
2407=item cf::map::static_maps
2408
2409Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2410file in the shared directory excluding F</styles> and F</editor>). May
2411block.
2412
2413=cut
2414
2415sub static_maps() {
2416 my @dirs = "";
2417 my @maps;
2418
2419 while (@dirs) {
2420 my $dir = shift @dirs;
2421
2422 next if $dir eq "/styles" || $dir eq "/editor";
2423
2424 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2425 or return;
2426
2427 for (@$files) {
2428 s/\.map$// or next;
2429 utf8::decode $_;
2430 push @maps, "$dir/$_";
2431 }
2432
2433 push @dirs, map "$dir/$_", @$dirs;
2434 }
2435
2436 \@maps
2437}
2438
2326=back 2439=back
2327 2440
2328=head3 cf::object 2441=head3 cf::object
2329 2442
2330=cut 2443=cut
… …
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2611 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2612
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2614 if $self->map && $self->map->{path} ne "{link}";
2502 2615
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2616 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2617}
2505 2618
2506sub cf::object::player::leave_link { 2619sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2620 my ($self, $map, $x, $y) = @_;
2508 2621
… …
2525 ($x, $y) = (-1, -1) 2638 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2639 unless (defined $x) && (defined $y);
2527 2640
2528 # use -1 or undef as default coordinates, not 0, 0 2641 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2642 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2643 if $x <= 0 && $y <= 0;
2531 2644
2532 $map->load; 2645 $map->load;
2533 $map->load_neighbours; 2646 $map->load_neighbours;
2534 2647
2535 return unless $self->contr->active; 2648 return unless $self->contr->active;
… …
2734 2847
2735 utf8::encode $text; 2848 utf8::encode $text;
2736 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2849 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2737} 2850}
2738 2851
2852=item $client->send_big_packet ($pkt)
2853
2854Like C<send_packet>, but tries to compress large packets, and fragments
2855them as required.
2856
2857=cut
2858
2859our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2860
2861sub cf::client::send_big_packet {
2862 my ($self, $pkt) = @_;
2863
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt);
2875}
2876
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2877=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2878
2741Send a drawinfo or msg packet to the client, formatting the msg for the 2879Send a drawinfo or msg packet to the client, formatting the msg for the
2742client if neccessary. C<$type> should be a string identifying the type of 2880client if neccessary. C<$type> should be a string identifying the type of
2743the message, with C<log> being the default. If C<$color> is negative, suppress 2881the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2745 2883
2746=cut 2884=cut
2747 2885
2748# non-persistent channels (usually the info channel) 2886# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2887our %CHANNEL = (
2888 "c/motd" => {
2889 id => "infobox",
2890 title => "MOTD",
2891 reply => undef,
2892 tooltip => "The message of the day",
2893 },
2750 "c/identify" => { 2894 "c/identify" => {
2751 id => "infobox", 2895 id => "infobox",
2752 title => "Identify", 2896 title => "Identify",
2753 reply => undef, 2897 reply => undef,
2754 tooltip => "Items recently identified", 2898 tooltip => "Items recently identified",
… …
2756 "c/examine" => { 2900 "c/examine" => {
2757 id => "infobox", 2901 id => "infobox",
2758 title => "Examine", 2902 title => "Examine",
2759 reply => undef, 2903 reply => undef,
2760 tooltip => "Signs and other items you examined", 2904 tooltip => "Signs and other items you examined",
2905 },
2906 "c/shopinfo" => {
2907 id => "infobox",
2908 title => "Shop Info",
2909 reply => undef,
2910 tooltip => "What your bargaining skill tells you about the shop",
2761 }, 2911 },
2762 "c/book" => { 2912 "c/book" => {
2763 id => "infobox", 2913 id => "infobox",
2764 title => "Book", 2914 title => "Book",
2765 reply => undef, 2915 reply => undef,
… …
2881 my $pkt = "msg " 3031 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3032 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3033 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3034 );
2885 3035
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3036 $self->send_big_packet ($pkt);
2897} 3037}
2898 3038
2899=item $client->ext_msg ($type, @msg) 3039=item $client->ext_msg ($type, @msg)
2900 3040
2901Sends an ext event to the client. 3041Sends an ext event to the client.
… …
2904 3044
2905sub cf::client::ext_msg($$@) { 3045sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3046 my ($self, $type, @msg) = @_;
2907 3047
2908 if ($self->extcmd == 2) { 3048 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3050 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3051 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3052 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3053 }
2914} 3054}
2915 3055
2916=item $client->ext_reply ($msgid, @msg) 3056=item $client->ext_reply ($msgid, @msg)
2917 3057
… …
2921 3061
2922sub cf::client::ext_reply($$@) { 3062sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3063 my ($self, $id, @msg) = @_;
2924 3064
2925 if ($self->extcmd == 2) { 3065 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3066 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3067 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3068 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3069 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3071 }
2932} 3072}
2933 3073
2934=item $success = $client->query ($flags, "text", \&cb) 3074=item $success = $client->query ($flags, "text", \&cb)
2935 3075
… …
3036 3176
3037 $coro 3177 $coro
3038} 3178}
3039 3179
3040cf::client->attach ( 3180cf::client->attach (
3041 on_destroy => sub { 3181 on_client_destroy => sub {
3042 my ($ns) = @_; 3182 my ($ns) = @_;
3043 3183
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3184 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3185 },
3046); 3186);
… …
3062our $safe_hole = new Safe::Hole; 3202our $safe_hole = new Safe::Hole;
3063 3203
3064$SIG{FPE} = 'IGNORE'; 3204$SIG{FPE} = 'IGNORE';
3065 3205
3066$safe->permit_only (Opcode::opset qw( 3206$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3207 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3208 grepstart grepwhile mapstart mapwhile
3069 sort time 3209 sort time
3070)); 3210));
3071 3211
3072# here we export the classes and methods available to script code 3212# here we export the classes and methods available to script code
… …
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3264 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3265 $qcode =~ s/\n/\\n/g;
3126 3266
3127 %vars = (_dummy => 0) unless %vars; 3267 %vars = (_dummy => 0) unless %vars;
3128 3268
3269 my @res;
3129 local $_; 3270 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3271
3132 my $eval = 3272 my $eval =
3133 "do {\n" 3273 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3274 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3275 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3276 . $code
3137 . "\n}" 3277 . "\n}"
3138 ; 3278 ;
3139 3279
3280 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3281 sub_generation_inc;
3282 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3283 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3284 sub_generation_inc;
3285 } else {
3286 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval;
3288 }
3143 3289
3144 if ($@) { 3290 if ($@) {
3145 warn "$@"; 3291 warn "$@";
3146 warn "while executing safe code '$code'\n"; 3292 warn "while executing safe code '$code'\n";
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3293 warn "with arguments " . (join " ", %vars) . "\n";
… …
3166=cut 3312=cut
3167 3313
3168sub register_script_function { 3314sub register_script_function {
3169 my ($fun, $cb) = @_; 3315 my ($fun, $cb) = @_;
3170 3316
3171 no strict 'refs'; 3317 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3318 *$fun = $safe_hole->wrap ($cb);
3173} 3319}
3174 3320
3175=back 3321=back
3176 3322
3177=cut 3323=cut
… …
3198 3344
3199 $facedata->{version} == 2 3345 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3346 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3347
3202 # patch in the exptable 3348 # patch in the exptable
3349 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3350 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3351 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3352 data => $exp_table,
3353 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3354 };
3207 cf::cede_to_tick; 3355 cf::cede_to_tick;
3208 3356
3209 { 3357 {
3210 my $faces = $facedata->{faceinfo}; 3358 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3360 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3361 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3362
3215 cf::face::set_visibility $idx, $info->{visibility}; 3363 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3364 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3367
3220 cf::cede_to_tick; 3368 cf::cede_to_tick;
3221 } 3369 }
3222 3370
3223 while (my ($face, $info) = each %$faces) { 3371 while (my ($face, $info) = each %$faces) {
… …
3247 3395
3248 cf::anim::invalidate_all; # d'oh 3396 cf::anim::invalidate_all; # d'oh
3249 } 3397 }
3250 3398
3251 { 3399 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3400 my $res = $facedata->{resource};
3255 3401
3256 while (my ($name, $info) = each %$res) { 3402 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3403 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3404 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3405
3261 if ($info->{type} & 1) { 3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3407 cf::face::set_type $idx, $info->{type};
3276 } else { 3408 } else {
3277 $RESOURCE{$name} = $info; 3409 $RESOURCE{$name} = $info;
3278 } 3410 }
3279 3411
… …
3363 3495
3364 warn "finished reloading resource files\n"; 3496 warn "finished reloading resource files\n";
3365} 3497}
3366 3498
3367sub reload_config { 3499sub reload_config {
3500 warn "reloading config file...\n";
3501
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3502 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3503 or return;
3370 3504
3371 local $/; 3505 local $/;
3372 *CFG = YAML::Load <$fh>; 3506 *CFG = YAML::XS::Load scalar <$fh>;
3373 3507
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3375 3509
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3510 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3516 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3517 };
3384 warn $@ if $@; 3518 warn $@ if $@;
3385 } 3519 }
3520
3521 warn "finished reloading resource files\n";
3386} 3522}
3387 3523
3388sub pidfile() { 3524sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!"; 3526 or die "$PIDFILE: $!";
… …
3418 3554
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428 3559
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430 3561
3431 # we must not ever block the main coroutine 3562 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3563 local $Coro::idle = sub {
… …
3438 }; 3569 };
3439 3570
3440 evthread_start IO::AIO::poll_fileno; 3571 evthread_start IO::AIO::poll_fileno;
3441 3572
3442 cf::sync_job { 3573 cf::sync_job {
3574 cf::init_experience;
3575 cf::init_anim;
3576 cf::init_attackmess;
3577 cf::init_dynamic;
3578
3579 cf::load_settings;
3580 cf::load_materials;
3581
3443 reload_resources; 3582 reload_resources;
3444 reload_config; 3583 reload_config;
3445 db_init; 3584 db_init;
3446 3585
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3586 cf::init_uuid;
3450 cf::init_signals; 3587 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3588 cf::init_skills;
3453 3589
3454 cf::init_beforeplay; 3590 cf::init_beforeplay;
3455 3591
3456 atomic; 3592 atomic;
… …
3463 use POSIX (); 3599 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465 3601
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3602 (pop @POST_INIT)->(0) while @POST_INIT;
3467 }; 3603 };
3604
3605 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n";
3468 3607
3469 main_loop; 3608 main_loop;
3470} 3609}
3471 3610
3472############################################################################# 3611#############################################################################
… …
3474 3613
3475# install some emergency cleanup handlers 3614# install some emergency cleanup handlers
3476BEGIN { 3615BEGIN {
3477 our %SIGWATCHER = (); 3616 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3617 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3618 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3619 cf::cleanup "SIG$signal";
3481 }; 3620 };
3482 } 3621 }
3483} 3622}
3484 3623
3485sub write_runtime_sync { 3624sub write_runtime_sync {
3625 my $t0 = AE::time;
3626
3486 # first touch the runtime file to show we are still running: 3627 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3628 # the fsync below can take a very very long time.
3488 3629
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3630 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3631
3491 my $guard = cf::lock_acquire "write_runtime"; 3632 my $guard = cf::lock_acquire "write_runtime";
3492 3633
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3634 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3635 or return;
3495 3636
3496 my $value = $cf::RUNTIME + 90 + 10; 3637 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3638 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3639 # 60 allows for the watchdog to kill the server.
… …
3511 or return; 3652 or return;
3512 3653
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3655 and return;
3515 3656
3516 warn "runtime file written.\n"; 3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3658
3518 1 3659 1
3519} 3660}
3520 3661
3521our $uuid_lock; 3662our $uuid_lock;
… …
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3788 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3789 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3790 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3791# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3792 }
3652 warn "cleared package $pkg\n";#d#
3653} 3793}
3654 3794
3655sub do_reload_perl() { 3795sub do_reload_perl() {
3656 # can/must only be called in main 3796 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3797 if ($Coro::current != $Coro::main) {
… …
3659 return; 3799 return;
3660 } 3800 }
3661 3801
3662 return if $RELOAD++; 3802 return if $RELOAD++;
3663 3803
3664 my $t1 = EV::time; 3804 my $t1 = AE::time;
3665 3805
3666 while ($RELOAD) { 3806 while ($RELOAD) {
3667 warn "reloading..."; 3807 warn "reloading...";
3668 3808
3669 warn "entering sync_job"; 3809 warn "entering sync_job";
… …
3740 3880
3741 warn "unload completed, starting to reload now"; 3881 warn "unload completed, starting to reload now";
3742 3882
3743 warn "reloading cf.pm"; 3883 warn "reloading cf.pm";
3744 require cf; 3884 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3885 cf::_connect_to_perl_1;
3746 3886
3747 warn "loading config and database again"; 3887 warn "loading config and database again";
3748 cf::reload_config; 3888 cf::reload_config;
3749 3889
3750 warn "loading extensions"; 3890 warn "loading extensions";
… …
3772 3912
3773 warn "reloaded"; 3913 warn "reloaded";
3774 --$RELOAD; 3914 --$RELOAD;
3775 } 3915 }
3776 3916
3777 $t1 = EV::time - $t1; 3917 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 3918 warn "reload completed in ${t1}s\n";
3779}; 3919};
3780 3920
3781our $RELOAD_WATCHER; # used only during reload 3921our $RELOAD_WATCHER; # used only during reload
3782 3922
… …
3785 # coro crashes during coro_state_free->destroy here. 3925 # coro crashes during coro_state_free->destroy here.
3786 3926
3787 $RELOAD_WATCHER ||= cf::async { 3927 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 3928 Coro::AIO::aio_wait cache_extensions;
3789 3929
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3930 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 3931 do_reload_perl;
3792 undef $RELOAD_WATCHER; 3932 undef $RELOAD_WATCHER;
3793 }; 3933 };
3794 }; 3934 };
3795} 3935}
… …
3812 3952
3813our @WAIT_FOR_TICK; 3953our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 3954our @WAIT_FOR_TICK_BEGIN;
3815 3955
3816sub wait_for_tick { 3956sub wait_for_tick {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 3958
3819 my $signal = new Coro::Signal; 3959 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 3960 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 3961 $signal->wait;
3822} 3962}
3823 3963
3824sub wait_for_tick_begin { 3964sub wait_for_tick_begin {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 3966
3827 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 3968 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 3969 $signal->wait;
3830} 3970}
… …
3835 unless ++$bug_warning > 10; 3975 unless ++$bug_warning > 10;
3836 return; 3976 return;
3837 } 3977 }
3838 3978
3839 cf::server_tick; # one server iteration 3979 cf::server_tick; # one server iteration
3980
3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3840 3982
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3983 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3843 Coro::async_pool { 3985 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 3986 $Coro::current->{desc} = "runtime saver";
… …
3867} 4009}
3868 4010
3869{ 4011{
3870 # configure BDB 4012 # configure BDB
3871 4013
3872 BDB::min_parallel 8; 4014 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4015 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4016 $AnyEvent::BDB::WATCHER->priority (1);
3875 4017
3876 unless ($DB_ENV) { 4018 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4019 $DB_ENV = BDB::db_env_create;
… …
3958 } 4100 }
3959} 4101}
3960 4102
3961# load additional modules 4103# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4104require "cf/$_.pm" for @EXTRA_MODULES;
4105cf::_connect_to_perl_2;
3963 4106
3964END { cf::emergency_save } 4107END { cf::emergency_save }
3965 4108
39661 41091
3967 4110

Diff Legend

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