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.246 by root, Tue Apr 17 10:38:28 2007 UTC vs.
Revision 1.258 by root, Sat Apr 21 17:43:42 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
… …
346} 369}
347 370
348sub write_runtime { 371sub write_runtime {
349 my $guard = cf::lock_acquire "write_runtime"; 372 my $guard = cf::lock_acquire "write_runtime";
350 373
351 my $runtime = cf::localdir . "/runtime"; 374 my $runtime = "$LOCALDIR/runtime";
352 375
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 377 or return;
355 378
356 my $value = $cf::RUNTIME + 90 + 10; 379 my $value = $cf::RUNTIME + 90 + 10;
… …
951Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
952 975
953=cut 976=cut
954 977
955sub playerdir($) { 978sub playerdir($) {
956 cf::localdir 979 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 981}
962 982
963sub path($) { 983sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1084while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1085 1105
1086=cut 1106=cut
1087 1107
1088sub list_logins { 1108sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1110 or return [];
1091 1111
1092 my @logins; 1112 my @logins;
1093 1113
1094 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
… …
1332 1352
1333# the original (read-only) location 1353# the original (read-only) location
1334sub load_path { 1354sub load_path {
1335 my ($self) = @_; 1355 my ($self) = @_;
1336 1356
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1338} 1358}
1339 1359
1340# the temporary/swap location 1360# the temporary/swap location
1341sub save_path { 1361sub save_path {
1342 my ($self) = @_; 1362 my ($self) = @_;
1343 1363
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path.map"
1346} 1366}
1347 1367
1348# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1349sub uniq_path { 1369sub uniq_path {
1350 my ($self) = @_; 1370 my ($self) = @_;
1351 1371
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1354} 1374}
1355 1375
1356# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1357# all maps in C++... 1377# all maps in C++...
1358sub change_all_map_light { 1378sub change_all_map_light {
… …
1470 my ($self) = @_; 1490 my ($self) = @_;
1471 1491
1472 local $self->{deny_reset} = 1; # loading can take a long time 1492 local $self->{deny_reset} = 1; # loading can take a long time
1473 1493
1474 my $path = $self->{path}; 1494 my $path = $self->{path};
1495
1496 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1497 my $guard = cf::lock_acquire "map_load:$path";
1476 1498
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1499 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1500
1479 $self->in_memory (cf::MAP_LOADING); 1501 $self->in_memory (cf::MAP_LOADING);
1480 1502
1481 $self->alloc; 1503 $self->alloc;
1482 1504
1483 $self->pre_load; 1505 $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; 1506 Coro::cede;
1510 $self->set_darkness_map; 1507
1508 $self->_load_objects ($self->{load_path}, 1)
1509 or return;
1510
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original};
1513
1514 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) {
1517 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0);
1519 }
1520 }
1521
1522 Coro::cede;
1523 # now do the right thing for maps
1524 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1525 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1526 unless $self->difficulty;
1513 Coro::cede; 1527 Coro::cede;
1528
1529 unless ($self->{deny_activate}) {
1530 $self->decay_objects;
1531 $self->fix_auto_apply;
1532 $self->update_buttons;
1533 Coro::cede;
1534 $self->set_darkness_map;
1535 Coro::cede;
1514 $self->activate; 1536 $self->activate;
1515 Coro::cede; 1537 }
1538
1539 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1540 }
1517 1541
1518 $self->post_load; 1542 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1543}
1523 1544
1524sub customise_for { 1545sub customise_for {
1525 my ($self, $ob) = @_; 1546 my ($self, $ob) = @_;
1526 1547
… …
1717instantiated unique items. May block. 1738instantiated unique items. May block.
1718 1739
1719=cut 1740=cut
1720 1741
1721sub unique_maps() { 1742sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1743 my $files = aio_readdir $UNIQUEDIR
1723 or return; 1744 or return;
1724 1745
1725 my @paths; 1746 my @paths;
1726 1747
1727 for (@$files) { 1748 for (@$files) {
… …
1841} 1862}
1842 1863
1843sub cf::object::player::enter_link { 1864sub cf::object::player::enter_link {
1844 my ($self) = @_; 1865 my ($self) = @_;
1845 1866
1846 $self->deactivate_recursive; 1867 $self->activate_recursive;
1847 1868
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1869 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 1870
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 1872 if $self->map;
… …
1983 2004
1984 $rmp->{random_seed} ||= $exit->random_seed; 2005 $rmp->{random_seed} ||= $exit->random_seed;
1985 2006
1986 my $data = cf::to_json $rmp; 2007 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2008 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2009 my $meta = "$RANDOMDIR/$md5.meta";
1989 2010
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2011 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2012 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2013 undef $fh;
1993 aio_rename "$meta~", $meta; 2014 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2283#############################################################################
2263 2284
2264=head2 EXTENSION DATABASE SUPPORT 2285=head2 EXTENSION DATABASE SUPPORT
2265 2286
2266Crossfire maintains a very simple database for extension use. It can 2287Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2288currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2289convert to/from binary).
2269 2290
2270The parameter C<$family> should best start with the name of the extension 2291The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2292using it, it should be unique.
2272 2293
2273=over 4 2294=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2317 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2318 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2319 };
2299 cf::cleanup "db_open(db): $@" if $@; 2320 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2321 };
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 } 2322 }
2316} 2323}
2317 2324
2318sub db_get($$) { 2325sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2326 my $key = "$_[0]/$_[1]";
2320 2327
2321 cf::sync_job { 2328 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2329 BDB::db_get $DB, undef, $key, my $data;
2323 2330
2324 $! ? () 2331 $! ? ()
2325 : Compress::LZF::sthaw $data 2332 : $data
2326 } 2333 }
2327} 2334}
2328 2335
2329sub db_put($$$) { 2336sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2337 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2338 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2332} 2339}
2340
2341=item cf::cache $id => [$paths...], $processversion => $process
2342
2343Generic caching function that returns the value of the resource $id,
2344caching and regenerating as required.
2345
2346This function can block.
2347
2348=cut
2349
2350sub cache {
2351 my ($id, $src, $processversion, $process) = @_;
2352
2353 my $meta =
2354 join "\x00",
2355 $processversion,
2356 map {
2357 aio_stat $_
2358 and Carp::croak "$_: $!";
2359
2360 ($_, (stat _)[7,9])
2361 } @$src;
2362
2363 my $dbmeta = db_get cache => "$id/meta";
2364 if ($dbmeta ne $meta) {
2365 # changed, we may need to process
2366
2367 my @data;
2368 my $md5;
2369
2370 for (0 .. $#$src) {
2371 0 <= aio_load $src->[$_], $data[$_]
2372 or Carp::croak "$src->[$_]: $!";
2373 }
2374
2375 # if processing is expensive, check
2376 # checksum first
2377 if (1) {
2378 $md5 =
2379 join "\x00",
2380 $processversion,
2381 map {
2382 Coro::cede;
2383 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2384 } 0.. $#$src;
2385
2386
2387 my $dbmd5 = db_get cache => "$id/md5";
2388 if ($dbmd5 eq $md5) {
2389 db_put cache => "$id/meta", $meta;
2390
2391 return db_get cache => "$id/data";
2392 }
2393 }
2394
2395 my $t1 = Time::HiRes::time;
2396 my $data = $process->(\@data);
2397 my $t2 = Time::HiRes::time;
2398
2399 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2400
2401 db_put cache => "$id/data", $data;
2402 db_put cache => "$id/md5" , $md5;
2403 db_put cache => "$id/meta", $meta;
2404
2405 return $data;
2406 }
2407
2408 db_get cache => "$id/data"
2409}
2410
2411=item fork_call { }, $args
2412
2413Executes the given code block with the given arguments in a seperate
2414process, returning the results. Everything must be serialisable with
2415Coro::Storable. May, of course, block. Note that the executed sub may
2416never block itself or use any form of Event handling.
2417
2418=cut
2419
2420sub fork_call(&@) {
2421 my ($cb, @args) = @_;
2422
2423# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2424# or die "socketpair: $!";
2425 pipe my $fh1, my $fh2
2426 or die "pipe: $!";
2427
2428 if (my $pid = fork) {
2429 close $fh2;
2430
2431 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2432 $res = Coro::Storable::thaw $res;
2433
2434 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2435
2436 die $$res unless "ARRAY" eq ref $res;
2437
2438 return wantarray ? @$res : $res->[-1];
2439 } else {
2440 local $SIG{__WARN__};
2441 eval {
2442 local $SIG{__DIE__};
2443 close $fh1;
2444
2445 my @res = eval { $cb->(@args) };
2446 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2447 };
2448
2449 warn $@ if $@;
2450 _exit 0;
2451 }
2452}
2453
2454
2333 2455
2334############################################################################# 2456#############################################################################
2335# the server's init and main functions 2457# the server's init and main functions
2336 2458
2337sub load_facedata($) { 2459sub load_facedata($) {
… …
2384 } 2506 }
2385 2507
2386 1 2508 1
2387} 2509}
2388 2510
2511sub reload_regions {
2512 load_resource_file "$MAPDIR/regions"
2513 or die "unable to load regions file\n";
2514}
2515
2389sub reload_facedata { 2516sub reload_facedata {
2390 load_facedata sprintf "%s/facedata", cf::datadir 2517 load_facedata "$DATADIR/facedata"
2391 or die "unable to load facedata\n"; 2518 or die "unable to load facedata\n";
2392} 2519}
2393 2520
2394sub reload_regions {
2395 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2396 or die "unable to load regions file\n";
2397}
2398
2399sub reload_archetypes { 2521sub reload_archetypes {
2400 load_archetype_file sprintf "%s/archetypes", cf::datadir 2522 load_resource_file "$DATADIR/archetypes"
2401 or die "unable to load archetypes\n"; 2523 or die "unable to load archetypes\n";
2402} 2524}
2403 2525
2404sub reload_treasures { 2526sub reload_treasures {
2405 load_treasure_file sprintf "%s/treasures", cf::datadir 2527 load_resource_file "$DATADIR/treasures"
2406 or die "unable to load treasurelists\n"; 2528 or die "unable to load treasurelists\n";
2407} 2529}
2408 2530
2409sub reload_resources { 2531sub reload_resources {
2410 warn "reloading resource files...\n"; 2532 warn "reloading resource files...\n";
… …
2420sub init { 2542sub init {
2421 reload_resources; 2543 reload_resources;
2422} 2544}
2423 2545
2424sub cfg_load { 2546sub cfg_load {
2425 open my $fh, "<:utf8", cf::confdir . "/config" 2547 open my $fh, "<:utf8", "$CONFDIR/config"
2426 or return; 2548 or return;
2427 2549
2428 local $/; 2550 local $/;
2429 *CFG = YAML::Syck::Load <$fh>; 2551 *CFG = YAML::Syck::Load <$fh>;
2430 2552
… …
2600 Symbol::delete_package "safe::$_" 2722 Symbol::delete_package "safe::$_"
2601 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2723 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2602 2724
2603 warn "unloading cf.pm \"a bit\""; 2725 warn "unloading cf.pm \"a bit\"";
2604 delete $INC{"cf.pm"}; 2726 delete $INC{"cf.pm"};
2727 delete $INC{"cf/pod.pm"};
2605 2728
2606 # don't, removes xs symbols, too, 2729 # don't, removes xs symbols, too,
2607 # and global variables created in xs 2730 # and global variables created in xs
2608 #Symbol::delete_package __PACKAGE__; 2731 #Symbol::delete_package __PACKAGE__;
2609 2732
… …
2769 2892
2770 cf::sync_job { 2893 cf::sync_job {
2771 eval { 2894 eval {
2772 BDB::db_env_open 2895 BDB::db_env_open
2773 $DB_ENV, 2896 $DB_ENV,
2774 $BDB_ENV_DIR, 2897 $BDBDIR,
2775 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2898 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2776 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2899 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2777 0666; 2900 0666;
2778 2901
2779 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2902 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2780 2903
2781 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2904 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2782 $DB_ENV->set_lk_detect; 2905 $DB_ENV->set_lk_detect;
2783 }; 2906 };
2784 2907
… …
2800 prio => 6, 2923 prio => 6,
2801 cb => \&IO::AIO::poll_cb, 2924 cb => \&IO::AIO::poll_cb,
2802 ); 2925 );
2803} 2926}
2804 2927
2928# load additional modules
2929use cf::pod;
2930
2805END { cf::emergency_save } 2931END { cf::emergency_save }
2806 2932
28071 29331
2808 2934

Diff Legend

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