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.272 by root, Sun Jun 3 15:32:50 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, 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
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 IO::AIO::aio_utime $runtime, undef, undef;
401
349 my $guard = cf::lock_acquire "write_runtime"; 402 my $guard = cf::lock_acquire "write_runtime";
350
351 my $runtime = cf::localdir . "/runtime";
352 403
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 405 or return;
355 406
356 my $value = $cf::RUNTIME + 90 + 10; 407 my $value = $cf::RUNTIME + 90 + 10;
… …
362 413
363 # always fsync - this file is important 414 # always fsync - this file is important
364 aio_fsync $fh 415 aio_fsync $fh
365 and return; 416 and return;
366 417
418 # touch it again to show we are up-to-date
419 aio_utime $fh, undef, undef;
420
367 close $fh 421 close $fh
368 or return; 422 or return;
369 423
370 aio_rename "$runtime~", $runtime 424 aio_rename "$runtime~", $runtime
371 and return; 425 and return;
426
427 warn "runtime file written.\n";#d#
372 428
373 1 429 1
374} 430}
375 431
376=item cf::datalog type => key => value, ... 432=item cf::datalog type => key => value, ...
… …
569 $registry = $CB_TYPE[$object_type] ||= []; 625 $registry = $CB_TYPE[$object_type] ||= [];
570 626
571 } elsif ($type eq "subtype") { 627 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 628 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 629 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 630 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 631
576 } elsif ($type eq "package") { 632 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 633 my $pkg = shift @arg;
578 634
579 while (my ($name, $id) = each %cb_id) { 635 while (my ($name, $id) = each %cb_id) {
… …
620 if (ref $_[0]) { 676 if (ref $_[0]) {
621 _object_attach @_; 677 _object_attach @_;
622 } else { 678 } else {
623 _attach shift->_attach_registry, @_; 679 _attach shift->_attach_registry, @_;
624 } 680 }
681 _recalc_want;
625}; 682};
626 683
627# all those should be optimised 684# all those should be optimised
628sub cf::attachable::detach { 685sub cf::attachable::detach {
629 my ($obj, $name) = @_; 686 my ($obj, $name) = @_;
… …
632 delete $obj->{_attachment}{$name}; 689 delete $obj->{_attachment}{$name};
633 reattach ($obj); 690 reattach ($obj);
634 } else { 691 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 692 Carp::croak "cannot, currently, detach class attachments";
636 } 693 }
694 _recalc_want;
637}; 695};
638 696
639sub cf::attachable::attached { 697sub cf::attachable::attached {
640 my ($obj, $name) = @_; 698 my ($obj, $name) = @_;
641 699
… …
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) {
… …
1846 $self->deactivate_recursive; 1902 $self->deactivate_recursive;
1847 1903
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1904 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 1905
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 1907 if $self->map && $self->map->{path} ne "{link}";
1852 1908
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1909 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 1910}
1855 1911
1856sub cf::object::player::leave_link { 1912sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 1913 my ($self, $map, $x, $y) = @_;
1914
1915 return unless $self->contr->active;
1858 1916
1859 my $link_pos = delete $self->{_link_pos}; 1917 my $link_pos = delete $self->{_link_pos};
1860 1918
1861 unless ($map) { 1919 unless ($map) {
1862 # restore original map position 1920 # restore original map position
… …
1885 1943
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 1945 $self->enter_map ($map, $x, $y);
1888} 1946}
1889 1947
1890cf::player->attach (
1891 on_logout => sub {
1892 my ($pl) = @_;
1893
1894 # abort map switching before logout
1895 if ($pl->ob->{_link_pos}) {
1896 cf::sync_job {
1897 $pl->ob->leave_link
1898 };
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y) 1948=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 1949
1950Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position.
1954
1924=cut 1955=cut
1956
1957our $GOTOGEN;
1925 1958
1926sub cf::object::player::goto { 1959sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 1960 my ($self, $path, $x, $y, $check) = @_;
1961
1962 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 1964
1929 $self->enter_link; 1965 $self->enter_link;
1930 1966
1931 (async { 1967 (async {
1932 my $map = eval { 1968 my $map = eval {
1933 my $map = cf::map::find $path; 1969 my $map = cf::map::find $path;
1970
1971 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 1972 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map;
1974 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1976 }
1977
1935 $map 1978 $map
1979 };
1980
1981 if ($@) {
1982 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1983 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 1984 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 1985
1986 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 1988 $self->leave_link ($map, $x, $y);
1989 }
1940 })->prio (1); 1990 })->prio (1);
1941} 1991}
1942 1992
1943=item $player_object->enter_exit ($exit_object) 1993=item $player_object->enter_exit ($exit_object)
1944 1994
… …
1983 2033
1984 $rmp->{random_seed} ||= $exit->random_seed; 2034 $rmp->{random_seed} ||= $exit->random_seed;
1985 2035
1986 my $data = cf::to_json $rmp; 2036 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2037 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2038 my $meta = "$RANDOMDIR/$md5.meta";
1989 2039
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2040 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2041 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2042 undef $fh;
1993 aio_rename "$meta~", $meta; 2043 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2312#############################################################################
2263 2313
2264=head2 EXTENSION DATABASE SUPPORT 2314=head2 EXTENSION DATABASE SUPPORT
2265 2315
2266Crossfire maintains a very simple database for extension use. It can 2316Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2318convert to/from binary).
2269 2319
2270The parameter C<$family> should best start with the name of the extension 2320The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2321using it, it should be unique.
2272 2322
2273=over 4 2323=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2347 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2348 };
2299 cf::cleanup "db_open(db): $@" if $@; 2349 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2350 };
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 } 2351 }
2316} 2352}
2317 2353
2318sub db_get($$) { 2354sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2355 my $key = "$_[0]/$_[1]";
2320 2356
2321 cf::sync_job { 2357 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2358 BDB::db_get $DB, undef, $key, my $data;
2323 2359
2324 $! ? () 2360 $! ? ()
2325 : Compress::LZF::sthaw $data 2361 : $data
2326 } 2362 }
2327} 2363}
2328 2364
2329sub db_put($$$) { 2365sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2366 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368}
2369
2370=item cf::cache $id => [$paths...], $processversion => $process
2371
2372Generic caching function that returns the value of the resource $id,
2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2402 }
2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2332} 2482}
2333 2483
2334############################################################################# 2484#############################################################################
2335# the server's init and main functions 2485# the server's init and main functions
2336 2486
2337sub load_facedata { 2487sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2488 my ($path) = @_;
2339 2489
2340 warn "loading facedata from $path\n"; 2490 warn "loading facedata from $path\n";
2341 2491
2342 my $facedata; 2492 my $facedata;
2343 0 < aio_load $path, $facedata 2493 0 < aio_load $path, $facedata
… …
2351 { 2501 {
2352 my $faces = $facedata->{faceinfo}; 2502 my $faces = $facedata->{faceinfo};
2353 2503
2354 while (my ($face, $info) = each %$faces) { 2504 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2505 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506 warn "$face $info->{magicmap}\n" if $face =~ /obol/;#d#
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2359 Coro::cede; 2510 Coro::cede;
2360 } 2511 }
… …
2384 } 2535 }
2385 2536
2386 1 2537 1
2387} 2538}
2388 2539
2389our $archetypes_loaded; 2540sub reload_regions {
2541 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n";
2543}
2390 2544
2545sub reload_facedata {
2546 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n";
2548}
2549
2391sub load_archetypes { 2550sub reload_archetypes {
2392 return 1 if $archetypes_loaded++; # current can only load them once 2551 load_resource_file "$DATADIR/archetypes"
2393# load_archetype_file sprintf "%s/archetypes", cf::datadir; 2552 or die "unable to load archetypes\n";
2394 load_archetype_file sprintf "%s/archetypes", cf::datadir
2395} 2553}
2396 2554
2397sub load_treasures { 2555sub reload_treasures {
2398 load_treasure_file sprintf "%s/treasures", cf::datadir 2556 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n";
2399} 2558}
2400 2559
2401sub reload_resources { 2560sub reload_resources {
2402 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2561 warn "reloading resource files...\n";
2403 or die "unable to load regions file\n"; 2562
2563 reload_regions;
2404 load_facedata 2564 reload_facedata;
2405 or die "unable to load facedata\n";
2406 load_archetypes 2565 reload_archetypes;
2407 or die "unable to load archetypes\n";
2408 load_treasures 2566 reload_treasures;
2409 or die "unable to load treasurelists\n"; 2567
2568 warn "finished reloading resource files\n";
2410} 2569}
2411 2570
2412sub init { 2571sub init {
2413 reload_resources; 2572 reload_resources;
2414} 2573}
2415 2574
2416sub cfg_load { 2575sub cfg_load {
2417 open my $fh, "<:utf8", cf::confdir . "/config" 2576 open my $fh, "<:utf8", "$CONFDIR/config"
2418 or return; 2577 or return;
2419 2578
2420 local $/; 2579 local $/;
2421 *CFG = YAML::Syck::Load <$fh>; 2580 *CFG = YAML::Syck::Load <$fh>;
2422 2581
… …
2507 2666
2508 warn Carp::longmess "post_cleanup backtrace" 2667 warn Carp::longmess "post_cleanup backtrace"
2509 if $make_core; 2668 if $make_core;
2510} 2669}
2511 2670
2512sub reload() { 2671sub do_reload_perl() {
2513 # can/must only be called in main 2672 # can/must only be called in main
2514 if ($Coro::current != $Coro::main) { 2673 if ($Coro::current != $Coro::main) {
2515 warn "can only reload from main coroutine"; 2674 warn "can only reload from main coroutine";
2516 return; 2675 return;
2517 } 2676 }
… …
2592 Symbol::delete_package "safe::$_" 2751 Symbol::delete_package "safe::$_"
2593 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2752 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2594 2753
2595 warn "unloading cf.pm \"a bit\""; 2754 warn "unloading cf.pm \"a bit\"";
2596 delete $INC{"cf.pm"}; 2755 delete $INC{"cf.pm"};
2756 delete $INC{"cf/pod.pm"};
2597 2757
2598 # don't, removes xs symbols, too, 2758 # don't, removes xs symbols, too,
2599 # and global variables created in xs 2759 # and global variables created in xs
2600 #Symbol::delete_package __PACKAGE__; 2760 #Symbol::delete_package __PACKAGE__;
2601 2761
… …
2616 warn "reattaching attachments to maps"; 2776 warn "reattaching attachments to maps";
2617 reattach $_ for values %MAP; 2777 reattach $_ for values %MAP;
2618 warn "reattaching attachments to players"; 2778 warn "reattaching attachments to players";
2619 reattach $_ for values %PLAYER; 2779 reattach $_ for values %PLAYER;
2620 2780
2621 warn "loading reloadable resources";
2622 reload_resources;
2623
2624 warn "leaving sync_job"; 2781 warn "leaving sync_job";
2625 2782
2626 1 2783 1
2627 } or do { 2784 } or do {
2628 warn $@; 2785 warn $@;
… …
2633 warn "reloaded"; 2790 warn "reloaded";
2634}; 2791};
2635 2792
2636our $RELOAD_WATCHER; # used only during reload 2793our $RELOAD_WATCHER; # used only during reload
2637 2794
2795sub reload_perl() {
2796 # doing reload synchronously and two reloads happen back-to-back,
2797 # coro crashes during coro_state_free->destroy here.
2798
2799 $RELOAD_WATCHER ||= Event->timer (
2800 reentrant => 0,
2801 after => 0,
2802 data => WF_AUTOCANCEL,
2803 cb => sub {
2804 do_reload_perl;
2805 undef $RELOAD_WATCHER;
2806 },
2807 );
2808}
2809
2638register_command "reload" => sub { 2810register_command "reload" => sub {
2639 my ($who, $arg) = @_; 2811 my ($who, $arg) = @_;
2640 2812
2641 if ($who->flag (FLAG_WIZ)) { 2813 if ($who->flag (FLAG_WIZ)) {
2642 $who->message ("reloading server."); 2814 $who->message ("reloading server.");
2643 2815 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 } 2816 }
2657}; 2817};
2658 2818
2659unshift @INC, $LIBDIR; 2819unshift @INC, $LIBDIR;
2660 2820
… …
2679 my $signal = new Coro::Signal; 2839 my $signal = new Coro::Signal;
2680 push @WAIT_FOR_TICK_BEGIN, $signal; 2840 push @WAIT_FOR_TICK_BEGIN, $signal;
2681 $signal->wait; 2841 $signal->wait;
2682} 2842}
2683 2843
2844 my $min = 1e6;#d#
2845 my $avg = 10;
2684$TICK_WATCHER = Event->timer ( 2846$TICK_WATCHER = Event->timer (
2685 reentrant => 0, 2847 reentrant => 0,
2686 parked => 1, 2848 parked => 1,
2687 prio => 0, 2849 prio => 0,
2688 at => $NEXT_TICK || $TICK, 2850 at => $NEXT_TICK || $TICK,
… …
2692 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2854 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2693 unless ++$bug_warning > 10; 2855 unless ++$bug_warning > 10;
2694 return; 2856 return;
2695 } 2857 }
2696 2858
2697 $NOW = Event::time; 2859 $NOW = $tick_start = Event::time;
2698 2860
2699 cf::server_tick; # one server iteration 2861 cf::server_tick; # one server iteration
2862
2863 0 && sync_job {#d#
2864 for(1..10) {
2865 my $t = Event::time;
2866 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2867 or die;
2868
2869 $map->width (50);
2870 $map->height (50);
2871 $map->alloc;
2872 $map->_load_objects ("/tmp/x.map", 1);
2873 my $t = Event::time - $t;
2874
2875 #next unless $t < 0.0013;#d#
2876 if ($t < $min) {
2877 $min = $t;
2878 }
2879 $avg = $avg * 0.99 + $t * 0.01;
2880 }
2881 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2882 exit 0;
2883 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2884 };
2885
2700 $RUNTIME += $TICK; 2886 $RUNTIME += $TICK;
2701 $NEXT_TICK += $TICK; 2887 $NEXT_TICK += $TICK;
2702 2888
2703 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2889 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2704 $NEXT_RUNTIME_WRITE = $NOW + 10; 2890 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2706 write_runtime 2892 write_runtime
2707 or warn "ERROR: unable to write runtime file: $!"; 2893 or warn "ERROR: unable to write runtime file: $!";
2708 }; 2894 };
2709 } 2895 }
2710 2896
2897# my $AFTER = Event::time;
2898# warn $AFTER - $NOW;#d#
2899
2711 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2900 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2712 $sig->send; 2901 $sig->send;
2713 } 2902 }
2714 while (my $sig = shift @WAIT_FOR_TICK) { 2903 while (my $sig = shift @WAIT_FOR_TICK) {
2715 $sig->send; 2904 $sig->send;
2716 } 2905 }
2717 2906
2718# my $AFTER = Event::time; 2907 $NOW = Event::time;
2719# warn $AFTER - $NOW;#d#
2720 2908
2721 # if we are delayed by four ticks or more, skip them all 2909 # if we are delayed by four ticks or more, skip them all
2722 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2910 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2723 2911
2724 $TICK_WATCHER->at ($NEXT_TICK); 2912 $TICK_WATCHER->at ($NEXT_TICK);
2725 $TICK_WATCHER->start; 2913 $TICK_WATCHER->start;
2914
2915 $LOAD = ($NOW - $tick_start) / $TICK;
2916 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2917
2918 _post_tick;
2919
2920
2726 }, 2921 },
2727); 2922);
2728 2923
2729{ 2924{
2730 BDB::max_poll_time $TICK * 0.1; 2925 BDB::max_poll_time $TICK * 0.1;
… …
2758 2953
2759 cf::sync_job { 2954 cf::sync_job {
2760 eval { 2955 eval {
2761 BDB::db_env_open 2956 BDB::db_env_open
2762 $DB_ENV, 2957 $DB_ENV,
2763 $BDB_ENV_DIR, 2958 $BDBDIR,
2764 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2959 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2765 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2960 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2766 0666; 2961 0666;
2767 2962
2768 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2963 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2769 2964
2770 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2965 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2771 $DB_ENV->set_lk_detect; 2966 $DB_ENV->set_lk_detect;
2772 }; 2967 };
2773 2968
… …
2789 prio => 6, 2984 prio => 6,
2790 cb => \&IO::AIO::poll_cb, 2985 cb => \&IO::AIO::poll_cb,
2791 ); 2986 );
2792} 2987}
2793 2988
2989my $_log_backtrace;
2990
2991sub _log_backtrace {
2992 my ($msg, @addr) = @_;
2993
2994 $msg =~ s/\n//;
2995
2996 # limit the # of concurrent backtraces
2997 if ($_log_backtrace < 2) {
2998 ++$_log_backtrace;
2999 async {
3000 my @bt = fork_call {
3001 @addr = map { sprintf "%x", $_ } @addr;
3002 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3003 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3004 or die "addr2line: $!";
3005
3006 my @funcs;
3007 my @res = <$fh>;
3008 chomp for @res;
3009 while (@res) {
3010 my ($func, $line) = splice @res, 0, 2, ();
3011 push @funcs, "[$func] $line";
3012 }
3013
3014 @funcs
3015 };
3016
3017 LOG llevInfo, "[ABT] $msg\n";
3018 LOG llevInfo, "[ABT] $_\n" for @bt;
3019 --$_log_backtrace;
3020 };
3021 } else {
3022 LOG llevInfo, "[ABT] $msg\n";
3023 LOG llevInfo, "[ABT] [suppressed]\n";
3024 }
3025}
3026
3027# load additional modules
3028use cf::pod;
3029
2794END { cf::emergency_save } 3030END { cf::emergency_save }
2795 3031
27961 30321
2797 3033

Diff Legend

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