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.244 by root, Mon Apr 16 13:28:00 2007 UTC vs.
Revision 1.274 by root, Tue Jun 5 13:05:02 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.61 (); 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';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
165@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
166 194
167# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
168# within the Safe compartment. 196# within the Safe compartment.
169for my $pkg (qw( 197for my $pkg (qw(
170 cf::global cf::attachable 198 cf::global cf::attachable
… …
230returned. 258returned.
231 259
232Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
233uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
234 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
235=cut 267=cut
236 268
237our %LOCK; 269our %LOCK;
238 270
239sub lock_wait($) { 271sub lock_wait($) {
… …
256 288
257 Coro::guard { 289 Coro::guard {
258 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
260 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
261} 299}
262 300
263sub freeze_mainloop { 301sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
265 303
… …
295 333
296sub sync_job(&) { 334sub sync_job(&) {
297 my ($job) = @_; 335 my ($job) = @_;
298 336
299 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
300 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
302 342
303 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
315 355
316 while ($busy) { 356 while ($busy) {
317 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
318 } 358 }
319 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
320 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
321 } else { 368 } else {
322 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
323 370
324 $job->() 371 $job->()
… …
344 391
345 $coro 392 $coro
346} 393}
347 394
348sub write_runtime { 395sub write_runtime {
396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
349 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
350
351 my $runtime = cf::localdir . "/runtime";
352 404
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 406 or return;
355 407
356 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
362 414
363 # always fsync - this file is important 415 # always fsync - this file is important
364 aio_fsync $fh 416 aio_fsync $fh
365 and return; 417 and return;
366 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
367 close $fh 422 close $fh
368 or return; 423 or return;
369 424
370 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
371 and return; 426 and return;
427
428 warn "runtime file written.\n";
372 429
373 1 430 1
374} 431}
375 432
376=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
569 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
570 627
571 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 632
576 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 634 my $pkg = shift @arg;
578 635
579 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
620 if (ref $_[0]) { 677 if (ref $_[0]) {
621 _object_attach @_; 678 _object_attach @_;
622 } else { 679 } else {
623 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
624 } 681 }
682 _recalc_want;
625}; 683};
626 684
627# all those should be optimised 685# all those should be optimised
628sub cf::attachable::detach { 686sub cf::attachable::detach {
629 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
632 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
633 reattach ($obj); 691 reattach ($obj);
634 } else { 692 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
636 } 694 }
695 _recalc_want;
637}; 696};
638 697
639sub cf::attachable::attached { 698sub cf::attachable::attached {
640 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
641 700
… …
814 or return; 873 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
816 } 875 }
817 876
818 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 879 return ($data, $av);
821} 880}
822 881
823############################################################################# 882#############################################################################
824# command handling &c 883# command handling &c
… …
951Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
952 1011
953=cut 1012=cut
954 1013
955sub playerdir($) { 1014sub playerdir($) {
956 cf::localdir 1015 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1017}
962 1018
963sub path($) { 1019sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1084while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1085 1141
1086=cut 1142=cut
1087 1143
1088sub list_logins { 1144sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1146 or return [];
1091 1147
1092 my @logins; 1148 my @logins;
1093 1149
1094 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
… …
1332 1388
1333# the original (read-only) location 1389# the original (read-only) location
1334sub load_path { 1390sub load_path {
1335 my ($self) = @_; 1391 my ($self) = @_;
1336 1392
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1393 "$MAPDIR/$self->{path}.map"
1338} 1394}
1339 1395
1340# the temporary/swap location 1396# the temporary/swap location
1341sub save_path { 1397sub save_path {
1342 my ($self) = @_; 1398 my ($self) = @_;
1343 1399
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1400 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1401 "$TMPDIR/$path.map"
1346} 1402}
1347 1403
1348# the unique path, undef == no special unique path 1404# the unique path, undef == no special unique path
1349sub uniq_path { 1405sub uniq_path {
1350 my ($self) = @_; 1406 my ($self) = @_;
1351 1407
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1408 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1409 "$UNIQUEDIR/$path"
1354} 1410}
1355 1411
1356# and all this just because we cannot iterate over 1412# and all this just because we cannot iterate over
1357# all maps in C++... 1413# all maps in C++...
1358sub change_all_map_light { 1414sub change_all_map_light {
… …
1470 my ($self) = @_; 1526 my ($self) = @_;
1471 1527
1472 local $self->{deny_reset} = 1; # loading can take a long time 1528 local $self->{deny_reset} = 1; # loading can take a long time
1473 1529
1474 my $path = $self->{path}; 1530 my $path = $self->{path};
1531
1532 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1533 my $guard = cf::lock_acquire "map_load:$path";
1476 1534
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1535 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1536
1479 $self->in_memory (cf::MAP_LOADING); 1537 $self->in_memory (cf::MAP_LOADING);
1480 1538
1481 $self->alloc; 1539 $self->alloc;
1482 1540
1483 $self->pre_load; 1541 $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; 1542 Coro::cede;
1510 $self->set_darkness_map; 1543
1544 $self->_load_objects ($self->{load_path}, 1)
1545 or return;
1546
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1548 if delete $self->{load_original};
1549
1550 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) {
1553 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0);
1555 }
1556 }
1557
1558 Coro::cede;
1559 # now do the right thing for maps
1560 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1561 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1562 unless $self->difficulty;
1513 Coro::cede; 1563 Coro::cede;
1564
1565 unless ($self->{deny_activate}) {
1566 $self->decay_objects;
1567 $self->fix_auto_apply;
1568 $self->update_buttons;
1569 Coro::cede;
1570 $self->set_darkness_map;
1571 Coro::cede;
1514 $self->activate; 1572 $self->activate;
1515 Coro::cede; 1573 }
1574
1575 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1576 }
1517 1577
1518 $self->post_load; 1578 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1579}
1523 1580
1524sub customise_for { 1581sub customise_for {
1525 my ($self, $ob) = @_; 1582 my ($self, $ob) = @_;
1526 1583
… …
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1724 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 1725
1669 return if $self->players; 1726 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d# 1727 return if $self->isa ("ext::map_per_player");#d#
1671 1728
1672 warn "resetting map ", $self->path;#d# 1729 warn "resetting map ", $self->path;
1673 1730
1674 $self->in_memory (cf::MAP_SWAPPED); 1731 $self->in_memory (cf::MAP_SWAPPED);
1675 1732
1676 # need to save uniques path 1733 # need to save uniques path
1677 unless ($self->{deny_save}) { 1734 unless ($self->{deny_save}) {
… …
1717instantiated unique items. May block. 1774instantiated unique items. May block.
1718 1775
1719=cut 1776=cut
1720 1777
1721sub unique_maps() { 1778sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1779 my $files = aio_readdir $UNIQUEDIR
1723 or return; 1780 or return;
1724 1781
1725 my @paths; 1782 my @paths;
1726 1783
1727 for (@$files) { 1784 for (@$files) {
… …
1846 $self->deactivate_recursive; 1903 $self->deactivate_recursive;
1847 1904
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1905 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 1906
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1907 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 1908 if $self->map && $self->map->{path} ne "{link}";
1852 1909
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1910 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 1911}
1855 1912
1856sub cf::object::player::leave_link { 1913sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 1914 my ($self, $map, $x, $y) = @_;
1915
1916 return unless $self->contr->active;
1858 1917
1859 my $link_pos = delete $self->{_link_pos}; 1918 my $link_pos = delete $self->{_link_pos};
1860 1919
1861 unless ($map) { 1920 unless ($map) {
1862 # restore original map position 1921 # restore original map position
… …
1885 1944
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 1946 $self->enter_map ($map, $x, $y);
1888} 1947}
1889 1948
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) 1949=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 1950
1951Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position.
1955
1924=cut 1956=cut
1957
1958our $GOTOGEN;
1925 1959
1926sub cf::object::player::goto { 1960sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 1961 my ($self, $path, $x, $y, $check) = @_;
1962
1963 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 1965
1929 $self->enter_link; 1966 $self->enter_link;
1930 1967
1931 (async { 1968 (async {
1932 my $map = eval { 1969 my $map = eval {
1933 my $map = cf::map::find $path; 1970 my $map = cf::map::find $path;
1971
1972 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 1973 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map;
1975 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1977 }
1978
1935 $map 1979 $map
1980 };
1981
1982 if ($@) {
1983 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1984 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 1985 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 1986
1987 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 1989 $self->leave_link ($map, $x, $y);
1990 }
1940 })->prio (1); 1991 })->prio (1);
1941} 1992}
1942 1993
1943=item $player_object->enter_exit ($exit_object) 1994=item $player_object->enter_exit ($exit_object)
1944 1995
… …
1983 2034
1984 $rmp->{random_seed} ||= $exit->random_seed; 2035 $rmp->{random_seed} ||= $exit->random_seed;
1985 2036
1986 my $data = cf::to_json $rmp; 2037 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2038 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2039 my $meta = "$RANDOMDIR/$md5.meta";
1989 2040
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2041 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2042 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2043 undef $fh;
1993 aio_rename "$meta~", $meta; 2044 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2313#############################################################################
2263 2314
2264=head2 EXTENSION DATABASE SUPPORT 2315=head2 EXTENSION DATABASE SUPPORT
2265 2316
2266Crossfire maintains a very simple database for extension use. It can 2317Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2318currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2319convert to/from binary).
2269 2320
2270The parameter C<$family> should best start with the name of the extension 2321The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2322using it, it should be unique.
2272 2323
2273=over 4 2324=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2347 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2348 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2349 };
2299 cf::cleanup "db_open(db): $@" if $@; 2350 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2351 };
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 } 2352 }
2316} 2353}
2317 2354
2318sub db_get($$) { 2355sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2356 my $key = "$_[0]/$_[1]";
2320 2357
2321 cf::sync_job { 2358 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2359 BDB::db_get $DB, undef, $key, my $data;
2323 2360
2324 $! ? () 2361 $! ? ()
2325 : Compress::LZF::sthaw $data 2362 : $data
2326 } 2363 }
2327} 2364}
2328 2365
2329sub db_put($$$) { 2366sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2367 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2368 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2369}
2370
2371=item cf::cache $id => [$paths...], $processversion => $process
2372
2373Generic caching function that returns the value of the resource $id,
2374caching and regenerating as required.
2375
2376This function can block.
2377
2378=cut
2379
2380sub cache {
2381 my ($id, $src, $processversion, $process) = @_;
2382
2383 my $meta =
2384 join "\x00",
2385 $processversion,
2386 map {
2387 aio_stat $_
2388 and Carp::croak "$_: $!";
2389
2390 ($_, (stat _)[7,9])
2391 } @$src;
2392
2393 my $dbmeta = db_get cache => "$id/meta";
2394 if ($dbmeta ne $meta) {
2395 # changed, we may need to process
2396
2397 my @data;
2398 my $md5;
2399
2400 for (0 .. $#$src) {
2401 0 <= aio_load $src->[$_], $data[$_]
2402 or Carp::croak "$src->[$_]: $!";
2403 }
2404
2405 # if processing is expensive, check
2406 # checksum first
2407 if (1) {
2408 $md5 =
2409 join "\x00",
2410 $processversion,
2411 map {
2412 Coro::cede;
2413 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2414 } 0.. $#$src;
2415
2416
2417 my $dbmd5 = db_get cache => "$id/md5";
2418 if ($dbmd5 eq $md5) {
2419 db_put cache => "$id/meta", $meta;
2420
2421 return db_get cache => "$id/data";
2422 }
2423 }
2424
2425 my $t1 = Time::HiRes::time;
2426 my $data = $process->(\@data);
2427 my $t2 = Time::HiRes::time;
2428
2429 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2430
2431 db_put cache => "$id/data", $data;
2432 db_put cache => "$id/md5" , $md5;
2433 db_put cache => "$id/meta", $meta;
2434
2435 return $data;
2436 }
2437
2438 db_get cache => "$id/data"
2439}
2440
2441=item fork_call { }, $args
2442
2443Executes the given code block with the given arguments in a seperate
2444process, returning the results. Everything must be serialisable with
2445Coro::Storable. May, of course, block. Note that the executed sub may
2446never block itself or use any form of Event handling.
2447
2448=cut
2449
2450sub fork_call(&@) {
2451 my ($cb, @args) = @_;
2452
2453# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2454# or die "socketpair: $!";
2455 pipe my $fh1, my $fh2
2456 or die "pipe: $!";
2457
2458 if (my $pid = fork) {
2459 close $fh2;
2460
2461 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2462 $res = Coro::Storable::thaw $res;
2463
2464 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2465
2466 die $$res unless "ARRAY" eq ref $res;
2467
2468 return wantarray ? @$res : $res->[-1];
2469 } else {
2470 reset_signals;
2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2473 eval {
2474 close $fh1;
2475
2476 my @res = eval { $cb->(@args) };
2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2478 };
2479
2480 warn $@ if $@;
2481 _exit 0;
2482 }
2332} 2483}
2333 2484
2334############################################################################# 2485#############################################################################
2335# the server's init and main functions 2486# the server's init and main functions
2336 2487
2337sub load_facedata { 2488sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2489 my ($path) = @_;
2339 2490
2340 warn "loading facedata from $path\n"; 2491 warn "loading facedata from $path\n";
2341 2492
2342 my $facedata; 2493 my $facedata;
2343 0 < aio_load $path, $facedata 2494 0 < aio_load $path, $facedata
… …
2384 } 2535 }
2385 2536
2386 1 2537 1
2387} 2538}
2388 2539
2540sub reload_regions {
2541 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n";
2543}
2544
2545sub reload_facedata {
2546 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n";
2548}
2549
2389sub load_archetypes { 2550sub reload_archetypes {
2390 load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable 2551 load_resource_file "$DATADIR/archetypes"
2391 load_archetype_file sprintf "%s/archetypes", cf::datadir 2552 or die "unable to load archetypes\n";
2392} 2553}
2393 2554
2394sub load_treasures { 2555sub reload_treasures {
2395 load_treasure_file sprintf "%s/treasures", cf::datadir 2556 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n";
2396} 2558}
2397 2559
2398sub reload_resources { 2560sub reload_resources {
2399 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2561 warn "reloading resource files...\n";
2400 or die "unable to load regions file\n"; 2562
2563 reload_regions;
2401 load_facedata 2564 reload_facedata;
2402 or die "unable to load facedata\n"; 2565 #reload_archetypes;#d#
2403 load_archetypes 2566 reload_archetypes;
2404 or die "unable to load archetypes\n";
2405 load_treasures 2567 reload_treasures;
2406 or die "unable to load treasurelists\n"; 2568
2569 warn "finished reloading resource files\n";
2407} 2570}
2408 2571
2409sub init { 2572sub init {
2410 reload_resources; 2573 reload_resources;
2411} 2574}
2412 2575
2413sub cfg_load { 2576sub cfg_load {
2414 open my $fh, "<:utf8", cf::confdir . "/config" 2577 open my $fh, "<:utf8", "$CONFDIR/config"
2415 or return; 2578 or return;
2416 2579
2417 local $/; 2580 local $/;
2418 *CFG = YAML::Syck::Load <$fh>; 2581 *CFG = YAML::Syck::Load <$fh>;
2419 2582
… …
2504 2667
2505 warn Carp::longmess "post_cleanup backtrace" 2668 warn Carp::longmess "post_cleanup backtrace"
2506 if $make_core; 2669 if $make_core;
2507} 2670}
2508 2671
2509sub reload() { 2672sub do_reload_perl() {
2510 # can/must only be called in main 2673 # can/must only be called in main
2511 if ($Coro::current != $Coro::main) { 2674 if ($Coro::current != $Coro::main) {
2512 warn "can only reload from main coroutine"; 2675 warn "can only reload from main coroutine";
2513 return; 2676 return;
2514 } 2677 }
… …
2589 Symbol::delete_package "safe::$_" 2752 Symbol::delete_package "safe::$_"
2590 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2753 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2591 2754
2592 warn "unloading cf.pm \"a bit\""; 2755 warn "unloading cf.pm \"a bit\"";
2593 delete $INC{"cf.pm"}; 2756 delete $INC{"cf.pm"};
2757 delete $INC{"cf/pod.pm"};
2594 2758
2595 # don't, removes xs symbols, too, 2759 # don't, removes xs symbols, too,
2596 # and global variables created in xs 2760 # and global variables created in xs
2597 #Symbol::delete_package __PACKAGE__; 2761 #Symbol::delete_package __PACKAGE__;
2598 2762
… …
2613 warn "reattaching attachments to maps"; 2777 warn "reattaching attachments to maps";
2614 reattach $_ for values %MAP; 2778 reattach $_ for values %MAP;
2615 warn "reattaching attachments to players"; 2779 warn "reattaching attachments to players";
2616 reattach $_ for values %PLAYER; 2780 reattach $_ for values %PLAYER;
2617 2781
2618 warn "loading reloadable resources";
2619 reload_resources;
2620
2621 warn "leaving sync_job"; 2782 warn "leaving sync_job";
2622 2783
2623 1 2784 1
2624 } or do { 2785 } or do {
2625 warn $@; 2786 warn $@;
… …
2630 warn "reloaded"; 2791 warn "reloaded";
2631}; 2792};
2632 2793
2633our $RELOAD_WATCHER; # used only during reload 2794our $RELOAD_WATCHER; # used only during reload
2634 2795
2796sub reload_perl() {
2797 # doing reload synchronously and two reloads happen back-to-back,
2798 # coro crashes during coro_state_free->destroy here.
2799
2800 $RELOAD_WATCHER ||= Event->timer (
2801 reentrant => 0,
2802 after => 0,
2803 data => WF_AUTOCANCEL,
2804 cb => sub {
2805 do_reload_perl;
2806 undef $RELOAD_WATCHER;
2807 },
2808 );
2809}
2810
2635register_command "reload" => sub { 2811register_command "reload" => sub {
2636 my ($who, $arg) = @_; 2812 my ($who, $arg) = @_;
2637 2813
2638 if ($who->flag (FLAG_WIZ)) { 2814 if ($who->flag (FLAG_WIZ)) {
2639 $who->message ("reloading server."); 2815 $who->message ("reloading server.");
2640 2816 async { reload_perl };
2641 # doing reload synchronously and two reloads happen back-to-back,
2642 # coro crashes during coro_state_free->destroy here.
2643
2644 $RELOAD_WATCHER ||= Event->timer (
2645 reentrant => 0,
2646 after => 0,
2647 data => WF_AUTOCANCEL,
2648 cb => sub {
2649 reload;
2650 undef $RELOAD_WATCHER;
2651 },
2652 );
2653 } 2817 }
2654}; 2818};
2655 2819
2656unshift @INC, $LIBDIR; 2820unshift @INC, $LIBDIR;
2657 2821
… …
2676 my $signal = new Coro::Signal; 2840 my $signal = new Coro::Signal;
2677 push @WAIT_FOR_TICK_BEGIN, $signal; 2841 push @WAIT_FOR_TICK_BEGIN, $signal;
2678 $signal->wait; 2842 $signal->wait;
2679} 2843}
2680 2844
2845 my $min = 1e6;#d#
2846 my $avg = 10;
2681$TICK_WATCHER = Event->timer ( 2847$TICK_WATCHER = Event->timer (
2682 reentrant => 0, 2848 reentrant => 0,
2683 parked => 1, 2849 parked => 1,
2684 prio => 0, 2850 prio => 0,
2685 at => $NEXT_TICK || $TICK, 2851 at => $NEXT_TICK || $TICK,
… …
2689 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2855 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2690 unless ++$bug_warning > 10; 2856 unless ++$bug_warning > 10;
2691 return; 2857 return;
2692 } 2858 }
2693 2859
2694 $NOW = Event::time; 2860 $NOW = $tick_start = Event::time;
2695 2861
2696 cf::server_tick; # one server iteration 2862 cf::server_tick; # one server iteration
2863
2864 0 && sync_job {#d#
2865 for(1..10) {
2866 my $t = Event::time;
2867 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2868 or die;
2869
2870 $map->width (50);
2871 $map->height (50);
2872 $map->alloc;
2873 $map->_load_objects ("/tmp/x.map", 1);
2874 my $t = Event::time - $t;
2875
2876 #next unless $t < 0.0013;#d#
2877 if ($t < $min) {
2878 $min = $t;
2879 }
2880 $avg = $avg * 0.99 + $t * 0.01;
2881 }
2882 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2883 exit 0;
2884 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2885 };
2886
2697 $RUNTIME += $TICK; 2887 $RUNTIME += $TICK;
2698 $NEXT_TICK += $TICK; 2888 $NEXT_TICK += $TICK;
2699 2889
2700 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2890 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2701 $NEXT_RUNTIME_WRITE = $NOW + 10; 2891 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2703 write_runtime 2893 write_runtime
2704 or warn "ERROR: unable to write runtime file: $!"; 2894 or warn "ERROR: unable to write runtime file: $!";
2705 }; 2895 };
2706 } 2896 }
2707 2897
2898# my $AFTER = Event::time;
2899# warn $AFTER - $NOW;#d#
2900
2708 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2901 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2709 $sig->send; 2902 $sig->send;
2710 } 2903 }
2711 while (my $sig = shift @WAIT_FOR_TICK) { 2904 while (my $sig = shift @WAIT_FOR_TICK) {
2712 $sig->send; 2905 $sig->send;
2713 } 2906 }
2714 2907
2715# my $AFTER = Event::time; 2908 $NOW = Event::time;
2716# warn $AFTER - $NOW;#d#
2717 2909
2718 # if we are delayed by four ticks or more, skip them all 2910 # if we are delayed by four ticks or more, skip them all
2719 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2911 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2720 2912
2721 $TICK_WATCHER->at ($NEXT_TICK); 2913 $TICK_WATCHER->at ($NEXT_TICK);
2722 $TICK_WATCHER->start; 2914 $TICK_WATCHER->start;
2915
2916 $LOAD = ($NOW - $tick_start) / $TICK;
2917 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2918
2919 _post_tick;
2920
2921
2723 }, 2922 },
2724); 2923);
2725 2924
2726{ 2925{
2727 BDB::max_poll_time $TICK * 0.1; 2926 BDB::max_poll_time $TICK * 0.1;
… …
2755 2954
2756 cf::sync_job { 2955 cf::sync_job {
2757 eval { 2956 eval {
2758 BDB::db_env_open 2957 BDB::db_env_open
2759 $DB_ENV, 2958 $DB_ENV,
2760 $BDB_ENV_DIR, 2959 $BDBDIR,
2761 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2960 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2762 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2961 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2763 0666; 2962 0666;
2764 2963
2765 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2964 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2766 2965
2767 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2966 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2768 $DB_ENV->set_lk_detect; 2967 $DB_ENV->set_lk_detect;
2769 }; 2968 };
2770 2969
… …
2786 prio => 6, 2985 prio => 6,
2787 cb => \&IO::AIO::poll_cb, 2986 cb => \&IO::AIO::poll_cb,
2788 ); 2987 );
2789} 2988}
2790 2989
2990my $_log_backtrace;
2991
2992sub _log_backtrace {
2993 my ($msg, @addr) = @_;
2994
2995 $msg =~ s/\n//;
2996
2997 # limit the # of concurrent backtraces
2998 if ($_log_backtrace < 2) {
2999 ++$_log_backtrace;
3000 async {
3001 my @bt = fork_call {
3002 @addr = map { sprintf "%x", $_ } @addr;
3003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3005 or die "addr2line: $!";
3006
3007 my @funcs;
3008 my @res = <$fh>;
3009 chomp for @res;
3010 while (@res) {
3011 my ($func, $line) = splice @res, 0, 2, ();
3012 push @funcs, "[$func] $line";
3013 }
3014
3015 @funcs
3016 };
3017
3018 LOG llevInfo, "[ABT] $msg\n";
3019 LOG llevInfo, "[ABT] $_\n" for @bt;
3020 --$_log_backtrace;
3021 };
3022 } else {
3023 LOG llevInfo, "[ABT] $msg\n";
3024 LOG llevInfo, "[ABT] [suppressed]\n";
3025 }
3026}
3027
3028# load additional modules
3029use cf::pod;
3030
2791END { cf::emergency_save } 3031END { cf::emergency_save }
2792 3032
27931 30331
2794 3034

Diff Legend

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