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.240 by root, Mon Apr 16 10:14:25 2007 UTC vs.
Revision 1.270 by root, Sat May 26 15:44:06 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 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, ...
… …
569 $registry = $CB_TYPE[$object_type] ||= []; 627 $registry = $CB_TYPE[$object_type] ||= [];
570 628
571 } elsif ($type eq "subtype") { 629 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 630 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 631 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 633
576 } elsif ($type eq "package") { 634 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 635 my $pkg = shift @arg;
578 636
579 while (my ($name, $id) = each %cb_id) { 637 while (my ($name, $id) = each %cb_id) {
… …
620 if (ref $_[0]) { 678 if (ref $_[0]) {
621 _object_attach @_; 679 _object_attach @_;
622 } else { 680 } else {
623 _attach shift->_attach_registry, @_; 681 _attach shift->_attach_registry, @_;
624 } 682 }
683 _recalc_want;
625}; 684};
626 685
627# all those should be optimised 686# all those should be optimised
628sub cf::attachable::detach { 687sub cf::attachable::detach {
629 my ($obj, $name) = @_; 688 my ($obj, $name) = @_;
… …
632 delete $obj->{_attachment}{$name}; 691 delete $obj->{_attachment}{$name};
633 reattach ($obj); 692 reattach ($obj);
634 } else { 693 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 694 Carp::croak "cannot, currently, detach class attachments";
636 } 695 }
696 _recalc_want;
637}; 697};
638 698
639sub cf::attachable::attached { 699sub cf::attachable::attached {
640 my ($obj, $name) = @_; 700 my ($obj, $name) = @_;
641 701
… …
951Returns the given player object, loading it if necessary (might block). 1011Returns the given player object, loading it if necessary (might block).
952 1012
953=cut 1013=cut
954 1014
955sub playerdir($) { 1015sub playerdir($) {
956 cf::localdir 1016 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1017 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1018}
962 1019
963sub path($) { 1020sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1021 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1084while and may block, so not sync_job-capable, ever. 1141while and may block, so not sync_job-capable, ever.
1085 1142
1086=cut 1143=cut
1087 1144
1088sub list_logins { 1145sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1146 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1147 or return [];
1091 1148
1092 my @logins; 1149 my @logins;
1093 1150
1094 for my $login (@$dirs) { 1151 for my $login (@$dirs) {
… …
1332 1389
1333# the original (read-only) location 1390# the original (read-only) location
1334sub load_path { 1391sub load_path {
1335 my ($self) = @_; 1392 my ($self) = @_;
1336 1393
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1394 "$MAPDIR/$self->{path}.map"
1338} 1395}
1339 1396
1340# the temporary/swap location 1397# the temporary/swap location
1341sub save_path { 1398sub save_path {
1342 my ($self) = @_; 1399 my ($self) = @_;
1343 1400
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1401 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1402 "$TMPDIR/$path.map"
1346} 1403}
1347 1404
1348# the unique path, undef == no special unique path 1405# the unique path, undef == no special unique path
1349sub uniq_path { 1406sub uniq_path {
1350 my ($self) = @_; 1407 my ($self) = @_;
1351 1408
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1409 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1410 "$UNIQUEDIR/$path"
1354} 1411}
1355 1412
1356# and all this just because we cannot iterate over 1413# and all this just because we cannot iterate over
1357# all maps in C++... 1414# all maps in C++...
1358sub change_all_map_light { 1415sub change_all_map_light {
… …
1470 my ($self) = @_; 1527 my ($self) = @_;
1471 1528
1472 local $self->{deny_reset} = 1; # loading can take a long time 1529 local $self->{deny_reset} = 1; # loading can take a long time
1473 1530
1474 my $path = $self->{path}; 1531 my $path = $self->{path};
1532
1533 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1534 my $guard = cf::lock_acquire "map_load:$path";
1476 1535
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1536 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1537
1479 $self->in_memory (cf::MAP_LOADING); 1538 $self->in_memory (cf::MAP_LOADING);
1480 1539
1481 $self->alloc; 1540 $self->alloc;
1482 1541
1483 $self->pre_load; 1542 $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; 1543 Coro::cede;
1510 $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;
1511 $self->difficulty ($self->estimate_difficulty) 1562 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1563 unless $self->difficulty;
1513 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;
1514 $self->activate; 1573 $self->activate;
1515 Coro::cede; 1574 }
1575
1576 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1577 }
1517 1578
1518 $self->post_load; 1579 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1580}
1523 1581
1524sub customise_for { 1582sub customise_for {
1525 my ($self, $ob) = @_; 1583 my ($self, $ob) = @_;
1526 1584
… …
1717instantiated unique items. May block. 1775instantiated unique items. May block.
1718 1776
1719=cut 1777=cut
1720 1778
1721sub unique_maps() { 1779sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1780 my $files = aio_readdir $UNIQUEDIR
1723 or return; 1781 or return;
1724 1782
1725 my @paths; 1783 my @paths;
1726 1784
1727 for (@$files) { 1785 for (@$files) {
… …
1846 $self->deactivate_recursive; 1904 $self->deactivate_recursive;
1847 1905
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1906 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 1907
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 1909 if $self->map && $self->map->{path} ne "{link}";
1852 1910
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1911 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 1912}
1855 1913
1856sub cf::object::player::leave_link { 1914sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 1915 my ($self, $map, $x, $y) = @_;
1916
1917 return unless $self->contr->active;
1858 1918
1859 my $link_pos = delete $self->{_link_pos}; 1919 my $link_pos = delete $self->{_link_pos};
1860 1920
1861 unless ($map) { 1921 unless ($map) {
1862 # restore original map position 1922 # restore original map position
… …
1885 1945
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1946 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 1947 $self->enter_map ($map, $x, $y);
1888} 1948}
1889 1949
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) 1950=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 1951
1952Moves the player to the given map-path and coordinates by first freezing
1953her, loading and preparing them map, calling the provided $check callback
1954that has to return the map if sucecssful, and then unfreezes the player on
1955the new (success) or old (failed) map position.
1956
1924=cut 1957=cut
1958
1959our $GOTOGEN;
1925 1960
1926sub cf::object::player::goto { 1961sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 1962 my ($self, $path, $x, $y, $check) = @_;
1963
1964 # do generation counting so two concurrent goto's will be executed in-order
1965 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 1966
1929 $self->enter_link; 1967 $self->enter_link;
1930 1968
1931 (async { 1969 (async {
1932 my $map = eval { 1970 my $map = eval {
1933 my $map = cf::map::find $path; 1971 my $map = cf::map::find $path;
1972
1973 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 1974 $map = $map->customise_for ($self);
1975 $map = $check->($map) if $check && $map;
1976 } else {
1977 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1978 }
1979
1935 $map 1980 $map
1981 };
1982
1983 if ($@) {
1984 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1985 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 1986 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 1987
1988 if ($gen == $self->{_goto_generation}) {
1989 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 1990 $self->leave_link ($map, $x, $y);
1991 }
1940 })->prio (1); 1992 })->prio (1);
1941} 1993}
1942 1994
1943=item $player_object->enter_exit ($exit_object) 1995=item $player_object->enter_exit ($exit_object)
1944 1996
… …
1983 2035
1984 $rmp->{random_seed} ||= $exit->random_seed; 2036 $rmp->{random_seed} ||= $exit->random_seed;
1985 2037
1986 my $data = cf::to_json $rmp; 2038 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2039 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2040 my $meta = "$RANDOMDIR/$md5.meta";
1989 2041
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2042 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2043 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2044 undef $fh;
1993 aio_rename "$meta~", $meta; 2045 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2314#############################################################################
2263 2315
2264=head2 EXTENSION DATABASE SUPPORT 2316=head2 EXTENSION DATABASE SUPPORT
2265 2317
2266Crossfire maintains a very simple database for extension use. It can 2318Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2319currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2320convert to/from binary).
2269 2321
2270The parameter C<$family> should best start with the name of the extension 2322The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2323using it, it should be unique.
2272 2324
2273=over 4 2325=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2348 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2349 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2350 };
2299 cf::cleanup "db_open(db): $@" if $@; 2351 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2352 };
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 } 2353 }
2316} 2354}
2317 2355
2318sub db_get($$) { 2356sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2357 my $key = "$_[0]/$_[1]";
2320 2358
2321 cf::sync_job { 2359 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2360 BDB::db_get $DB, undef, $key, my $data;
2323 2361
2324 $! ? () 2362 $! ? ()
2325 : Compress::LZF::sthaw $data 2363 : $data
2326 } 2364 }
2327} 2365}
2328 2366
2329sub db_put($$$) { 2367sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2368 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2369 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2332} 2370}
2371
2372=item cf::cache $id => [$paths...], $processversion => $process
2373
2374Generic caching function that returns the value of the resource $id,
2375caching and regenerating as required.
2376
2377This function can block.
2378
2379=cut
2380
2381sub cache {
2382 my ($id, $src, $processversion, $process) = @_;
2383
2384 my $meta =
2385 join "\x00",
2386 $processversion,
2387 map {
2388 aio_stat $_
2389 and Carp::croak "$_: $!";
2390
2391 ($_, (stat _)[7,9])
2392 } @$src;
2393
2394 my $dbmeta = db_get cache => "$id/meta";
2395 if ($dbmeta ne $meta) {
2396 # changed, we may need to process
2397
2398 my @data;
2399 my $md5;
2400
2401 for (0 .. $#$src) {
2402 0 <= aio_load $src->[$_], $data[$_]
2403 or Carp::croak "$src->[$_]: $!";
2404 }
2405
2406 # if processing is expensive, check
2407 # checksum first
2408 if (1) {
2409 $md5 =
2410 join "\x00",
2411 $processversion,
2412 map {
2413 Coro::cede;
2414 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2415 } 0.. $#$src;
2416
2417
2418 my $dbmd5 = db_get cache => "$id/md5";
2419 if ($dbmd5 eq $md5) {
2420 db_put cache => "$id/meta", $meta;
2421
2422 return db_get cache => "$id/data";
2423 }
2424 }
2425
2426 my $t1 = Time::HiRes::time;
2427 my $data = $process->(\@data);
2428 my $t2 = Time::HiRes::time;
2429
2430 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2431
2432 db_put cache => "$id/data", $data;
2433 db_put cache => "$id/md5" , $md5;
2434 db_put cache => "$id/meta", $meta;
2435
2436 return $data;
2437 }
2438
2439 db_get cache => "$id/data"
2440}
2441
2442=item fork_call { }, $args
2443
2444Executes the given code block with the given arguments in a seperate
2445process, returning the results. Everything must be serialisable with
2446Coro::Storable. May, of course, block. Note that the executed sub may
2447never block itself or use any form of Event handling.
2448
2449=cut
2450
2451sub fork_call(&@) {
2452 my ($cb, @args) = @_;
2453
2454# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2455# or die "socketpair: $!";
2456 pipe my $fh1, my $fh2
2457 or die "pipe: $!";
2458
2459 if (my $pid = fork) {
2460 close $fh2;
2461
2462 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2463 $res = Coro::Storable::thaw $res;
2464
2465 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2466
2467 die $$res unless "ARRAY" eq ref $res;
2468
2469 return wantarray ? @$res : $res->[-1];
2470 } else {
2471 reset_signals;
2472 local $SIG{__WARN__};
2473 local $SIG{__DIE__};
2474 eval {
2475 close $fh1;
2476
2477 my @res = eval { $cb->(@args) };
2478 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2479 };
2480
2481 warn $@ if $@;
2482 _exit 0;
2483 }
2484}
2485
2486
2333 2487
2334############################################################################# 2488#############################################################################
2335# the server's init and main functions 2489# the server's init and main functions
2336 2490
2337sub load_facedata { 2491sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2492 my ($path) = @_;
2339 2493
2340 warn "loading facedata from $path\n"; 2494 warn "loading facedata from $path\n";
2341 2495
2342 my $facedata; 2496 my $facedata;
2343 0 < aio_load $path, $facedata 2497 0 < aio_load $path, $facedata
… …
2384 } 2538 }
2385 2539
2386 1 2540 1
2387} 2541}
2388 2542
2543sub reload_regions {
2544 load_resource_file "$MAPDIR/regions"
2545 or die "unable to load regions file\n";
2546}
2547
2548sub reload_facedata {
2549 load_facedata "$DATADIR/facedata"
2550 or die "unable to load facedata\n";
2551}
2552
2553sub reload_archetypes {
2554 load_resource_file "$DATADIR/archetypes"
2555 or die "unable to load archetypes\n";
2556}
2557
2558sub reload_treasures {
2559 load_resource_file "$DATADIR/treasures"
2560 or die "unable to load treasurelists\n";
2561}
2562
2389sub reload_resources { 2563sub reload_resources {
2390 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2564 warn "reloading resource files...\n";
2391 or die "unable to load regions file\n";#d# 2565
2566 reload_regions;
2392 load_facedata 2567 reload_facedata;
2393 or die "unable to load facedata\n";#d# 2568 reload_archetypes;
2569 reload_treasures;
2570
2571 warn "finished reloading resource files\n";
2394} 2572}
2395 2573
2396sub init { 2574sub init {
2397 reload_resources; 2575 reload_resources;
2398} 2576}
2399 2577
2400sub cfg_load { 2578sub cfg_load {
2401 open my $fh, "<:utf8", cf::confdir . "/config" 2579 open my $fh, "<:utf8", "$CONFDIR/config"
2402 or return; 2580 or return;
2403 2581
2404 local $/; 2582 local $/;
2405 *CFG = YAML::Syck::Load <$fh>; 2583 *CFG = YAML::Syck::Load <$fh>;
2406 2584
… …
2491 2669
2492 warn Carp::longmess "post_cleanup backtrace" 2670 warn Carp::longmess "post_cleanup backtrace"
2493 if $make_core; 2671 if $make_core;
2494} 2672}
2495 2673
2496sub reload() { 2674sub do_reload_perl() {
2497 # can/must only be called in main 2675 # can/must only be called in main
2498 if ($Coro::current != $Coro::main) { 2676 if ($Coro::current != $Coro::main) {
2499 warn "can only reload from main coroutine"; 2677 warn "can only reload from main coroutine";
2500 return; 2678 return;
2501 } 2679 }
… …
2576 Symbol::delete_package "safe::$_" 2754 Symbol::delete_package "safe::$_"
2577 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2755 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2578 2756
2579 warn "unloading cf.pm \"a bit\""; 2757 warn "unloading cf.pm \"a bit\"";
2580 delete $INC{"cf.pm"}; 2758 delete $INC{"cf.pm"};
2759 delete $INC{"cf/pod.pm"};
2581 2760
2582 # don't, removes xs symbols, too, 2761 # don't, removes xs symbols, too,
2583 # and global variables created in xs 2762 # and global variables created in xs
2584 #Symbol::delete_package __PACKAGE__; 2763 #Symbol::delete_package __PACKAGE__;
2585 2764
… …
2600 warn "reattaching attachments to maps"; 2779 warn "reattaching attachments to maps";
2601 reattach $_ for values %MAP; 2780 reattach $_ for values %MAP;
2602 warn "reattaching attachments to players"; 2781 warn "reattaching attachments to players";
2603 reattach $_ for values %PLAYER; 2782 reattach $_ for values %PLAYER;
2604 2783
2605 warn "loading reloadable resources";
2606 reload_resources;
2607
2608 warn "leaving sync_job"; 2784 warn "leaving sync_job";
2609 2785
2610 1 2786 1
2611 } or do { 2787 } or do {
2612 warn $@; 2788 warn $@;
… …
2617 warn "reloaded"; 2793 warn "reloaded";
2618}; 2794};
2619 2795
2620our $RELOAD_WATCHER; # used only during reload 2796our $RELOAD_WATCHER; # used only during reload
2621 2797
2798sub reload_perl() {
2799 # doing reload synchronously and two reloads happen back-to-back,
2800 # coro crashes during coro_state_free->destroy here.
2801
2802 $RELOAD_WATCHER ||= Event->timer (
2803 reentrant => 0,
2804 after => 0,
2805 data => WF_AUTOCANCEL,
2806 cb => sub {
2807 do_reload_perl;
2808 undef $RELOAD_WATCHER;
2809 },
2810 );
2811}
2812
2622register_command "reload" => sub { 2813register_command "reload" => sub {
2623 my ($who, $arg) = @_; 2814 my ($who, $arg) = @_;
2624 2815
2625 if ($who->flag (FLAG_WIZ)) { 2816 if ($who->flag (FLAG_WIZ)) {
2626 $who->message ("reloading server."); 2817 $who->message ("reloading server.");
2627 2818 async { reload_perl };
2628 # doing reload synchronously and two reloads happen back-to-back,
2629 # coro crashes during coro_state_free->destroy here.
2630
2631 $RELOAD_WATCHER ||= Event->timer (
2632 reentrant => 0,
2633 after => 0,
2634 data => WF_AUTOCANCEL,
2635 cb => sub {
2636 reload;
2637 undef $RELOAD_WATCHER;
2638 },
2639 );
2640 } 2819 }
2641}; 2820};
2642 2821
2643unshift @INC, $LIBDIR; 2822unshift @INC, $LIBDIR;
2644 2823
… …
2647our @WAIT_FOR_TICK; 2826our @WAIT_FOR_TICK;
2648our @WAIT_FOR_TICK_BEGIN; 2827our @WAIT_FOR_TICK_BEGIN;
2649 2828
2650sub wait_for_tick { 2829sub wait_for_tick {
2651 return unless $TICK_WATCHER->is_active; 2830 return unless $TICK_WATCHER->is_active;
2831 return if $Coro::current == $Coro::main;
2832
2652 my $signal = new Coro::Signal; 2833 my $signal = new Coro::Signal;
2653 push @WAIT_FOR_TICK, $signal; 2834 push @WAIT_FOR_TICK, $signal;
2654 $signal->wait; 2835 $signal->wait;
2655} 2836}
2656 2837
2657sub wait_for_tick_begin { 2838sub wait_for_tick_begin {
2658 return unless $TICK_WATCHER->is_active; 2839 return unless $TICK_WATCHER->is_active;
2840 return if $Coro::current == $Coro::main;
2841
2659 my $signal = new Coro::Signal; 2842 my $signal = new Coro::Signal;
2660 push @WAIT_FOR_TICK_BEGIN, $signal; 2843 push @WAIT_FOR_TICK_BEGIN, $signal;
2661 $signal->wait; 2844 $signal->wait;
2662} 2845}
2663 2846
2847 my $min = 1e6;#d#
2848 my $avg = 10;
2664$TICK_WATCHER = Event->timer ( 2849$TICK_WATCHER = Event->timer (
2665 reentrant => 0, 2850 reentrant => 0,
2666 parked => 1, 2851 parked => 1,
2667 prio => 0, 2852 prio => 0,
2668 at => $NEXT_TICK || $TICK, 2853 at => $NEXT_TICK || $TICK,
… …
2672 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2857 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2673 unless ++$bug_warning > 10; 2858 unless ++$bug_warning > 10;
2674 return; 2859 return;
2675 } 2860 }
2676 2861
2677 $NOW = Event::time; 2862 $NOW = $tick_start = Event::time;
2678 2863
2679 cf::server_tick; # one server iteration 2864 cf::server_tick; # one server iteration
2865
2866 0 && sync_job {#d#
2867 for(1..10) {
2868 my $t = Event::time;
2869 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2870 or die;
2871
2872 $map->width (50);
2873 $map->height (50);
2874 $map->alloc;
2875 $map->_load_objects ("/tmp/x.map", 1);
2876 my $t = Event::time - $t;
2877
2878 #next unless $t < 0.0013;#d#
2879 if ($t < $min) {
2880 $min = $t;
2881 }
2882 $avg = $avg * 0.99 + $t * 0.01;
2883 }
2884 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2885 exit 0;
2886 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2887 };
2888
2680 $RUNTIME += $TICK; 2889 $RUNTIME += $TICK;
2681 $NEXT_TICK += $TICK; 2890 $NEXT_TICK += $TICK;
2682 2891
2683 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2892 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2684 $NEXT_RUNTIME_WRITE = $NOW + 10; 2893 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2686 write_runtime 2895 write_runtime
2687 or warn "ERROR: unable to write runtime file: $!"; 2896 or warn "ERROR: unable to write runtime file: $!";
2688 }; 2897 };
2689 } 2898 }
2690 2899
2900# my $AFTER = Event::time;
2901# warn $AFTER - $NOW;#d#
2902
2691 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2903 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2692 $sig->send; 2904 $sig->send;
2693 } 2905 }
2694 while (my $sig = shift @WAIT_FOR_TICK) { 2906 while (my $sig = shift @WAIT_FOR_TICK) {
2695 $sig->send; 2907 $sig->send;
2696 } 2908 }
2697 2909
2698# my $AFTER = Event::time; 2910 $NOW = Event::time;
2699# warn $AFTER - $NOW;#d#
2700 2911
2701 # if we are delayed by four ticks or more, skip them all 2912 # if we are delayed by four ticks or more, skip them all
2702 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2913 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2703 2914
2704 $TICK_WATCHER->at ($NEXT_TICK); 2915 $TICK_WATCHER->at ($NEXT_TICK);
2705 $TICK_WATCHER->start; 2916 $TICK_WATCHER->start;
2917
2918 $LOAD = ($NOW - $tick_start) / $TICK;
2919 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2920
2921 _post_tick;
2922
2923
2706 }, 2924 },
2707); 2925);
2708 2926
2709{ 2927{
2710 BDB::max_poll_time $TICK * 0.1; 2928 BDB::max_poll_time $TICK * 0.1;
… …
2738 2956
2739 cf::sync_job { 2957 cf::sync_job {
2740 eval { 2958 eval {
2741 BDB::db_env_open 2959 BDB::db_env_open
2742 $DB_ENV, 2960 $DB_ENV,
2743 $BDB_ENV_DIR, 2961 $BDBDIR,
2744 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2962 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2745 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2963 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2746 0666; 2964 0666;
2747 2965
2748 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2966 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2749 2967
2750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2968 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2751 $DB_ENV->set_lk_detect; 2969 $DB_ENV->set_lk_detect;
2752 }; 2970 };
2753 2971
… …
2769 prio => 6, 2987 prio => 6,
2770 cb => \&IO::AIO::poll_cb, 2988 cb => \&IO::AIO::poll_cb,
2771 ); 2989 );
2772} 2990}
2773 2991
2992my $_log_backtrace;
2993
2994sub _log_backtrace {
2995 my ($msg, @addr) = @_;
2996
2997 $msg =~ s/\n//;
2998
2999 # limit the # of concurrent backtraces
3000 if ($_log_backtrace < 2) {
3001 ++$_log_backtrace;
3002 async {
3003 my @bt = fork_call {
3004 @addr = map { sprintf "%x", $_ } @addr;
3005 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3006 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3007 or die "addr2line: $!";
3008
3009 my @funcs;
3010 my @res = <$fh>;
3011 chomp for @res;
3012 while (@res) {
3013 my ($func, $line) = splice @res, 0, 2, ();
3014 push @funcs, "[$func] $line";
3015 }
3016
3017 @funcs
3018 };
3019
3020 LOG llevInfo, "[ABT] $msg\n";
3021 LOG llevInfo, "[ABT] $_\n" for @bt;
3022 --$_log_backtrace;
3023 };
3024 } else {
3025 LOG llevInfo, "[ABT] $msg\n";
3026 LOG llevInfo, "[ABT] [suppressed]\n";
3027 }
3028}
3029
3030# load additional modules
3031use cf::pod;
3032
2774END { cf::emergency_save } 3033END { cf::emergency_save }
2775 3034
27761 30351
2777 3036

Diff Legend

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