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.252 by root, Wed Apr 18 15:28:18 2007 UTC vs.
Revision 1.253 by root, Wed Apr 18 17:32:07 2007 UTC

… …
54our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
56 56
57our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
58our @EVENT; 58our @EVENT;
59our $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";
60 71
61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62our $TICK_WATCHER; 73our $TICK_WATCHER;
63our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
… …
75our $RUNTIME; 86our $RUNTIME;
76 87
77our %PLAYER; # all users 88our %PLAYER; # all users
78our %MAP; # all maps 89our %MAP; # all maps
79our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
80our $RANDOM_MAPS = cf::localdir . "/random";
81our $BDB_ENV_DIR = cf::localdir . "/db";
82 91
83# 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 ∕
84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85 94
86binmode STDOUT; 95binmode STDOUT;
87binmode STDERR; 96binmode STDERR;
88 97
89# read virtual server time, if available 98# read virtual server time, if available
90unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
92 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
93 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
94} 103}
95 104
96mkdir cf::localdir; 105mkdir $_
97mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98mkdir cf::localdir . "/" . cf::tmpdir;
99mkdir cf::localdir . "/" . cf::uniquedir;
100mkdir $RANDOM_MAPS;
101mkdir $BDB_ENV_DIR;
102 107
103our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
104 109
105sub cf::map::normalise; 110sub cf::map::normalise;
106 111
… …
117=item $cf::RUNTIME 122=item $cf::RUNTIME
118 123
119The 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
120every server tick. 125every server tick.
121 126
122=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
123 130
124The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
125be 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.
126 135
127=item $cf::NOW 136=item $cf::NOW
128 137
129The time of the last (current) server tick. 138The time of the last (current) server tick.
130 139
… …
234returned. 243returned.
235 244
236Lock 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
237uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
238 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
239=cut 252=cut
240 253
241our %LOCK; 254our %LOCK;
242 255
243sub lock_wait($) { 256sub lock_wait($) {
… …
260 273
261 Coro::guard { 274 Coro::guard {
262 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
264 } 277 }
278}
279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
265} 284}
266 285
267sub freeze_mainloop { 286sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
269 288
… …
350} 369}
351 370
352sub write_runtime { 371sub write_runtime {
353 my $guard = cf::lock_acquire "write_runtime"; 372 my $guard = cf::lock_acquire "write_runtime";
354 373
355 my $runtime = cf::localdir . "/runtime"; 374 my $runtime = "$LOCALDIR/runtime";
356 375
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
358 or return; 377 or return;
359 378
360 my $value = $cf::RUNTIME + 90 + 10; 379 my $value = $cf::RUNTIME + 90 + 10;
… …
955Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
956 975
957=cut 976=cut
958 977
959sub playerdir($) { 978sub playerdir($) {
960 cf::localdir 979 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 981}
966 982
967sub path($) { 983sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1088while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1089 1105
1090=cut 1106=cut
1091 1107
1092sub list_logins { 1108sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1110 or return [];
1095 1111
1096 my @logins; 1112 my @logins;
1097 1113
1098 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
… …
1336 1352
1337# the original (read-only) location 1353# the original (read-only) location
1338sub load_path { 1354sub load_path {
1339 my ($self) = @_; 1355 my ($self) = @_;
1340 1356
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR($self->{path}"
1342} 1358}
1343 1359
1344# the temporary/swap location 1360# the temporary/swap location
1345sub save_path { 1361sub save_path {
1346 my ($self) = @_; 1362 my ($self) = @_;
1347 1363
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path"
1350} 1366}
1351 1367
1352# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1353sub uniq_path { 1369sub uniq_path {
1354 my ($self) = @_; 1370 my ($self) = @_;
1355 1371
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1358} 1374}
1359 1375
1360# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1361# all maps in C++... 1377# all maps in C++...
1362sub change_all_map_light { 1378sub change_all_map_light {
… …
1721instantiated unique items. May block. 1737instantiated unique items. May block.
1722 1738
1723=cut 1739=cut
1724 1740
1725sub unique_maps() { 1741sub unique_maps() {
1726 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1742 my $files = aio_readdir $UNIQUEDIR
1727 or return; 1743 or return;
1728 1744
1729 my @paths; 1745 my @paths;
1730 1746
1731 for (@$files) { 1747 for (@$files) {
… …
1987 2003
1988 $rmp->{random_seed} ||= $exit->random_seed; 2004 $rmp->{random_seed} ||= $exit->random_seed;
1989 2005
1990 my $data = cf::to_json $rmp; 2006 my $data = cf::to_json $rmp;
1991 my $md5 = Digest::MD5::md5_hex $data; 2007 my $md5 = Digest::MD5::md5_hex $data;
1992 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2008 my $meta = "$RANDOMDIR/$md5.meta";
1993 2009
1994 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2010 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995 aio_write $fh, 0, (length $data), $data, 0; 2011 aio_write $fh, 0, (length $data), $data, 0;
1996 undef $fh; 2012 undef $fh;
1997 aio_rename "$meta~", $meta; 2013 aio_rename "$meta~", $meta;
… …
2373 2389
2374 return db_get cache => "$id/data"; 2390 return db_get cache => "$id/data";
2375 } 2391 }
2376 } 2392 }
2377 2393
2394 my $t1 = Time::HiRes::time;
2378 my $data = $process->(\@data); 2395 my $data = $process->(\@data);
2396 my $t2 = Time::HiRes::time;
2397
2398 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2379 2399
2380 db_put cache => "$id/data", $data; 2400 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5; 2401 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta; 2402 db_put cache => "$id/meta", $meta;
2383 2403
… …
2485 } 2505 }
2486 2506
2487 1 2507 1
2488} 2508}
2489 2509
2510sub reload_regions {
2511 load_resource_file "$MAPDIR/regions"
2512 or die "unable to load regions file\n";
2513}
2514
2490sub reload_facedata { 2515sub reload_facedata {
2491 load_facedata sprintf "%s/facedata", cf::datadir 2516 load_facedata "$DATADIR/facedata"
2492 or die "unable to load facedata\n"; 2517 or die "unable to load facedata\n";
2493} 2518}
2494 2519
2495sub reload_regions {
2496 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2497 or die "unable to load regions file\n";
2498}
2499
2500sub reload_archetypes { 2520sub reload_archetypes {
2501 load_resource_file sprintf "%s/archetypes", cf::datadir 2521 load_resource_file "$DATADIR/archetypes"
2502 or die "unable to load archetypes\n"; 2522 or die "unable to load archetypes\n";
2503} 2523}
2504 2524
2505sub reload_treasures { 2525sub reload_treasures {
2506 load_resource_file sprintf "%s/treasures", cf::datadir 2526 load_resource_file "$DATADIR/treasures"
2507 or die "unable to load treasurelists\n"; 2527 or die "unable to load treasurelists\n";
2508} 2528}
2509 2529
2510sub reload_resources { 2530sub reload_resources {
2511 warn "reloading resource files...\n"; 2531 warn "reloading resource files...\n";
… …
2521sub init { 2541sub init {
2522 reload_resources; 2542 reload_resources;
2523} 2543}
2524 2544
2525sub cfg_load { 2545sub cfg_load {
2526 open my $fh, "<:utf8", cf::confdir . "/config" 2546 open my $fh, "<:utf8", "$CONFDIR/config"
2527 or return; 2547 or return;
2528 2548
2529 local $/; 2549 local $/;
2530 *CFG = YAML::Syck::Load <$fh>; 2550 *CFG = YAML::Syck::Load <$fh>;
2531 2551
… …
2871 2891
2872 cf::sync_job { 2892 cf::sync_job {
2873 eval { 2893 eval {
2874 BDB::db_env_open 2894 BDB::db_env_open
2875 $DB_ENV, 2895 $DB_ENV,
2876 $BDB_ENV_DIR, 2896 $BDBDIR,
2877 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2897 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2878 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2898 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2879 0666; 2899 0666;
2880 2900
2881 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2901 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2882 2902
2883 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2903 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2884 $DB_ENV->set_lk_detect; 2904 $DB_ENV->set_lk_detect;
2885 }; 2905 };
2886 2906

Diff Legend

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