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.120 by root, Tue Jan 2 11:08:36 2007 UTC vs.
Revision 1.127 by root, Wed Jan 3 00:05:26 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
245 # wake up all waiters, to be on the safe side 245 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 246 $_->ready for @{ delete $LOCK{$key} };
247 } 247 }
248} 248}
249 249
250=item cf::async { BLOCK }
251
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
253error instead of exiting the server in case of a problem.
254
255=cut
256
257sub async(&) {
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265
250=item cf::sync_job { BLOCK } 266=item cf::sync_job { BLOCK }
251 267
252The design of crossfire+ requires that the main coro ($Coro::main) is 268The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 269always able to handle events or runnable, as crossfire+ is only partly
254reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 270reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
301=cut 317=cut
302 318
303sub coro(&) { 319sub coro(&) {
304 my $cb = shift; 320 my $cb = shift;
305 321
306 my $coro; $coro = async { 322 my $coro = &cf::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 323
313 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
315 }); 326 });
316 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
… …
1153# and all this just because we cannot iterate over 1164# and all this just because we cannot iterate over
1154# all maps in C++... 1165# all maps in C++...
1155sub change_all_map_light { 1166sub change_all_map_light {
1156 my ($change) = @_; 1167 my ($change) = @_;
1157 1168
1158 $_->change_map_light ($change) for values %cf::MAP; 1169 $_->change_map_light ($change)
1170 for grep $_->outdoor, values %cf::MAP;
1159} 1171}
1160 1172
1161sub try_load_header($) { 1173sub try_load_header($) {
1162 my ($path) = @_; 1174 my ($path) = @_;
1163 1175
… …
1174 $map->{load_path} = $path; 1186 $map->{load_path} = $path;
1175 1187
1176 $map 1188 $map
1177} 1189}
1178 1190
1191sub find_map;
1179sub find_map { 1192sub find_map {
1180 my ($path, $origin) = @_; 1193 my ($path, $origin) = @_;
1181 1194
1182 #warn "find_map<$path,$origin>\n";#d# 1195 #warn "find_map<$path,$origin>\n";#d#
1183 1196
… …
1210 $map->instantiate; 1223 $map->instantiate;
1211 1224
1212 # per-player maps become, after loading, normal maps 1225 # per-player maps become, after loading, normal maps
1213 $map->per_player (0) if $path->{user_rel}; 1226 $map->per_player (0) if $path->{user_rel};
1214 } 1227 }
1215 #Coro::Timer::sleep 1;#d#
1216 1228
1217 $map->path ($key); 1229 $map->path ($key);
1218 $map->{path} = $path; 1230 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1231 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1232 $map->last_access ($cf::RUNTIME);
1221 1233
1222 if ($map->should_reset) { 1234 if ($map->should_reset) {
1223 $map->reset; 1235 $map->reset;
1236 undef $guard;
1224 $map = find_map $path; 1237 $map = find_map $path
1238 or return;
1225 } 1239 }
1226 1240
1227 $cf::MAP{$key} = $map 1241 $cf::MAP{$key} = $map
1228 } 1242 }
1229} 1243}
… …
1535 1549
1536 # try to abort aborted map switching on player login :) 1550 # try to abort aborted map switching on player login :)
1537 # should happen only on crashes 1551 # should happen only on crashes
1538 if ($pl->ob->{_link_pos}) { 1552 if ($pl->ob->{_link_pos}) {
1539 $pl->ob->enter_link; 1553 $pl->ob->enter_link;
1540 Coro::async { 1554 cf::async {
1541 # we need this sleep as the login has a concurrent enter_exit running 1555 # we need this sleep as the login has a concurrent enter_exit running
1542 # and this sleep increases chances of the player not ending up in scorn 1556 # and this sleep increases chances of the player not ending up in scorn
1543 Coro::Timer::sleep 1; 1557 Coro::Timer::sleep 1;
1544 $pl->ob->leave_link; 1558 $pl->ob->leave_link;
1545 }; 1559 };
… …
1554sub cf::object::player::goto_map { 1568sub cf::object::player::goto_map {
1555 my ($self, $path, $x, $y) = @_; 1569 my ($self, $path, $x, $y) = @_;
1556 1570
1557 $self->enter_link; 1571 $self->enter_link;
1558 1572
1559 (Coro::async { 1573 (cf::async {
1560 $path = new cf::path $path; 1574 $path = new cf::path $path;
1561 1575
1562 my $map = cf::map::find_map $path->as_string; 1576 my $map = cf::map::find_map $path->as_string;
1563 $map = $map->customise_for ($self) if $map; 1577 $map = $map->customise_for ($self) if $map;
1564 1578
… …
1626 1640
1627 return unless $self->type == cf::PLAYER; 1641 return unless $self->type == cf::PLAYER;
1628 1642
1629 $self->enter_link; 1643 $self->enter_link;
1630 1644
1631 (Coro::async { 1645 (cf::async {
1632 unless (eval { 1646 unless (eval {
1633
1634 prepare_random_map $exit 1647 prepare_random_map $exit
1635 if $exit->slaying eq "/!"; 1648 if $exit->slaying eq "/!";
1636 1649
1637 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1638 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1727=cut 1740=cut
1728 1741
1729sub cf::client::coro { 1742sub cf::client::coro {
1730 my ($self, $cb) = @_; 1743 my ($self, $cb) = @_;
1731 1744
1732 my $coro; $coro = async { 1745 my $coro = &cf::async ($cb);
1733 eval {
1734 $cb->();
1735 };
1736 warn $@ if $@;
1737 };
1738 1746
1739 $coro->on_destroy (sub { 1747 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1748 delete $self->{_coro}{$coro+0};
1741 }); 1749 });
1742 1750
… …
1914 1922
1915{ 1923{
1916 my $path = cf::localdir . "/database.pst"; 1924 my $path = cf::localdir . "/database.pst";
1917 1925
1918 sub db_load() { 1926 sub db_load() {
1919 warn "loading database $path\n";#d# remove later
1920 $DB = stat $path ? Storable::retrieve $path : { }; 1927 $DB = stat $path ? Storable::retrieve $path : { };
1921 } 1928 }
1922 1929
1923 my $pid; 1930 my $pid;
1924 1931
1925 sub db_save() { 1932 sub db_save() {
1926 warn "saving database $path\n";#d# remove later
1927 waitpid $pid, 0 if $pid; 1933 waitpid $pid, 0 if $pid;
1928 if (0 == ($pid = fork)) { 1934 if (0 == ($pid = fork)) {
1929 $DB->{_meta}{version} = 1; 1935 $DB->{_meta}{version} = 1;
1930 Storable::nstore $DB, "$path~"; 1936 Storable::nstore $DB, "$path~";
1931 rename "$path~", $path; 1937 rename "$path~", $path;
… …
2191 or warn "ERROR: unable to write runtime file: $!"; 2197 or warn "ERROR: unable to write runtime file: $!";
2192 })->(); 2198 })->();
2193 }, 2199 },
2194); 2200);
2195 2201
2202END { cf::emergency_save }
2203
21961 22041
2197 2205

Diff Legend

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