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.249 by root, Wed Apr 18 12:43:54 2007 UTC vs.
Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.61 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
… …
52our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
54 56
55our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
56our @EVENT; 58our @EVENT;
57our $LIBDIR = datadir . "/ext"; 59
60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
58 71
59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 73our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
… …
73our $RUNTIME; 86our $RUNTIME;
74 87
75our %PLAYER; # all users 88our %PLAYER; # all users
76our %MAP; # all maps 89our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 91
81# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 94
84binmode STDOUT; 95binmode STDOUT;
85binmode STDERR; 96binmode STDERR;
86 97
87# read virtual server time, if available 98# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
92} 103}
93 104
94mkdir cf::localdir; 105mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 107
101our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
102 109
103sub cf::map::normalise; 110sub cf::map::normalise;
104 111
… …
115=item $cf::RUNTIME 122=item $cf::RUNTIME
116 123
117The time this server has run, starts at 0 and is increased by $cf::TICK on 124The time this server has run, starts at 0 and is increased by $cf::TICK on
118every server tick. 125every server tick.
119 126
120=item $cf::LIBDIR 127=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
128$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
129$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
121 130
122The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
123be found. It will be added to C<@INC> automatically. 132directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
133unique-items directory, player file directory, random maps directory and
134database environment.
124 135
125=item $cf::NOW 136=item $cf::NOW
126 137
127The time of the last (current) server tick. 138The time of the last (current) server tick.
128 139
… …
146=cut 157=cut
147 158
148BEGIN { 159BEGIN {
149 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 161 my $msg = join "", @_;
151 utf8::encode $msg;
152 162
153 $msg .= "\n" 163 $msg .= "\n"
154 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
155 165
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
156 LOG llevError, $msg; 169 LOG llevError, $msg;
157 }; 170 };
158} 171}
159 172
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
230returned. 243returned.
231 244
232Lock names should begin with a unique identifier (for example, cf::map::find 245Lock names should begin with a unique identifier (for example, cf::map::find
233uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
234 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
235=cut 252=cut
236 253
237our %LOCK; 254our %LOCK;
238 255
239sub lock_wait($) { 256sub lock_wait($) {
… …
256 273
257 Coro::guard { 274 Coro::guard {
258 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
260 } 277 }
278}
279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
261} 284}
262 285
263sub freeze_mainloop { 286sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
265 288
… …
344 367
345 $coro 368 $coro
346} 369}
347 370
348sub write_runtime { 371sub write_runtime {
372 my $runtime = "$LOCALDIR/runtime";
373
374 # first touch the runtime file to show we are still running:
375 # the fsync below can take a very very long time.
376
377 warn "touching runtime...\n";#d#
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
379 utime undef, undef, $fh;
380 }
381
349 my $guard = cf::lock_acquire "write_runtime"; 382 my $guard = cf::lock_acquire "write_runtime";
350 383
351 my $runtime = cf::localdir . "/runtime"; 384 warn "starting to write runtime...\n";#d#
352
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 386 or return;
355 387
356 my $value = $cf::RUNTIME + 90 + 10; 388 my $value = $cf::RUNTIME + 90 + 10;
357 # 10 is the runtime save interval, for a monotonic clock 389 # 10 is the runtime save interval, for a monotonic clock
… …
362 394
363 # always fsync - this file is important 395 # always fsync - this file is important
364 aio_fsync $fh 396 aio_fsync $fh
365 and return; 397 and return;
366 398
399 # touch it again to show we are up-to-date
400 utime undef, undef, $fh;
401
367 close $fh 402 close $fh
368 or return; 403 or return;
369 404
370 aio_rename "$runtime~", $runtime 405 aio_rename "$runtime~", $runtime
371 and return; 406 and return;
407
408 warn "... done writing runtime.\n";#d#
372 409
373 1 410 1
374} 411}
375 412
376=item cf::datalog type => key => value, ... 413=item cf::datalog type => key => value, ...
… …
951Returns the given player object, loading it if necessary (might block). 988Returns the given player object, loading it if necessary (might block).
952 989
953=cut 990=cut
954 991
955sub playerdir($) { 992sub playerdir($) {
956 cf::localdir 993 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 994 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 995}
962 996
963sub path($) { 997sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 998 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1084while and may block, so not sync_job-capable, ever. 1118while and may block, so not sync_job-capable, ever.
1085 1119
1086=cut 1120=cut
1087 1121
1088sub list_logins { 1122sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1123 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1124 or return [];
1091 1125
1092 my @logins; 1126 my @logins;
1093 1127
1094 for my $login (@$dirs) { 1128 for my $login (@$dirs) {
… …
1332 1366
1333# the original (read-only) location 1367# the original (read-only) location
1334sub load_path { 1368sub load_path {
1335 my ($self) = @_; 1369 my ($self) = @_;
1336 1370
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1371 "$MAPDIR/$self->{path}.map"
1338} 1372}
1339 1373
1340# the temporary/swap location 1374# the temporary/swap location
1341sub save_path { 1375sub save_path {
1342 my ($self) = @_; 1376 my ($self) = @_;
1343 1377
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1378 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1379 "$TMPDIR/$path.map"
1346} 1380}
1347 1381
1348# the unique path, undef == no special unique path 1382# the unique path, undef == no special unique path
1349sub uniq_path { 1383sub uniq_path {
1350 my ($self) = @_; 1384 my ($self) = @_;
1351 1385
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1386 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1387 "$UNIQUEDIR/$path"
1354} 1388}
1355 1389
1356# and all this just because we cannot iterate over 1390# and all this just because we cannot iterate over
1357# all maps in C++... 1391# all maps in C++...
1358sub change_all_map_light { 1392sub change_all_map_light {
… …
1470 my ($self) = @_; 1504 my ($self) = @_;
1471 1505
1472 local $self->{deny_reset} = 1; # loading can take a long time 1506 local $self->{deny_reset} = 1; # loading can take a long time
1473 1507
1474 my $path = $self->{path}; 1508 my $path = $self->{path};
1509
1510 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1511 my $guard = cf::lock_acquire "map_load:$path";
1476 1512
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1513 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1514
1479 $self->in_memory (cf::MAP_LOADING); 1515 $self->in_memory (cf::MAP_LOADING);
1480 1516
1481 $self->alloc; 1517 $self->alloc;
1482 1518
1483 $self->pre_load; 1519 $self->pre_load;
1484 Coro::cede;
1485
1486 $self->_load_objects ($self->{load_path}, 1)
1487 or return;
1488
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original};
1491
1492 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) {
1495 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0);
1497 }
1498 }
1499
1500 Coro::cede;
1501 # now do the right thing for maps
1502 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede; 1520 Coro::cede;
1510 $self->set_darkness_map; 1521
1522 $self->_load_objects ($self->{load_path}, 1)
1523 or return;
1524
1525 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1526 if delete $self->{load_original};
1527
1528 if (my $uniq = $self->uniq_path) {
1529 utf8::encode $uniq;
1530 if (aio_open $uniq, O_RDONLY, 0) {
1531 $self->clear_unique_items;
1532 $self->_load_objects ($uniq, 0);
1533 }
1534 }
1535
1536 Coro::cede;
1537 # now do the right thing for maps
1538 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1539 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1540 unless $self->difficulty;
1513 Coro::cede; 1541 Coro::cede;
1542
1543 unless ($self->{deny_activate}) {
1544 $self->decay_objects;
1545 $self->fix_auto_apply;
1546 $self->update_buttons;
1547 Coro::cede;
1548 $self->set_darkness_map;
1549 Coro::cede;
1514 $self->activate; 1550 $self->activate;
1515 Coro::cede; 1551 }
1552
1553 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1554 }
1517 1555
1518 $self->post_load; 1556 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1557}
1523 1558
1524sub customise_for { 1559sub customise_for {
1525 my ($self, $ob) = @_; 1560 my ($self, $ob) = @_;
1526 1561
… …
1717instantiated unique items. May block. 1752instantiated unique items. May block.
1718 1753
1719=cut 1754=cut
1720 1755
1721sub unique_maps() { 1756sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1757 my $files = aio_readdir $UNIQUEDIR
1723 or return; 1758 or return;
1724 1759
1725 my @paths; 1760 my @paths;
1726 1761
1727 for (@$files) { 1762 for (@$files) {
… …
1983 2018
1984 $rmp->{random_seed} ||= $exit->random_seed; 2019 $rmp->{random_seed} ||= $exit->random_seed;
1985 2020
1986 my $data = cf::to_json $rmp; 2021 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2022 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2023 my $meta = "$RANDOMDIR/$md5.meta";
1989 2024
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2025 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2026 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2027 undef $fh;
1993 aio_rename "$meta~", $meta; 2028 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2297#############################################################################
2263 2298
2264=head2 EXTENSION DATABASE SUPPORT 2299=head2 EXTENSION DATABASE SUPPORT
2265 2300
2266Crossfire maintains a very simple database for extension use. It can 2301Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2302currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2303convert to/from binary).
2269 2304
2270The parameter C<$family> should best start with the name of the extension 2305The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2306using it, it should be unique.
2272 2307
2273=over 4 2308=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2331 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2332 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2333 };
2299 cf::cleanup "db_open(db): $@" if $@; 2334 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2335 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 } 2336 }
2316} 2337}
2317 2338
2318sub db_get($$) { 2339sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2340 my $key = "$_[0]/$_[1]";
2320 2341
2321 cf::sync_job { 2342 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2343 BDB::db_get $DB, undef, $key, my $data;
2323 2344
2324 $! ? () 2345 $! ? ()
2325 : Compress::LZF::sthaw $data 2346 : $data
2326 } 2347 }
2327} 2348}
2328 2349
2329sub db_put($$$) { 2350sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2351 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2352 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2332} 2353}
2333 2354
2334=item cf::cache $id => ... 2355=item cf::cache $id => [$paths...], $processversion => $process
2335 2356
2336Generic caching function that returns the value of the resource $id, 2357Generic caching function that returns the value of the resource $id,
2337caching and regenerating as required. 2358caching and regenerating as required.
2338 2359
2339This function can block. 2360This function can block.
2340 2361
2341 source => filename returning the data (must be a scalar)
2342 expensive => true == try to cache harder
2343 filter => sub that processes the data into a scalar
2344
2345=cut 2362=cut
2346 2363
2347sub cache { 2364sub cache {
2348 my ($id, %arg) = @_; 2365 my ($id, $src, $processversion, $process) = @_;
2349 2366
2350 aio_stat $arg{source} 2367 my $meta =
2351 and Carp::croak "$arg{source}: $!"; 2368 join "\x00",
2369 $processversion,
2370 map {
2371 aio_stat $_
2372 and Carp::croak "$_: $!";
2352 2373
2353 my $meta = join ":", (stat _)[7,9]; 2374 ($_, (stat _)[7,9])
2354 my $md5; 2375 } @$src;
2355 2376
2356 if ($arg{expensive}) {
2357 0 <= aio_load $arg{source}, my $buf
2358 or Carp::croak "$arg{source}: $!";
2359
2360 $md5 = Digest::MD5::md5_hex $buf;
2361 }
2362
2363 my $dbmeta = db_get "$id/meta"; 2377 my $dbmeta = db_get cache => "$id/meta";
2364 if ($dbmeta ne $meta) { 2378 if ($dbmeta ne $meta) {
2365 # changed, we need to process 2379 # changed, we may need to process
2380
2381 my @data;
2382 my $md5;
2383
2384 for (0 .. $#$src) {
2385 0 <= aio_load $src->[$_], $data[$_]
2386 or Carp::croak "$src->[$_]: $!";
2387 }
2388
2389 # if processing is expensive, check
2390 # checksum first
2391 if (1) {
2392 $md5 =
2393 join "\x00",
2394 $processversion,
2395 map {
2396 Coro::cede;
2397 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2398 } 0.. $#$src;
2399
2400
2401 my $dbmd5 = db_get cache => "$id/md5";
2402 if ($dbmd5 eq $md5) {
2403 db_put cache => "$id/meta", $meta;
2404
2405 return db_get cache => "$id/data";
2406 }
2407 }
2408
2409 my $t1 = Time::HiRes::time;
2410 my $data = $process->(\@data);
2411 my $t2 = Time::HiRes::time;
2412
2413 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2414
2415 db_put cache => "$id/data", $data;
2416 db_put cache => "$id/md5" , $md5;
2417 db_put cache => "$id/meta", $meta;
2418
2419 return $data;
2420 }
2421
2422 db_get cache => "$id/data"
2423}
2424
2425=item fork_call { }, $args
2426
2427Executes the given code block with the given arguments in a seperate
2428process, returning the results. Everything must be serialisable with
2429Coro::Storable. May, of course, block. Note that the executed sub may
2430never block itself or use any form of Event handling.
2431
2432=cut
2433
2434sub fork_call(&@) {
2435 my ($cb, @args) = @_;
2436
2437# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2438# or die "socketpair: $!";
2439 pipe my $fh1, my $fh2
2440 or die "pipe: $!";
2441
2442 if (my $pid = fork) {
2443 close $fh2;
2444
2445 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2446 $res = Coro::Storable::thaw $res;
2447
2448 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2449
2450 die $$res unless "ARRAY" eq ref $res;
2451
2452 return wantarray ? @$res : $res->[-1];
2366 } else { 2453 } else {
2367 # just fetch 2454 reset_signals;
2368 } 2455 local $SIG{__WARN__};
2456 local $SIG{__DIE__};
2457 eval {
2458 close $fh1;
2369 2459
2460 my @res = eval { $cb->(@args) };
2461 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2462 };
2370 2463
2464 warn $@ if $@;
2465 _exit 0;
2466 }
2371} 2467}
2468
2469
2372 2470
2373############################################################################# 2471#############################################################################
2374# the server's init and main functions 2472# the server's init and main functions
2375 2473
2376sub load_facedata($) { 2474sub load_facedata($) {
… …
2423 } 2521 }
2424 2522
2425 1 2523 1
2426} 2524}
2427 2525
2526sub reload_regions {
2527 load_resource_file "$MAPDIR/regions"
2528 or die "unable to load regions file\n";
2529}
2530
2428sub reload_facedata { 2531sub reload_facedata {
2429 load_facedata sprintf "%s/facedata", cf::datadir 2532 load_facedata "$DATADIR/facedata"
2430 or die "unable to load facedata\n"; 2533 or die "unable to load facedata\n";
2431} 2534}
2432 2535
2433sub reload_regions {
2434 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2435 or die "unable to load regions file\n";
2436}
2437
2438sub reload_archetypes { 2536sub reload_archetypes {
2439 load_resource_file sprintf "%s/archetypes", cf::datadir 2537 load_resource_file "$DATADIR/archetypes"
2440 or die "unable to load archetypes\n"; 2538 or die "unable to load archetypes\n";
2441} 2539}
2442 2540
2443sub reload_treasures { 2541sub reload_treasures {
2444 load_resource_file sprintf "%s/treasures", cf::datadir 2542 load_resource_file "$DATADIR/treasures"
2445 or die "unable to load treasurelists\n"; 2543 or die "unable to load treasurelists\n";
2446} 2544}
2447 2545
2448sub reload_resources { 2546sub reload_resources {
2449 warn "reloading resource files...\n"; 2547 warn "reloading resource files...\n";
… …
2459sub init { 2557sub init {
2460 reload_resources; 2558 reload_resources;
2461} 2559}
2462 2560
2463sub cfg_load { 2561sub cfg_load {
2464 open my $fh, "<:utf8", cf::confdir . "/config" 2562 open my $fh, "<:utf8", "$CONFDIR/config"
2465 or return; 2563 or return;
2466 2564
2467 local $/; 2565 local $/;
2468 *CFG = YAML::Syck::Load <$fh>; 2566 *CFG = YAML::Syck::Load <$fh>;
2469 2567
… …
2639 Symbol::delete_package "safe::$_" 2737 Symbol::delete_package "safe::$_"
2640 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2641 2739
2642 warn "unloading cf.pm \"a bit\""; 2740 warn "unloading cf.pm \"a bit\"";
2643 delete $INC{"cf.pm"}; 2741 delete $INC{"cf.pm"};
2742 delete $INC{"cf/pod.pm"};
2644 2743
2645 # don't, removes xs symbols, too, 2744 # don't, removes xs symbols, too,
2646 # and global variables created in xs 2745 # and global variables created in xs
2647 #Symbol::delete_package __PACKAGE__; 2746 #Symbol::delete_package __PACKAGE__;
2648 2747
… …
2808 2907
2809 cf::sync_job { 2908 cf::sync_job {
2810 eval { 2909 eval {
2811 BDB::db_env_open 2910 BDB::db_env_open
2812 $DB_ENV, 2911 $DB_ENV,
2813 $BDB_ENV_DIR, 2912 $BDBDIR,
2814 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2913 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2815 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2914 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2816 0666; 2915 0666;
2817 2916
2818 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2917 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2819 2918
2820 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2919 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2821 $DB_ENV->set_lk_detect; 2920 $DB_ENV->set_lk_detect;
2822 }; 2921 };
2823 2922
… …
2839 prio => 6, 2938 prio => 6,
2840 cb => \&IO::AIO::poll_cb, 2939 cb => \&IO::AIO::poll_cb,
2841 ); 2940 );
2842} 2941}
2843 2942
2943my $_log_backtrace;
2944
2945sub _log_backtrace {
2946 my ($msg, @addr) = @_;
2947
2948 $msg =~ s/\n//;
2949
2950 # limit the # of concurrent backtraces
2951 if ($_log_backtrace < 2) {
2952 ++$_log_backtrace;
2953 async {
2954 my @bt = fork_call {
2955 @addr = map { sprintf "%x", $_ } @addr;
2956 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2957 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2958 or die "addr2line: $!";
2959
2960 my @funcs;
2961 my @res = <$fh>;
2962 chomp for @res;
2963 while (@res) {
2964 my ($func, $line) = splice @res, 0, 2, ();
2965 push @funcs, "[$func] $line";
2966 }
2967
2968 @funcs
2969 };
2970
2971 LOG llevInfo, "[ABT] $msg\n";
2972 LOG llevInfo, "[ABT] $_\n" for @bt;
2973 --$_log_backtrace;
2974 };
2975 } else {
2976 LOG llevInfo, "[ABT] $msg\n";
2977 LOG llevInfo, "[ABT] [suppressed]\n";
2978 }
2979}
2980
2844# load additional modules 2981# load additional modules
2845use cf::pod; 2982use cf::pod;
2846 2983
2847END { cf::emergency_save } 2984END { cf::emergency_save }
2848 2985

Diff Legend

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