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.250 by root, Wed Apr 18 14:24:10 2007 UTC vs.
Revision 1.269 by root, Tue May 22 21:35:26 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
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
86binmode STDOUT; 99binmode STDOUT;
87binmode STDERR; 100binmode STDERR;
88 101
89# read virtual server time, if available 102# read virtual server time, if available
90unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
92 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
93 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
94} 107}
95 108
96mkdir cf::localdir; 109mkdir $_
97mkdir cf::localdir . "/" . cf::playerdir; 110 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 111
103our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
104 113
105sub cf::map::normalise; 114sub cf::map::normalise;
106 115
… …
117=item $cf::RUNTIME 126=item $cf::RUNTIME
118 127
119The 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
120every server tick. 129every server tick.
121 130
122=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
123 134
124The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
125be 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.
126 139
127=item $cf::NOW 140=item $cf::NOW
128 141
129The time of the last (current) server tick. 142The time of the last (current) server tick.
130 143
131=item $cf::TICK 144=item $cf::TICK
132 145
133The 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.
134 157
135=item %cf::CFG 158=item %cf::CFG
136 159
137Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
138from wherever your confdir points to. 161from wherever your confdir points to.
… …
152 my $msg = join "", @_; 175 my $msg = join "", @_;
153 176
154 $msg .= "\n" 177 $msg .= "\n"
155 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
156 179
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158 181
159 utf8::encode $msg; 182 utf8::encode $msg;
160 LOG llevError, $msg; 183 LOG llevError, $msg;
161 }; 184 };
162} 185}
… …
234returned. 257returned.
235 258
236Lock 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
237uses map_find and cf::map::load uses map_load). 260uses map_find and cf::map::load uses map_load).
238 261
262=item $locked = cf::lock_active $string
263
264Return true if the lock is currently active, i.e. somebody has locked it.
265
239=cut 266=cut
240 267
241our %LOCK; 268our %LOCK;
242 269
243sub lock_wait($) { 270sub lock_wait($) {
… …
260 287
261 Coro::guard { 288 Coro::guard {
262 # wake up all waiters, to be on the safe side 289 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 290 $_->ready for @{ delete $LOCK{$key} };
264 } 291 }
292}
293
294sub lock_active($) {
295 my ($key) = @_;
296
297 ! ! $LOCK{$key}
265} 298}
266 299
267sub freeze_mainloop { 300sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 301 return unless $TICK_WATCHER->is_active;
269 302
… …
299 332
300sub sync_job(&) { 333sub sync_job(&) {
301 my ($job) = @_; 334 my ($job) = @_;
302 335
303 if ($Coro::current == $Coro::main) { 336 if ($Coro::current == $Coro::main) {
337 my $time = Event::time;
338
304 # this is the main coro, too bad, we have to block 339 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 340 # till the operation succeeds, freezing the server :/
306 341
307 # TODO: use suspend/resume instead 342 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 343 # (but this is cancel-safe)
… …
319 354
320 while ($busy) { 355 while ($busy) {
321 Coro::cede or Event::one_event; 356 Coro::cede or Event::one_event;
322 } 357 }
323 358
359 $time = Event::time - $time;
360
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load
365
324 wantarray ? @res : $res[0] 366 wantarray ? @res : $res[0]
325 } else { 367 } else {
326 # we are in another coroutine, how wonderful, everything just works 368 # we are in another coroutine, how wonderful, everything just works
327 369
328 $job->() 370 $job->()
… …
348 390
349 $coro 391 $coro
350} 392}
351 393
352sub 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
353 my $guard = cf::lock_acquire "write_runtime"; 404 my $guard = cf::lock_acquire "write_runtime";
354
355 my $runtime = cf::localdir . "/runtime";
356 405
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
358 or return; 407 or return;
359 408
360 my $value = $cf::RUNTIME + 90 + 10; 409 my $value = $cf::RUNTIME + 90 + 10;
… …
366 415
367 # always fsync - this file is important 416 # always fsync - this file is important
368 aio_fsync $fh 417 aio_fsync $fh
369 and return; 418 and return;
370 419
420 # touch it again to show we are up-to-date
421 utime undef, undef, $fh;
422
371 close $fh 423 close $fh
372 or return; 424 or return;
373 425
374 aio_rename "$runtime~", $runtime 426 aio_rename "$runtime~", $runtime
375 and return; 427 and return;
428
429 warn "runtime file written.\n";#d#
376 430
377 1 431 1
378} 432}
379 433
380=item cf::datalog type => key => value, ... 434=item cf::datalog type => key => value, ...
… …
573 $registry = $CB_TYPE[$object_type] ||= []; 627 $registry = $CB_TYPE[$object_type] ||= [];
574 628
575 } elsif ($type eq "subtype") { 629 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 630 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 631 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 633
580 } elsif ($type eq "package") { 634 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 635 my $pkg = shift @arg;
582 636
583 while (my ($name, $id) = each %cb_id) { 637 while (my ($name, $id) = each %cb_id) {
… …
624 if (ref $_[0]) { 678 if (ref $_[0]) {
625 _object_attach @_; 679 _object_attach @_;
626 } else { 680 } else {
627 _attach shift->_attach_registry, @_; 681 _attach shift->_attach_registry, @_;
628 } 682 }
683 _recalc_want;
629}; 684};
630 685
631# all those should be optimised 686# all those should be optimised
632sub cf::attachable::detach { 687sub cf::attachable::detach {
633 my ($obj, $name) = @_; 688 my ($obj, $name) = @_;
… …
636 delete $obj->{_attachment}{$name}; 691 delete $obj->{_attachment}{$name};
637 reattach ($obj); 692 reattach ($obj);
638 } else { 693 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 694 Carp::croak "cannot, currently, detach class attachments";
640 } 695 }
696 _recalc_want;
641}; 697};
642 698
643sub cf::attachable::attached { 699sub cf::attachable::attached {
644 my ($obj, $name) = @_; 700 my ($obj, $name) = @_;
645 701
… …
955Returns the given player object, loading it if necessary (might block). 1011Returns the given player object, loading it if necessary (might block).
956 1012
957=cut 1013=cut
958 1014
959sub playerdir($) { 1015sub playerdir($) {
960 cf::localdir 1016 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1017 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1018}
966 1019
967sub path($) { 1020sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1021 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1088while and may block, so not sync_job-capable, ever. 1141while and may block, so not sync_job-capable, ever.
1089 1142
1090=cut 1143=cut
1091 1144
1092sub list_logins { 1145sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1146 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1147 or return [];
1095 1148
1096 my @logins; 1149 my @logins;
1097 1150
1098 for my $login (@$dirs) { 1151 for my $login (@$dirs) {
… …
1336 1389
1337# the original (read-only) location 1390# the original (read-only) location
1338sub load_path { 1391sub load_path {
1339 my ($self) = @_; 1392 my ($self) = @_;
1340 1393
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1394 "$MAPDIR/$self->{path}.map"
1342} 1395}
1343 1396
1344# the temporary/swap location 1397# the temporary/swap location
1345sub save_path { 1398sub save_path {
1346 my ($self) = @_; 1399 my ($self) = @_;
1347 1400
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1401 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1402 "$TMPDIR/$path.map"
1350} 1403}
1351 1404
1352# the unique path, undef == no special unique path 1405# the unique path, undef == no special unique path
1353sub uniq_path { 1406sub uniq_path {
1354 my ($self) = @_; 1407 my ($self) = @_;
1355 1408
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1409 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1410 "$UNIQUEDIR/$path"
1358} 1411}
1359 1412
1360# and all this just because we cannot iterate over 1413# and all this just because we cannot iterate over
1361# all maps in C++... 1414# all maps in C++...
1362sub change_all_map_light { 1415sub change_all_map_light {
… …
1474 my ($self) = @_; 1527 my ($self) = @_;
1475 1528
1476 local $self->{deny_reset} = 1; # loading can take a long time 1529 local $self->{deny_reset} = 1; # loading can take a long time
1477 1530
1478 my $path = $self->{path}; 1531 my $path = $self->{path};
1532
1533 {
1479 my $guard = cf::lock_acquire "map_load:$path"; 1534 my $guard = cf::lock_acquire "map_load:$path";
1480 1535
1481 return if $self->in_memory != cf::MAP_SWAPPED; 1536 return if $self->in_memory != cf::MAP_SWAPPED;
1482 1537
1483 $self->in_memory (cf::MAP_LOADING); 1538 $self->in_memory (cf::MAP_LOADING);
1484 1539
1485 $self->alloc; 1540 $self->alloc;
1486 1541
1487 $self->pre_load; 1542 $self->pre_load;
1488 Coro::cede;
1489
1490 $self->_load_objects ($self->{load_path}, 1)
1491 or return;
1492
1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1494 if delete $self->{load_original};
1495
1496 if (my $uniq = $self->uniq_path) {
1497 utf8::encode $uniq;
1498 if (aio_open $uniq, O_RDONLY, 0) {
1499 $self->clear_unique_items;
1500 $self->_load_objects ($uniq, 0);
1501 }
1502 }
1503
1504 Coro::cede;
1505 # now do the right thing for maps
1506 $self->link_multipart_objects;
1507 Coro::cede;
1508
1509 unless ($self->{deny_activate}) {
1510 $self->decay_objects;
1511 $self->fix_auto_apply;
1512 $self->update_buttons;
1513 Coro::cede; 1543 Coro::cede;
1514 $self->set_darkness_map; 1544
1545 $self->_load_objects ($self->{load_path}, 1)
1546 or return;
1547
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original};
1550
1551 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) {
1554 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0);
1556 }
1557 }
1558
1559 Coro::cede;
1560 # now do the right thing for maps
1561 $self->link_multipart_objects;
1515 $self->difficulty ($self->estimate_difficulty) 1562 $self->difficulty ($self->estimate_difficulty)
1516 unless $self->difficulty; 1563 unless $self->difficulty;
1517 Coro::cede; 1564 Coro::cede;
1565
1566 unless ($self->{deny_activate}) {
1567 $self->decay_objects;
1568 $self->fix_auto_apply;
1569 $self->update_buttons;
1570 Coro::cede;
1571 $self->set_darkness_map;
1572 Coro::cede;
1518 $self->activate; 1573 $self->activate;
1519 Coro::cede; 1574 }
1575
1576 $self->in_memory (cf::MAP_IN_MEMORY);
1520 } 1577 }
1521 1578
1522 $self->post_load; 1579 $self->post_load;
1523 Coro::cede;
1524
1525 $self->in_memory (cf::MAP_IN_MEMORY);
1526} 1580}
1527 1581
1528sub customise_for { 1582sub customise_for {
1529 my ($self, $ob) = @_; 1583 my ($self, $ob) = @_;
1530 1584
… …
1721instantiated unique items. May block. 1775instantiated unique items. May block.
1722 1776
1723=cut 1777=cut
1724 1778
1725sub unique_maps() { 1779sub unique_maps() {
1726 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1780 my $files = aio_readdir $UNIQUEDIR
1727 or return; 1781 or return;
1728 1782
1729 my @paths; 1783 my @paths;
1730 1784
1731 for (@$files) { 1785 for (@$files) {
… …
1921 })->prio (2); 1975 })->prio (2);
1922 } 1976 }
1923 }, 1977 },
1924); 1978);
1925 1979
1926=item $player_object->goto ($path, $x, $y) 1980=item $player_object->goto ($path, $x, $y[, $check->($map)])
1981
1982Moves the player to the given map-path and coordinates by first freezing
1983her, loading and preparing them map, calling the provided $check callback
1984that has to return the map if sucecssful, and then unfreezes the player on
1985the new (success) or old (failed) map position.
1927 1986
1928=cut 1987=cut
1929 1988
1930sub cf::object::player::goto { 1989sub cf::object::player::goto {
1931 my ($self, $path, $x, $y) = @_; 1990 my ($self, $path, $x, $y, $check) = @_;
1932 1991
1933 $self->enter_link; 1992 $self->enter_link;
1934 1993
1935 (async { 1994 (async {
1936 my $map = eval { 1995 my $map = eval {
1937 my $map = cf::map::find $path; 1996 my $map = cf::map::find $path;
1997
1998 if ($map) {
1938 $map = $map->customise_for ($self) if $map; 1999 $map = $map->customise_for ($self);
2000 $map = $check->($map) if $check && $map;
2001 } else {
2002 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2003 }
2004
1939 $map 2005 $map
2006 };
2007
2008 if ($@) {
2009 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2010 LOG llevError | logBacktrace, Carp::longmess $@;
1940 } or 2011 }
1941 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1942 2012
1943 $self->leave_link ($map, $x, $y); 2013 $self->leave_link ($map, $x, $y);
1944 })->prio (1); 2014 })->prio (1);
1945} 2015}
1946 2016
… …
1987 2057
1988 $rmp->{random_seed} ||= $exit->random_seed; 2058 $rmp->{random_seed} ||= $exit->random_seed;
1989 2059
1990 my $data = cf::to_json $rmp; 2060 my $data = cf::to_json $rmp;
1991 my $md5 = Digest::MD5::md5_hex $data; 2061 my $md5 = Digest::MD5::md5_hex $data;
1992 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2062 my $meta = "$RANDOMDIR/$md5.meta";
1993 2063
1994 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2064 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995 aio_write $fh, 0, (length $data), $data, 0; 2065 aio_write $fh, 0, (length $data), $data, 0;
1996 undef $fh; 2066 undef $fh;
1997 aio_rename "$meta~", $meta; 2067 aio_rename "$meta~", $meta;
… …
2373 2443
2374 return db_get cache => "$id/data"; 2444 return db_get cache => "$id/data";
2375 } 2445 }
2376 } 2446 }
2377 2447
2448 my $t1 = Time::HiRes::time;
2378 my $data = $process->(\@data); 2449 my $data = $process->(\@data);
2450 my $t2 = Time::HiRes::time;
2451
2452 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2379 2453
2380 db_put cache => "$id/data", $data; 2454 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5; 2455 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta; 2456 db_put cache => "$id/meta", $meta;
2383 2457
… …
2414 2488
2415 die $$res unless "ARRAY" eq ref $res; 2489 die $$res unless "ARRAY" eq ref $res;
2416 2490
2417 return wantarray ? @$res : $res->[-1]; 2491 return wantarray ? @$res : $res->[-1];
2418 } else { 2492 } else {
2493 reset_signals;
2494 local $SIG{__WARN__};
2495 local $SIG{__DIE__};
2419 eval { 2496 eval {
2420 local $SIG{__DIE__};
2421 local $SIG{__WARN__};
2422 close $fh1; 2497 close $fh1;
2423 2498
2424 my @res = eval { $cb->(@args) }; 2499 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2500 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 }; 2501 };
2427 2502
2503 warn $@ if $@;
2428 _exit 0; 2504 _exit 0;
2429 } 2505 }
2430} 2506}
2431 2507
2432 2508
… …
2484 } 2560 }
2485 2561
2486 1 2562 1
2487} 2563}
2488 2564
2565sub reload_regions {
2566 load_resource_file "$MAPDIR/regions"
2567 or die "unable to load regions file\n";
2568}
2569
2489sub reload_facedata { 2570sub reload_facedata {
2490 load_facedata sprintf "%s/facedata", cf::datadir 2571 load_facedata "$DATADIR/facedata"
2491 or die "unable to load facedata\n"; 2572 or die "unable to load facedata\n";
2492} 2573}
2493 2574
2494sub reload_regions {
2495 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2496 or die "unable to load regions file\n";
2497}
2498
2499sub reload_archetypes { 2575sub reload_archetypes {
2500 load_resource_file sprintf "%s/archetypes", cf::datadir 2576 load_resource_file "$DATADIR/archetypes"
2501 or die "unable to load archetypes\n"; 2577 or die "unable to load archetypes\n";
2502} 2578}
2503 2579
2504sub reload_treasures { 2580sub reload_treasures {
2505 load_resource_file sprintf "%s/treasures", cf::datadir 2581 load_resource_file "$DATADIR/treasures"
2506 or die "unable to load treasurelists\n"; 2582 or die "unable to load treasurelists\n";
2507} 2583}
2508 2584
2509sub reload_resources { 2585sub reload_resources {
2510 warn "reloading resource files...\n"; 2586 warn "reloading resource files...\n";
… …
2520sub init { 2596sub init {
2521 reload_resources; 2597 reload_resources;
2522} 2598}
2523 2599
2524sub cfg_load { 2600sub cfg_load {
2525 open my $fh, "<:utf8", cf::confdir . "/config" 2601 open my $fh, "<:utf8", "$CONFDIR/config"
2526 or return; 2602 or return;
2527 2603
2528 local $/; 2604 local $/;
2529 *CFG = YAML::Syck::Load <$fh>; 2605 *CFG = YAML::Syck::Load <$fh>;
2530 2606
… …
2700 Symbol::delete_package "safe::$_" 2776 Symbol::delete_package "safe::$_"
2701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2777 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2702 2778
2703 warn "unloading cf.pm \"a bit\""; 2779 warn "unloading cf.pm \"a bit\"";
2704 delete $INC{"cf.pm"}; 2780 delete $INC{"cf.pm"};
2781 delete $INC{"cf/pod.pm"};
2705 2782
2706 # don't, removes xs symbols, too, 2783 # don't, removes xs symbols, too,
2707 # and global variables created in xs 2784 # and global variables created in xs
2708 #Symbol::delete_package __PACKAGE__; 2785 #Symbol::delete_package __PACKAGE__;
2709 2786
… …
2787 my $signal = new Coro::Signal; 2864 my $signal = new Coro::Signal;
2788 push @WAIT_FOR_TICK_BEGIN, $signal; 2865 push @WAIT_FOR_TICK_BEGIN, $signal;
2789 $signal->wait; 2866 $signal->wait;
2790} 2867}
2791 2868
2869 my $min = 1e6;#d#
2870 my $avg = 10;
2792$TICK_WATCHER = Event->timer ( 2871$TICK_WATCHER = Event->timer (
2793 reentrant => 0, 2872 reentrant => 0,
2794 parked => 1, 2873 parked => 1,
2795 prio => 0, 2874 prio => 0,
2796 at => $NEXT_TICK || $TICK, 2875 at => $NEXT_TICK || $TICK,
… …
2800 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2879 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2801 unless ++$bug_warning > 10; 2880 unless ++$bug_warning > 10;
2802 return; 2881 return;
2803 } 2882 }
2804 2883
2805 $NOW = Event::time; 2884 $NOW = $tick_start = Event::time;
2806 2885
2807 cf::server_tick; # one server iteration 2886 cf::server_tick; # one server iteration
2887
2888 0 && sync_job {#d#
2889 for(1..10) {
2890 my $t = Event::time;
2891 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2892 or die;
2893
2894 $map->width (50);
2895 $map->height (50);
2896 $map->alloc;
2897 $map->_load_objects ("/tmp/x.map", 1);
2898 my $t = Event::time - $t;
2899
2900 #next unless $t < 0.0013;#d#
2901 if ($t < $min) {
2902 $min = $t;
2903 }
2904 $avg = $avg * 0.99 + $t * 0.01;
2905 }
2906 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2907 exit 0;
2908 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2909 };
2808 2910
2809 $RUNTIME += $TICK; 2911 $RUNTIME += $TICK;
2810 $NEXT_TICK += $TICK; 2912 $NEXT_TICK += $TICK;
2811 2913
2812 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2914 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2818 } 2920 }
2819 2921
2820# my $AFTER = Event::time; 2922# my $AFTER = Event::time;
2821# warn $AFTER - $NOW;#d# 2923# warn $AFTER - $NOW;#d#
2822 2924
2925 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2926 $sig->send;
2927 }
2928 while (my $sig = shift @WAIT_FOR_TICK) {
2929 $sig->send;
2930 }
2931
2932 $NOW = Event::time;
2933
2823 # if we are delayed by four ticks or more, skip them all 2934 # if we are delayed by four ticks or more, skip them all
2824 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2935 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2825 2936
2826 $TICK_WATCHER->at ($NEXT_TICK); 2937 $TICK_WATCHER->at ($NEXT_TICK);
2827 $TICK_WATCHER->start; 2938 $TICK_WATCHER->start;
2828 2939
2829 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2940 $LOAD = ($NOW - $tick_start) / $TICK;
2830 $sig->send; 2941 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2831 }
2832 while (my $sig = shift @WAIT_FOR_TICK) {
2833 $sig->send;
2834 }
2835 2942
2836 _post_tick; 2943 _post_tick;
2944
2945
2837 }, 2946 },
2838); 2947);
2839 2948
2840{ 2949{
2841 BDB::max_poll_time $TICK * 0.1; 2950 BDB::max_poll_time $TICK * 0.1;
… …
2869 2978
2870 cf::sync_job { 2979 cf::sync_job {
2871 eval { 2980 eval {
2872 BDB::db_env_open 2981 BDB::db_env_open
2873 $DB_ENV, 2982 $DB_ENV,
2874 $BDB_ENV_DIR, 2983 $BDBDIR,
2875 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2984 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2876 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2985 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2877 0666; 2986 0666;
2878 2987
2879 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2988 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2880 2989
2881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2990 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2882 $DB_ENV->set_lk_detect; 2991 $DB_ENV->set_lk_detect;
2883 }; 2992 };
2884 2993
… …
2900 prio => 6, 3009 prio => 6,
2901 cb => \&IO::AIO::poll_cb, 3010 cb => \&IO::AIO::poll_cb,
2902 ); 3011 );
2903} 3012}
2904 3013
3014my $_log_backtrace;
3015
3016sub _log_backtrace {
3017 my ($msg, @addr) = @_;
3018
3019 $msg =~ s/\n//;
3020
3021 # limit the # of concurrent backtraces
3022 if ($_log_backtrace < 2) {
3023 ++$_log_backtrace;
3024 async {
3025 my @bt = fork_call {
3026 @addr = map { sprintf "%x", $_ } @addr;
3027 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3028 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3029 or die "addr2line: $!";
3030
3031 my @funcs;
3032 my @res = <$fh>;
3033 chomp for @res;
3034 while (@res) {
3035 my ($func, $line) = splice @res, 0, 2, ();
3036 push @funcs, "[$func] $line";
3037 }
3038
3039 @funcs
3040 };
3041
3042 LOG llevInfo, "[ABT] $msg\n";
3043 LOG llevInfo, "[ABT] $_\n" for @bt;
3044 --$_log_backtrace;
3045 };
3046 } else {
3047 LOG llevInfo, "[ABT] $msg\n";
3048 LOG llevInfo, "[ABT] [suppressed]\n";
3049 }
3050}
3051
2905# load additional modules 3052# load additional modules
2906use cf::pod; 3053use cf::pod;
2907 3054
2908END { cf::emergency_save } 3055END { cf::emergency_save }
2909 3056

Diff Legend

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