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.243 by root, Mon Apr 16 13:02:29 2007 UTC vs.
Revision 1.263 by root, Sat May 5 05:40:27 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.52 (); 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";
58 59
59our $TICK = MAX_TIME * 1e-6; 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";
71
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
63our $NEXT_TICK; 76our $NEXT_TICK;
64our $NOW; 77our $NOW;
… …
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
376 warn "starting to write runtime...\n";#d#
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 377 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 378 or return;
355 379
356 my $value = $cf::RUNTIME + 90 + 10; 380 my $value = $cf::RUNTIME + 90 + 10;
357 # 10 is the runtime save interval, for a monotonic clock 381 # 10 is the runtime save interval, for a monotonic clock
… …
367 close $fh 391 close $fh
368 or return; 392 or return;
369 393
370 aio_rename "$runtime~", $runtime 394 aio_rename "$runtime~", $runtime
371 and return; 395 and return;
396
397 warn "... done writing runtime.\n";#d#
372 398
373 1 399 1
374} 400}
375 401
376=item cf::datalog type => key => value, ... 402=item cf::datalog type => key => value, ...
… …
951Returns the given player object, loading it if necessary (might block). 977Returns the given player object, loading it if necessary (might block).
952 978
953=cut 979=cut
954 980
955sub playerdir($) { 981sub playerdir($) {
956 cf::localdir 982 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 983 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 984}
962 985
963sub path($) { 986sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 987 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1084while and may block, so not sync_job-capable, ever. 1107while and may block, so not sync_job-capable, ever.
1085 1108
1086=cut 1109=cut
1087 1110
1088sub list_logins { 1111sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1112 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1113 or return [];
1091 1114
1092 my @logins; 1115 my @logins;
1093 1116
1094 for my $login (@$dirs) { 1117 for my $login (@$dirs) {
… …
1332 1355
1333# the original (read-only) location 1356# the original (read-only) location
1334sub load_path { 1357sub load_path {
1335 my ($self) = @_; 1358 my ($self) = @_;
1336 1359
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1360 "$MAPDIR/$self->{path}.map"
1338} 1361}
1339 1362
1340# the temporary/swap location 1363# the temporary/swap location
1341sub save_path { 1364sub save_path {
1342 my ($self) = @_; 1365 my ($self) = @_;
1343 1366
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1367 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1368 "$TMPDIR/$path.map"
1346} 1369}
1347 1370
1348# the unique path, undef == no special unique path 1371# the unique path, undef == no special unique path
1349sub uniq_path { 1372sub uniq_path {
1350 my ($self) = @_; 1373 my ($self) = @_;
1351 1374
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1375 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1376 "$UNIQUEDIR/$path"
1354} 1377}
1355 1378
1356# and all this just because we cannot iterate over 1379# and all this just because we cannot iterate over
1357# all maps in C++... 1380# all maps in C++...
1358sub change_all_map_light { 1381sub change_all_map_light {
… …
1470 my ($self) = @_; 1493 my ($self) = @_;
1471 1494
1472 local $self->{deny_reset} = 1; # loading can take a long time 1495 local $self->{deny_reset} = 1; # loading can take a long time
1473 1496
1474 my $path = $self->{path}; 1497 my $path = $self->{path};
1498
1499 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1500 my $guard = cf::lock_acquire "map_load:$path";
1476 1501
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1502 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1503
1479 $self->in_memory (cf::MAP_LOADING); 1504 $self->in_memory (cf::MAP_LOADING);
1480 1505
1481 $self->alloc; 1506 $self->alloc;
1482 1507
1483 $self->pre_load; 1508 $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; 1509 Coro::cede;
1510 $self->set_darkness_map; 1510
1511 $self->_load_objects ($self->{load_path}, 1)
1512 or return;
1513
1514 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1515 if delete $self->{load_original};
1516
1517 if (my $uniq = $self->uniq_path) {
1518 utf8::encode $uniq;
1519 if (aio_open $uniq, O_RDONLY, 0) {
1520 $self->clear_unique_items;
1521 $self->_load_objects ($uniq, 0);
1522 }
1523 }
1524
1525 Coro::cede;
1526 # now do the right thing for maps
1527 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1528 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1529 unless $self->difficulty;
1513 Coro::cede; 1530 Coro::cede;
1531
1532 unless ($self->{deny_activate}) {
1533 $self->decay_objects;
1534 $self->fix_auto_apply;
1535 $self->update_buttons;
1536 Coro::cede;
1537 $self->set_darkness_map;
1538 Coro::cede;
1514 $self->activate; 1539 $self->activate;
1515 Coro::cede; 1540 }
1541
1542 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1543 }
1517 1544
1518 $self->post_load; 1545 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1546}
1523 1547
1524sub customise_for { 1548sub customise_for {
1525 my ($self, $ob) = @_; 1549 my ($self, $ob) = @_;
1526 1550
… …
1717instantiated unique items. May block. 1741instantiated unique items. May block.
1718 1742
1719=cut 1743=cut
1720 1744
1721sub unique_maps() { 1745sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1746 my $files = aio_readdir $UNIQUEDIR
1723 or return; 1747 or return;
1724 1748
1725 my @paths; 1749 my @paths;
1726 1750
1727 for (@$files) { 1751 for (@$files) {
… …
1983 2007
1984 $rmp->{random_seed} ||= $exit->random_seed; 2008 $rmp->{random_seed} ||= $exit->random_seed;
1985 2009
1986 my $data = cf::to_json $rmp; 2010 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2011 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2012 my $meta = "$RANDOMDIR/$md5.meta";
1989 2013
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2014 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2015 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2016 undef $fh;
1993 aio_rename "$meta~", $meta; 2017 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2286#############################################################################
2263 2287
2264=head2 EXTENSION DATABASE SUPPORT 2288=head2 EXTENSION DATABASE SUPPORT
2265 2289
2266Crossfire maintains a very simple database for extension use. It can 2290Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2291currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2292convert to/from binary).
2269 2293
2270The parameter C<$family> should best start with the name of the extension 2294The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2295using it, it should be unique.
2272 2296
2273=over 4 2297=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2320 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2321 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2322 };
2299 cf::cleanup "db_open(db): $@" if $@; 2323 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2324 };
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 } 2325 }
2316} 2326}
2317 2327
2318sub db_get($$) { 2328sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2329 my $key = "$_[0]/$_[1]";
2320 2330
2321 cf::sync_job { 2331 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2332 BDB::db_get $DB, undef, $key, my $data;
2323 2333
2324 $! ? () 2334 $! ? ()
2325 : Compress::LZF::sthaw $data 2335 : $data
2326 } 2336 }
2327} 2337}
2328 2338
2329sub db_put($$$) { 2339sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2340 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2341 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2332} 2342}
2343
2344=item cf::cache $id => [$paths...], $processversion => $process
2345
2346Generic caching function that returns the value of the resource $id,
2347caching and regenerating as required.
2348
2349This function can block.
2350
2351=cut
2352
2353sub cache {
2354 my ($id, $src, $processversion, $process) = @_;
2355
2356 my $meta =
2357 join "\x00",
2358 $processversion,
2359 map {
2360 aio_stat $_
2361 and Carp::croak "$_: $!";
2362
2363 ($_, (stat _)[7,9])
2364 } @$src;
2365
2366 my $dbmeta = db_get cache => "$id/meta";
2367 if ($dbmeta ne $meta) {
2368 # changed, we may need to process
2369
2370 my @data;
2371 my $md5;
2372
2373 for (0 .. $#$src) {
2374 0 <= aio_load $src->[$_], $data[$_]
2375 or Carp::croak "$src->[$_]: $!";
2376 }
2377
2378 # if processing is expensive, check
2379 # checksum first
2380 if (1) {
2381 $md5 =
2382 join "\x00",
2383 $processversion,
2384 map {
2385 Coro::cede;
2386 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2387 } 0.. $#$src;
2388
2389
2390 my $dbmd5 = db_get cache => "$id/md5";
2391 if ($dbmd5 eq $md5) {
2392 db_put cache => "$id/meta", $meta;
2393
2394 return db_get cache => "$id/data";
2395 }
2396 }
2397
2398 my $t1 = Time::HiRes::time;
2399 my $data = $process->(\@data);
2400 my $t2 = Time::HiRes::time;
2401
2402 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2403
2404 db_put cache => "$id/data", $data;
2405 db_put cache => "$id/md5" , $md5;
2406 db_put cache => "$id/meta", $meta;
2407
2408 return $data;
2409 }
2410
2411 db_get cache => "$id/data"
2412}
2413
2414=item fork_call { }, $args
2415
2416Executes the given code block with the given arguments in a seperate
2417process, returning the results. Everything must be serialisable with
2418Coro::Storable. May, of course, block. Note that the executed sub may
2419never block itself or use any form of Event handling.
2420
2421=cut
2422
2423sub fork_call(&@) {
2424 my ($cb, @args) = @_;
2425
2426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2427# or die "socketpair: $!";
2428 pipe my $fh1, my $fh2
2429 or die "pipe: $!";
2430
2431 if (my $pid = fork) {
2432 close $fh2;
2433
2434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2435 $res = Coro::Storable::thaw $res;
2436
2437 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2438
2439 die $$res unless "ARRAY" eq ref $res;
2440
2441 return wantarray ? @$res : $res->[-1];
2442 } else {
2443 reset_signals;
2444 local $SIG{__WARN__};
2445 local $SIG{__DIE__};
2446 eval {
2447 close $fh1;
2448
2449 my @res = eval { $cb->(@args) };
2450 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2451 };
2452
2453 warn $@ if $@;
2454 _exit 0;
2455 }
2456}
2457
2458
2333 2459
2334############################################################################# 2460#############################################################################
2335# the server's init and main functions 2461# the server's init and main functions
2336 2462
2337sub load_facedata { 2463sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2464 my ($path) = @_;
2339 2465
2340 warn "loading facedata from $path\n"; 2466 warn "loading facedata from $path\n";
2341 2467
2342 my $facedata; 2468 my $facedata;
2343 0 < aio_load $path, $facedata 2469 0 < aio_load $path, $facedata
… …
2384 } 2510 }
2385 2511
2386 1 2512 1
2387} 2513}
2388 2514
2389our $archetypes_loaded; 2515sub reload_regions {
2516 load_resource_file "$MAPDIR/regions"
2517 or die "unable to load regions file\n";
2518}
2390 2519
2520sub reload_facedata {
2521 load_facedata "$DATADIR/facedata"
2522 or die "unable to load facedata\n";
2523}
2524
2391sub load_archetypes { 2525sub reload_archetypes {
2392 return 1 if $archetypes_loaded++; # current can only load them once 2526 load_resource_file "$DATADIR/archetypes"
2393 load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable 2527 or die "unable to load archetypes\n";
2394 load_archetype_file sprintf "%s/archetypes", cf::datadir
2395} 2528}
2396 2529
2397sub load_treasures { 2530sub reload_treasures {
2398 load_treasure_file sprintf "%s/treasures", cf::datadir 2531 load_resource_file "$DATADIR/treasures"
2532 or die "unable to load treasurelists\n";
2399} 2533}
2400 2534
2401sub reload_resources { 2535sub reload_resources {
2402 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2536 warn "reloading resource files...\n";
2403 or die "unable to load regions file\n"; 2537
2538 reload_regions;
2404 load_facedata 2539 reload_facedata;
2405 or die "unable to load facedata\n";
2406 load_archetypes 2540 reload_archetypes;
2407 or die "unable to load archetypes\n";
2408 load_treasures 2541 reload_treasures;
2409 or die "unable to load treasurelists\n"; 2542
2543 warn "finished reloading resource files\n";
2410} 2544}
2411 2545
2412sub init { 2546sub init {
2413 reload_resources; 2547 reload_resources;
2414} 2548}
2415 2549
2416sub cfg_load { 2550sub cfg_load {
2417 open my $fh, "<:utf8", cf::confdir . "/config" 2551 open my $fh, "<:utf8", "$CONFDIR/config"
2418 or return; 2552 or return;
2419 2553
2420 local $/; 2554 local $/;
2421 *CFG = YAML::Syck::Load <$fh>; 2555 *CFG = YAML::Syck::Load <$fh>;
2422 2556
… …
2507 2641
2508 warn Carp::longmess "post_cleanup backtrace" 2642 warn Carp::longmess "post_cleanup backtrace"
2509 if $make_core; 2643 if $make_core;
2510} 2644}
2511 2645
2512sub reload() { 2646sub do_reload_perl() {
2513 # can/must only be called in main 2647 # can/must only be called in main
2514 if ($Coro::current != $Coro::main) { 2648 if ($Coro::current != $Coro::main) {
2515 warn "can only reload from main coroutine"; 2649 warn "can only reload from main coroutine";
2516 return; 2650 return;
2517 } 2651 }
… …
2592 Symbol::delete_package "safe::$_" 2726 Symbol::delete_package "safe::$_"
2593 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2727 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2594 2728
2595 warn "unloading cf.pm \"a bit\""; 2729 warn "unloading cf.pm \"a bit\"";
2596 delete $INC{"cf.pm"}; 2730 delete $INC{"cf.pm"};
2731 delete $INC{"cf/pod.pm"};
2597 2732
2598 # don't, removes xs symbols, too, 2733 # don't, removes xs symbols, too,
2599 # and global variables created in xs 2734 # and global variables created in xs
2600 #Symbol::delete_package __PACKAGE__; 2735 #Symbol::delete_package __PACKAGE__;
2601 2736
… …
2616 warn "reattaching attachments to maps"; 2751 warn "reattaching attachments to maps";
2617 reattach $_ for values %MAP; 2752 reattach $_ for values %MAP;
2618 warn "reattaching attachments to players"; 2753 warn "reattaching attachments to players";
2619 reattach $_ for values %PLAYER; 2754 reattach $_ for values %PLAYER;
2620 2755
2621 warn "loading reloadable resources";
2622 reload_resources;
2623
2624 warn "leaving sync_job"; 2756 warn "leaving sync_job";
2625 2757
2626 1 2758 1
2627 } or do { 2759 } or do {
2628 warn $@; 2760 warn $@;
… …
2633 warn "reloaded"; 2765 warn "reloaded";
2634}; 2766};
2635 2767
2636our $RELOAD_WATCHER; # used only during reload 2768our $RELOAD_WATCHER; # used only during reload
2637 2769
2770sub reload_perl() {
2771 # doing reload synchronously and two reloads happen back-to-back,
2772 # coro crashes during coro_state_free->destroy here.
2773
2774 $RELOAD_WATCHER ||= Event->timer (
2775 reentrant => 0,
2776 after => 0,
2777 data => WF_AUTOCANCEL,
2778 cb => sub {
2779 do_reload_perl;
2780 undef $RELOAD_WATCHER;
2781 },
2782 );
2783}
2784
2638register_command "reload" => sub { 2785register_command "reload" => sub {
2639 my ($who, $arg) = @_; 2786 my ($who, $arg) = @_;
2640 2787
2641 if ($who->flag (FLAG_WIZ)) { 2788 if ($who->flag (FLAG_WIZ)) {
2642 $who->message ("reloading server."); 2789 $who->message ("reloading server.");
2643 2790 async { reload_perl };
2644 # doing reload synchronously and two reloads happen back-to-back,
2645 # coro crashes during coro_state_free->destroy here.
2646
2647 $RELOAD_WATCHER ||= Event->timer (
2648 reentrant => 0,
2649 after => 0,
2650 data => WF_AUTOCANCEL,
2651 cb => sub {
2652 reload;
2653 undef $RELOAD_WATCHER;
2654 },
2655 );
2656 } 2791 }
2657}; 2792};
2658 2793
2659unshift @INC, $LIBDIR; 2794unshift @INC, $LIBDIR;
2660 2795
… …
2695 } 2830 }
2696 2831
2697 $NOW = Event::time; 2832 $NOW = Event::time;
2698 2833
2699 cf::server_tick; # one server iteration 2834 cf::server_tick; # one server iteration
2835
2700 $RUNTIME += $TICK; 2836 $RUNTIME += $TICK;
2701 $NEXT_TICK += $TICK; 2837 $NEXT_TICK += $TICK;
2702 2838
2703 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2839 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2704 $NEXT_RUNTIME_WRITE = $NOW + 10; 2840 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2706 write_runtime 2842 write_runtime
2707 or warn "ERROR: unable to write runtime file: $!"; 2843 or warn "ERROR: unable to write runtime file: $!";
2708 }; 2844 };
2709 } 2845 }
2710 2846
2847# my $AFTER = Event::time;
2848# warn $AFTER - $NOW;#d#
2849
2850 # if we are delayed by four ticks or more, skip them all
2851 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2852
2853 $TICK_WATCHER->at ($NEXT_TICK);
2854 $TICK_WATCHER->start;
2855
2711 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2712 $sig->send; 2857 $sig->send;
2713 } 2858 }
2714 while (my $sig = shift @WAIT_FOR_TICK) { 2859 while (my $sig = shift @WAIT_FOR_TICK) {
2715 $sig->send; 2860 $sig->send;
2716 } 2861 }
2717 2862
2718# my $AFTER = Event::time; 2863 _post_tick;
2719# warn $AFTER - $NOW;#d#
2720
2721 # if we are delayed by four ticks or more, skip them all
2722 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2723
2724 $TICK_WATCHER->at ($NEXT_TICK);
2725 $TICK_WATCHER->start;
2726 }, 2864 },
2727); 2865);
2728 2866
2729{ 2867{
2730 BDB::max_poll_time $TICK * 0.1; 2868 BDB::max_poll_time $TICK * 0.1;
… …
2758 2896
2759 cf::sync_job { 2897 cf::sync_job {
2760 eval { 2898 eval {
2761 BDB::db_env_open 2899 BDB::db_env_open
2762 $DB_ENV, 2900 $DB_ENV,
2763 $BDB_ENV_DIR, 2901 $BDBDIR,
2764 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2902 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2765 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2903 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2766 0666; 2904 0666;
2767 2905
2768 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2906 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2769 2907
2770 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2908 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2771 $DB_ENV->set_lk_detect; 2909 $DB_ENV->set_lk_detect;
2772 }; 2910 };
2773 2911
… …
2789 prio => 6, 2927 prio => 6,
2790 cb => \&IO::AIO::poll_cb, 2928 cb => \&IO::AIO::poll_cb,
2791 ); 2929 );
2792} 2930}
2793 2931
2932my $_log_backtrace;
2933
2934sub _log_backtrace {
2935 my ($msg, @addr) = @_;
2936
2937 $msg =~ s/\n//;
2938
2939 # limit the # of concurrent backtraces
2940 if ($_log_backtrace < 2) {
2941 ++$_log_backtrace;
2942 async {
2943 my @bt = fork_call {
2944 @addr = map { sprintf "%x", $_ } @addr;
2945 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2946 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2947 or die "addr2line: $!";
2948
2949 my @funcs;
2950 my @res = <$fh>;
2951 chomp for @res;
2952 while (@res) {
2953 my ($func, $line) = splice @res, 0, 2, ();
2954 push @funcs, "[$func] $line";
2955 }
2956
2957 @funcs
2958 };
2959
2960 LOG llevInfo, "[ABT] $msg\n";
2961 LOG llevInfo, "[ABT] $_\n" for @bt;
2962 --$_log_backtrace;
2963 };
2964 } else {
2965 LOG llevInfo, "[ABT] $msg\n";
2966 LOG llevInfo, "[ABT] [suppressed]\n";
2967 }
2968}
2969
2970# load additional modules
2971use cf::pod;
2972
2794END { cf::emergency_save } 2973END { cf::emergency_save }
2795 2974
27961 29751
2797 2976

Diff Legend

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