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.242 by root, Mon Apr 16 12:37:08 2007 UTC vs.
Revision 1.265 by root, Fri May 11 08:00:00 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
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
84binmode STDOUT; 99binmode STDOUT;
85binmode STDERR; 100binmode STDERR;
86 101
87# read virtual server time, if available 102# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
92} 107}
93 108
94mkdir cf::localdir; 109mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 110 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 111
101our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
102 113
103sub cf::map::normalise; 114sub cf::map::normalise;
104 115
… …
115=item $cf::RUNTIME 126=item $cf::RUNTIME
116 127
117The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
118every server tick. 129every server tick.
119 130
120=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
121 134
122The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
123be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
124 139
125=item $cf::NOW 140=item $cf::NOW
126 141
127The time of the last (current) server tick. 142The time of the last (current) server tick.
128 143
129=item $cf::TICK 144=item $cf::TICK
130 145
131The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
132 157
133=item %cf::CFG 158=item %cf::CFG
134 159
135Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 161from wherever your confdir points to.
… …
146=cut 171=cut
147 172
148BEGIN { 173BEGIN {
149 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 175 my $msg = join "", @_;
151 utf8::encode $msg;
152 176
153 $msg .= "\n" 177 $msg .= "\n"
154 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
155 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
156 LOG llevError, $msg; 183 LOG llevError, $msg;
157 }; 184 };
158} 185}
159 186
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
230returned. 257returned.
231 258
232Lock names should begin with a unique identifier (for example, cf::map::find 259Lock names should begin with a unique identifier (for example, cf::map::find
233uses map_find and cf::map::load uses map_load). 260uses map_find and cf::map::load uses map_load).
234 261
262=item $locked = cf::lock_active $string
263
264Return true if the lock is currently active, i.e. somebody has locked it.
265
235=cut 266=cut
236 267
237our %LOCK; 268our %LOCK;
238 269
239sub lock_wait($) { 270sub lock_wait($) {
… …
256 287
257 Coro::guard { 288 Coro::guard {
258 # wake up all waiters, to be on the safe side 289 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 290 $_->ready for @{ delete $LOCK{$key} };
260 } 291 }
292}
293
294sub lock_active($) {
295 my ($key) = @_;
296
297 ! ! $LOCK{$key}
261} 298}
262 299
263sub freeze_mainloop { 300sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 301 return unless $TICK_WATCHER->is_active;
265 302
… …
295 332
296sub sync_job(&) { 333sub sync_job(&) {
297 my ($job) = @_; 334 my ($job) = @_;
298 335
299 if ($Coro::current == $Coro::main) { 336 if ($Coro::current == $Coro::main) {
337 my $time = Event::time;
338
300 # this is the main coro, too bad, we have to block 339 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 340 # till the operation succeeds, freezing the server :/
302 341
303 # TODO: use suspend/resume instead 342 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 343 # (but this is cancel-safe)
… …
315 354
316 while ($busy) { 355 while ($busy) {
317 Coro::cede or Event::one_event; 356 Coro::cede or Event::one_event;
318 } 357 }
319 358
359 $time = Event::time - $time;
360
361 LOG llevError | logBacktrace, "long sync job\n"
362 if $time > $TICK * 0.5;
363
364 $tick_start += $time; # do not account sync jobs to server load
365
320 wantarray ? @res : $res[0] 366 wantarray ? @res : $res[0]
321 } else { 367 } else {
322 # we are in another coroutine, how wonderful, everything just works 368 # we are in another coroutine, how wonderful, everything just works
323 369
324 $job->() 370 $job->()
… …
344 390
345 $coro 391 $coro
346} 392}
347 393
348sub write_runtime { 394sub write_runtime {
395 my $runtime = "$LOCALDIR/runtime";
396
397 # first touch the runtime file to show we are still running:
398 # the fsync below can take a very very long time.
399
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
401 utime undef, undef, $fh;
402 }
403
349 my $guard = cf::lock_acquire "write_runtime"; 404 my $guard = cf::lock_acquire "write_runtime";
350
351 my $runtime = cf::localdir . "/runtime";
352 405
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 407 or return;
355 408
356 my $value = $cf::RUNTIME + 90 + 10; 409 my $value = $cf::RUNTIME + 90 + 10;
… …
362 415
363 # always fsync - this file is important 416 # always fsync - this file is important
364 aio_fsync $fh 417 aio_fsync $fh
365 and return; 418 and return;
366 419
420 # touch it again to show we are up-to-date
421 utime undef, undef, $fh;
422
367 close $fh 423 close $fh
368 or return; 424 or return;
369 425
370 aio_rename "$runtime~", $runtime 426 aio_rename "$runtime~", $runtime
371 and return; 427 and return;
428
429 warn "runtime file written.\n";#d#
372 430
373 1 431 1
374} 432}
375 433
376=item cf::datalog type => key => value, ... 434=item cf::datalog type => key => value, ...
… …
951Returns the given player object, loading it if necessary (might block). 1009Returns the given player object, loading it if necessary (might block).
952 1010
953=cut 1011=cut
954 1012
955sub playerdir($) { 1013sub playerdir($) {
956 cf::localdir 1014 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1015 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1016}
962 1017
963sub path($) { 1018sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1019 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1084while and may block, so not sync_job-capable, ever. 1139while and may block, so not sync_job-capable, ever.
1085 1140
1086=cut 1141=cut
1087 1142
1088sub list_logins { 1143sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1144 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1145 or return [];
1091 1146
1092 my @logins; 1147 my @logins;
1093 1148
1094 for my $login (@$dirs) { 1149 for my $login (@$dirs) {
… …
1332 1387
1333# the original (read-only) location 1388# the original (read-only) location
1334sub load_path { 1389sub load_path {
1335 my ($self) = @_; 1390 my ($self) = @_;
1336 1391
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1392 "$MAPDIR/$self->{path}.map"
1338} 1393}
1339 1394
1340# the temporary/swap location 1395# the temporary/swap location
1341sub save_path { 1396sub save_path {
1342 my ($self) = @_; 1397 my ($self) = @_;
1343 1398
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1399 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1400 "$TMPDIR/$path.map"
1346} 1401}
1347 1402
1348# the unique path, undef == no special unique path 1403# the unique path, undef == no special unique path
1349sub uniq_path { 1404sub uniq_path {
1350 my ($self) = @_; 1405 my ($self) = @_;
1351 1406
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1407 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1408 "$UNIQUEDIR/$path"
1354} 1409}
1355 1410
1356# and all this just because we cannot iterate over 1411# and all this just because we cannot iterate over
1357# all maps in C++... 1412# all maps in C++...
1358sub change_all_map_light { 1413sub change_all_map_light {
… …
1470 my ($self) = @_; 1525 my ($self) = @_;
1471 1526
1472 local $self->{deny_reset} = 1; # loading can take a long time 1527 local $self->{deny_reset} = 1; # loading can take a long time
1473 1528
1474 my $path = $self->{path}; 1529 my $path = $self->{path};
1530
1531 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1532 my $guard = cf::lock_acquire "map_load:$path";
1476 1533
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1534 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1535
1479 $self->in_memory (cf::MAP_LOADING); 1536 $self->in_memory (cf::MAP_LOADING);
1480 1537
1481 $self->alloc; 1538 $self->alloc;
1482 1539
1483 $self->pre_load; 1540 $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; 1541 Coro::cede;
1510 $self->set_darkness_map; 1542
1543 $self->_load_objects ($self->{load_path}, 1)
1544 or return;
1545
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original};
1548
1549 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) {
1552 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0);
1554 }
1555 }
1556
1557 Coro::cede;
1558 # now do the right thing for maps
1559 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1560 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1561 unless $self->difficulty;
1513 Coro::cede; 1562 Coro::cede;
1563
1564 unless ($self->{deny_activate}) {
1565 $self->decay_objects;
1566 $self->fix_auto_apply;
1567 $self->update_buttons;
1568 Coro::cede;
1569 $self->set_darkness_map;
1570 Coro::cede;
1514 $self->activate; 1571 $self->activate;
1515 Coro::cede; 1572 }
1573
1574 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1575 }
1517 1576
1518 $self->post_load; 1577 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1578}
1523 1579
1524sub customise_for { 1580sub customise_for {
1525 my ($self, $ob) = @_; 1581 my ($self, $ob) = @_;
1526 1582
… …
1717instantiated unique items. May block. 1773instantiated unique items. May block.
1718 1774
1719=cut 1775=cut
1720 1776
1721sub unique_maps() { 1777sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1778 my $files = aio_readdir $UNIQUEDIR
1723 or return; 1779 or return;
1724 1780
1725 my @paths; 1781 my @paths;
1726 1782
1727 for (@$files) { 1783 for (@$files) {
… …
1983 2039
1984 $rmp->{random_seed} ||= $exit->random_seed; 2040 $rmp->{random_seed} ||= $exit->random_seed;
1985 2041
1986 my $data = cf::to_json $rmp; 2042 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2043 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2044 my $meta = "$RANDOMDIR/$md5.meta";
1989 2045
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2046 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2047 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2048 undef $fh;
1993 aio_rename "$meta~", $meta; 2049 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2318#############################################################################
2263 2319
2264=head2 EXTENSION DATABASE SUPPORT 2320=head2 EXTENSION DATABASE SUPPORT
2265 2321
2266Crossfire maintains a very simple database for extension use. It can 2322Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2323currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2324convert to/from binary).
2269 2325
2270The parameter C<$family> should best start with the name of the extension 2326The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2327using it, it should be unique.
2272 2328
2273=over 4 2329=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2352 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2353 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2354 };
2299 cf::cleanup "db_open(db): $@" if $@; 2355 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2356 };
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 } 2357 }
2316} 2358}
2317 2359
2318sub db_get($$) { 2360sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2361 my $key = "$_[0]/$_[1]";
2320 2362
2321 cf::sync_job { 2363 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2364 BDB::db_get $DB, undef, $key, my $data;
2323 2365
2324 $! ? () 2366 $! ? ()
2325 : Compress::LZF::sthaw $data 2367 : $data
2326 } 2368 }
2327} 2369}
2328 2370
2329sub db_put($$$) { 2371sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2372 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2373 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2332} 2374}
2375
2376=item cf::cache $id => [$paths...], $processversion => $process
2377
2378Generic caching function that returns the value of the resource $id,
2379caching and regenerating as required.
2380
2381This function can block.
2382
2383=cut
2384
2385sub cache {
2386 my ($id, $src, $processversion, $process) = @_;
2387
2388 my $meta =
2389 join "\x00",
2390 $processversion,
2391 map {
2392 aio_stat $_
2393 and Carp::croak "$_: $!";
2394
2395 ($_, (stat _)[7,9])
2396 } @$src;
2397
2398 my $dbmeta = db_get cache => "$id/meta";
2399 if ($dbmeta ne $meta) {
2400 # changed, we may need to process
2401
2402 my @data;
2403 my $md5;
2404
2405 for (0 .. $#$src) {
2406 0 <= aio_load $src->[$_], $data[$_]
2407 or Carp::croak "$src->[$_]: $!";
2408 }
2409
2410 # if processing is expensive, check
2411 # checksum first
2412 if (1) {
2413 $md5 =
2414 join "\x00",
2415 $processversion,
2416 map {
2417 Coro::cede;
2418 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2419 } 0.. $#$src;
2420
2421
2422 my $dbmd5 = db_get cache => "$id/md5";
2423 if ($dbmd5 eq $md5) {
2424 db_put cache => "$id/meta", $meta;
2425
2426 return db_get cache => "$id/data";
2427 }
2428 }
2429
2430 my $t1 = Time::HiRes::time;
2431 my $data = $process->(\@data);
2432 my $t2 = Time::HiRes::time;
2433
2434 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2435
2436 db_put cache => "$id/data", $data;
2437 db_put cache => "$id/md5" , $md5;
2438 db_put cache => "$id/meta", $meta;
2439
2440 return $data;
2441 }
2442
2443 db_get cache => "$id/data"
2444}
2445
2446=item fork_call { }, $args
2447
2448Executes the given code block with the given arguments in a seperate
2449process, returning the results. Everything must be serialisable with
2450Coro::Storable. May, of course, block. Note that the executed sub may
2451never block itself or use any form of Event handling.
2452
2453=cut
2454
2455sub fork_call(&@) {
2456 my ($cb, @args) = @_;
2457
2458# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2459# or die "socketpair: $!";
2460 pipe my $fh1, my $fh2
2461 or die "pipe: $!";
2462
2463 if (my $pid = fork) {
2464 close $fh2;
2465
2466 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2467 $res = Coro::Storable::thaw $res;
2468
2469 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2470
2471 die $$res unless "ARRAY" eq ref $res;
2472
2473 return wantarray ? @$res : $res->[-1];
2474 } else {
2475 reset_signals;
2476 local $SIG{__WARN__};
2477 local $SIG{__DIE__};
2478 eval {
2479 close $fh1;
2480
2481 my @res = eval { $cb->(@args) };
2482 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2483 };
2484
2485 warn $@ if $@;
2486 _exit 0;
2487 }
2488}
2489
2490
2333 2491
2334############################################################################# 2492#############################################################################
2335# the server's init and main functions 2493# the server's init and main functions
2336 2494
2337sub load_facedata { 2495sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2496 my ($path) = @_;
2339 2497
2340 warn "loading facedata from $path\n"; 2498 warn "loading facedata from $path\n";
2341 2499
2342 my $facedata; 2500 my $facedata;
2343 0 < aio_load $path, $facedata 2501 0 < aio_load $path, $facedata
… …
2384 } 2542 }
2385 2543
2386 1 2544 1
2387} 2545}
2388 2546
2389our $archetypes_loaded; 2547sub reload_regions {
2548 load_resource_file "$MAPDIR/regions"
2549 or die "unable to load regions file\n";
2550}
2390 2551
2552sub reload_facedata {
2553 load_facedata "$DATADIR/facedata"
2554 or die "unable to load facedata\n";
2555}
2556
2391sub load_archetypes { 2557sub reload_archetypes {
2392 return 1 if $archetypes_loaded++; # current can only load them once 2558 load_resource_file "$DATADIR/archetypes"
2393# load_archetype_file sprintf "%s/archetypes", cf::datadir; 2559 or die "unable to load archetypes\n";
2394 load_archetype_file sprintf "%s/archetypes", cf::datadir
2395} 2560}
2396 2561
2397sub load_treasures { 2562sub reload_treasures {
2398 load_treasure_file sprintf "%s/treasures", cf::datadir 2563 load_resource_file "$DATADIR/treasures"
2564 or die "unable to load treasurelists\n";
2399} 2565}
2400 2566
2401sub reload_resources { 2567sub reload_resources {
2402 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2568 warn "reloading resource files...\n";
2403 or die "unable to load regions file\n"; 2569
2570 reload_regions;
2404 load_facedata 2571 reload_facedata;
2405 or die "unable to load facedata\n";
2406 load_archetypes 2572 reload_archetypes;
2407 or die "unable to load archetypes\n";
2408 load_treasures 2573 reload_treasures;
2409 or die "unable to load treasurelists\n"; 2574
2575 warn "finished reloading resource files\n";
2410} 2576}
2411 2577
2412sub init { 2578sub init {
2413 reload_resources; 2579 reload_resources;
2414} 2580}
2415 2581
2416sub cfg_load { 2582sub cfg_load {
2417 open my $fh, "<:utf8", cf::confdir . "/config" 2583 open my $fh, "<:utf8", "$CONFDIR/config"
2418 or return; 2584 or return;
2419 2585
2420 local $/; 2586 local $/;
2421 *CFG = YAML::Syck::Load <$fh>; 2587 *CFG = YAML::Syck::Load <$fh>;
2422 2588
… …
2507 2673
2508 warn Carp::longmess "post_cleanup backtrace" 2674 warn Carp::longmess "post_cleanup backtrace"
2509 if $make_core; 2675 if $make_core;
2510} 2676}
2511 2677
2512sub reload() { 2678sub do_reload_perl() {
2513 # can/must only be called in main 2679 # can/must only be called in main
2514 if ($Coro::current != $Coro::main) { 2680 if ($Coro::current != $Coro::main) {
2515 warn "can only reload from main coroutine"; 2681 warn "can only reload from main coroutine";
2516 return; 2682 return;
2517 } 2683 }
… …
2592 Symbol::delete_package "safe::$_" 2758 Symbol::delete_package "safe::$_"
2593 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2759 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2594 2760
2595 warn "unloading cf.pm \"a bit\""; 2761 warn "unloading cf.pm \"a bit\"";
2596 delete $INC{"cf.pm"}; 2762 delete $INC{"cf.pm"};
2763 delete $INC{"cf/pod.pm"};
2597 2764
2598 # don't, removes xs symbols, too, 2765 # don't, removes xs symbols, too,
2599 # and global variables created in xs 2766 # and global variables created in xs
2600 #Symbol::delete_package __PACKAGE__; 2767 #Symbol::delete_package __PACKAGE__;
2601 2768
… …
2616 warn "reattaching attachments to maps"; 2783 warn "reattaching attachments to maps";
2617 reattach $_ for values %MAP; 2784 reattach $_ for values %MAP;
2618 warn "reattaching attachments to players"; 2785 warn "reattaching attachments to players";
2619 reattach $_ for values %PLAYER; 2786 reattach $_ for values %PLAYER;
2620 2787
2621 warn "loading reloadable resources";
2622 reload_resources;
2623
2624 warn "leaving sync_job"; 2788 warn "leaving sync_job";
2625 2789
2626 1 2790 1
2627 } or do { 2791 } or do {
2628 warn $@; 2792 warn $@;
… …
2633 warn "reloaded"; 2797 warn "reloaded";
2634}; 2798};
2635 2799
2636our $RELOAD_WATCHER; # used only during reload 2800our $RELOAD_WATCHER; # used only during reload
2637 2801
2802sub reload_perl() {
2803 # doing reload synchronously and two reloads happen back-to-back,
2804 # coro crashes during coro_state_free->destroy here.
2805
2806 $RELOAD_WATCHER ||= Event->timer (
2807 reentrant => 0,
2808 after => 0,
2809 data => WF_AUTOCANCEL,
2810 cb => sub {
2811 do_reload_perl;
2812 undef $RELOAD_WATCHER;
2813 },
2814 );
2815}
2816
2638register_command "reload" => sub { 2817register_command "reload" => sub {
2639 my ($who, $arg) = @_; 2818 my ($who, $arg) = @_;
2640 2819
2641 if ($who->flag (FLAG_WIZ)) { 2820 if ($who->flag (FLAG_WIZ)) {
2642 $who->message ("reloading server."); 2821 $who->message ("reloading server.");
2643 2822 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 } 2823 }
2657}; 2824};
2658 2825
2659unshift @INC, $LIBDIR; 2826unshift @INC, $LIBDIR;
2660 2827
… …
2692 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2859 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2693 unless ++$bug_warning > 10; 2860 unless ++$bug_warning > 10;
2694 return; 2861 return;
2695 } 2862 }
2696 2863
2697 $NOW = Event::time; 2864 $NOW = $tick_start = Event::time;
2698 2865
2699 cf::server_tick; # one server iteration 2866 cf::server_tick; # one server iteration
2867
2700 $RUNTIME += $TICK; 2868 $RUNTIME += $TICK;
2701 $NEXT_TICK += $TICK; 2869 $NEXT_TICK += $TICK;
2702 2870
2703 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2871 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2704 $NEXT_RUNTIME_WRITE = $NOW + 10; 2872 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2706 write_runtime 2874 write_runtime
2707 or warn "ERROR: unable to write runtime file: $!"; 2875 or warn "ERROR: unable to write runtime file: $!";
2708 }; 2876 };
2709 } 2877 }
2710 2878
2879# my $AFTER = Event::time;
2880# warn $AFTER - $NOW;#d#
2881
2711 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2882 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2712 $sig->send; 2883 $sig->send;
2713 } 2884 }
2714 while (my $sig = shift @WAIT_FOR_TICK) { 2885 while (my $sig = shift @WAIT_FOR_TICK) {
2715 $sig->send; 2886 $sig->send;
2716 } 2887 }
2717 2888
2718# my $AFTER = Event::time; 2889 $NOW = Event::time;
2719# warn $AFTER - $NOW;#d#
2720 2890
2721 # if we are delayed by four ticks or more, skip them all 2891 # if we are delayed by four ticks or more, skip them all
2722 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2892 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2723 2893
2724 $TICK_WATCHER->at ($NEXT_TICK); 2894 $TICK_WATCHER->at ($NEXT_TICK);
2725 $TICK_WATCHER->start; 2895 $TICK_WATCHER->start;
2896
2897 $LOAD = ($NOW - $tick_start) / $TICK;
2898 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2899
2900 _post_tick;
2901
2902
2726 }, 2903 },
2727); 2904);
2728 2905
2729{ 2906{
2730 BDB::max_poll_time $TICK * 0.1; 2907 BDB::max_poll_time $TICK * 0.1;
… …
2758 2935
2759 cf::sync_job { 2936 cf::sync_job {
2760 eval { 2937 eval {
2761 BDB::db_env_open 2938 BDB::db_env_open
2762 $DB_ENV, 2939 $DB_ENV,
2763 $BDB_ENV_DIR, 2940 $BDBDIR,
2764 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2941 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2765 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2942 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2766 0666; 2943 0666;
2767 2944
2768 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2945 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2769 2946
2770 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2771 $DB_ENV->set_lk_detect; 2948 $DB_ENV->set_lk_detect;
2772 }; 2949 };
2773 2950
… …
2789 prio => 6, 2966 prio => 6,
2790 cb => \&IO::AIO::poll_cb, 2967 cb => \&IO::AIO::poll_cb,
2791 ); 2968 );
2792} 2969}
2793 2970
2971my $_log_backtrace;
2972
2973sub _log_backtrace {
2974 my ($msg, @addr) = @_;
2975
2976 $msg =~ s/\n//;
2977
2978 # limit the # of concurrent backtraces
2979 if ($_log_backtrace < 2) {
2980 ++$_log_backtrace;
2981 async {
2982 my @bt = fork_call {
2983 @addr = map { sprintf "%x", $_ } @addr;
2984 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2985 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2986 or die "addr2line: $!";
2987
2988 my @funcs;
2989 my @res = <$fh>;
2990 chomp for @res;
2991 while (@res) {
2992 my ($func, $line) = splice @res, 0, 2, ();
2993 push @funcs, "[$func] $line";
2994 }
2995
2996 @funcs
2997 };
2998
2999 LOG llevInfo, "[ABT] $msg\n";
3000 LOG llevInfo, "[ABT] $_\n" for @bt;
3001 --$_log_backtrace;
3002 };
3003 } else {
3004 LOG llevInfo, "[ABT] $msg\n";
3005 LOG llevInfo, "[ABT] [suppressed]\n";
3006 }
3007}
3008
3009# load additional modules
3010use cf::pod;
3011
2794END { cf::emergency_save } 3012END { cf::emergency_save }
2795 3013
27961 30141
2797 3015

Diff Legend

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