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.117 by root, Mon Jan 1 17:50:26 2007 UTC vs.
Revision 1.130 by root, Thu Jan 4 00:08:08 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;
… …
181sub to_json($) { 181sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 183 JSON::Syck::Dump $_[0]
184} 184}
185 185
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string
209
210Wait until the given lock is available. See cf::lock_acquire.
211
212=item my $lock = cf::lock_acquire $string
213
214Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically
217returned.
218
219Lock names should begin with a unique identifier (for example, find_map
220uses map_find and load_map uses map_load).
221
222=cut
223
224our %LOCK;
225
226sub lock_wait($) {
227 my ($key) = @_;
228
229 # wait for lock, if any
230 while ($LOCK{$key}) {
231 push @{ $LOCK{$key} }, $Coro::current;
232 Coro::schedule;
233 }
234}
235
236sub lock_acquire($) {
237 my ($key) = @_;
238
239 # wait, to be sure we are not locked
240 lock_wait $key;
241
242 $LOCK{$key} = [];
243
244 cf::guard {
245 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} };
247 }
248}
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
186=item cf::sync_job { BLOCK } 266=item cf::sync_job { BLOCK }
187 267
188The design of crossfire+ requires that the main coro ($Coro::main) is 268The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 269always able to handle events or runnable, as crossfire+ is only partly
190reentrant. 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.
… …
237=cut 317=cut
238 318
239sub coro(&) { 319sub coro(&) {
240 my $cb = shift; 320 my $cb = shift;
241 321
242 my $coro; $coro = async { 322 my $coro = &cf::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 323
249 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
251 }); 326 });
252 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
… …
817 (aio_load "$filename.pst", $av) >= 0 892 (aio_load "$filename.pst", $av) >= 0
818 or return; 893 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 894 $av = eval { (Storable::thaw $av)->{objs} };
820 } 895 }
821 896
897 warn sprintf "loading %s (%d)\n",
898 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 899 return ($data, $av);
823} 900}
824 901
825############################################################################# 902#############################################################################
826# command handling &c 903# command handling &c
… …
1087# and all this just because we cannot iterate over 1164# and all this just because we cannot iterate over
1088# all maps in C++... 1165# all maps in C++...
1089sub change_all_map_light { 1166sub change_all_map_light {
1090 my ($change) = @_; 1167 my ($change) = @_;
1091 1168
1092 $_->change_map_light ($change) for values %cf::MAP; 1169 $_->change_map_light ($change)
1170 for grep $_->outdoor, values %cf::MAP;
1093} 1171}
1094 1172
1095sub try_load_header($) { 1173sub try_load_header($) {
1096 my ($path) = @_; 1174 my ($path) = @_;
1097 1175
… …
1108 $map->{load_path} = $path; 1186 $map->{load_path} = $path;
1109 1187
1110 $map 1188 $map
1111} 1189}
1112 1190
1191sub find_map;
1113sub find_map { 1192sub find_map {
1114 my ($path, $origin) = @_; 1193 my ($path, $origin) = @_;
1115 1194
1116 #warn "find_map<$path,$origin>\n";#d# 1195 #warn "find_map<$path,$origin>\n";#d#
1117 1196
1118 $path = new cf::path $path, $origin && $origin->path; 1197 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1198 my $key = $path->as_string;
1120 1199
1200 cf::lock_wait "map_find:$key";
1201
1121 $cf::MAP{$key} || do { 1202 $cf::MAP{$key} || do {
1203 my $guard = cf::lock_acquire "map_find:$key";
1204
1122 # do it the slow way 1205 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1206 my $map = try_load_header $path->save_path;
1124 1207
1125 if ($map) { 1208 if ($map) {
1126 # safety 1209 # safety
… …
1148 $map->{last_save} = $cf::RUNTIME; 1231 $map->{last_save} = $cf::RUNTIME;
1149 $map->last_access ($cf::RUNTIME); 1232 $map->last_access ($cf::RUNTIME);
1150 1233
1151 if ($map->should_reset) { 1234 if ($map->should_reset) {
1152 $map->reset; 1235 $map->reset;
1236 undef $guard;
1153 $map = find_map $path; 1237 $map = find_map $path
1238 or return;
1154 } 1239 }
1155 1240
1156 $cf::MAP{$key} = $map 1241 $cf::MAP{$key} = $map
1157 } 1242 }
1158} 1243}
1159 1244
1160sub load { 1245sub load {
1161 my ($self) = @_; 1246 my ($self) = @_;
1162 1247
1248 my $path = $self->{path};
1249 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1250
1163 return if $self->in_memory != cf::MAP_SWAPPED; 1251 return if $self->in_memory != cf::MAP_SWAPPED;
1164 1252
1165 $self->in_memory (cf::MAP_LOADING); 1253 $self->in_memory (cf::MAP_LOADING);
1166
1167 my $path = $self->{path};
1168 1254
1169 $self->alloc; 1255 $self->alloc;
1170 $self->load_objects ($self->{load_path}, 1) 1256 $self->load_objects ($self->{load_path}, 1)
1171 or return; 1257 or return;
1172 1258
… …
1236} 1322}
1237 1323
1238sub swap_out { 1324sub swap_out {
1239 my ($self) = @_; 1325 my ($self) = @_;
1240 1326
1327 # save first because save cedes
1328 $self->save;
1329
1241 return if $self->players; 1330 return if $self->players;
1242 return if $self->in_memory != cf::MAP_IN_MEMORY; 1331 return if $self->in_memory != cf::MAP_IN_MEMORY;
1243 return if $self->{deny_save}; 1332 return if $self->{deny_save};
1244 1333
1245 $self->save;
1246 $self->clear; 1334 $self->clear;
1247 $self->in_memory (cf::MAP_SWAPPED); 1335 $self->in_memory (cf::MAP_SWAPPED);
1248} 1336}
1249 1337
1250sub reset_at { 1338sub reset_at {
… …
1405=cut 1493=cut
1406 1494
1407sub cf::object::player::enter_link { 1495sub cf::object::player::enter_link {
1408 my ($self) = @_; 1496 my ($self) = @_;
1409 1497
1498 $self->deactivate_recursive;
1499
1410 return if $self->map == $LINK_MAP; 1500 return if $self->map == $LINK_MAP;
1411 1501
1412 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1413 if $self->map; 1503 if $self->map;
1414 1504
1415 $self->enter_map ($LINK_MAP, 20, 20); 1505 $self->enter_map ($LINK_MAP, 20, 20);
1416 $self->deactivate_recursive;
1417} 1506}
1418 1507
1419sub cf::object::player::leave_link { 1508sub cf::object::player::leave_link {
1420 my ($self, $map, $x, $y) = @_; 1509 my ($self, $map, $x, $y) = @_;
1421 1510
… …
1444 1533
1445 $self->activate_recursive; 1534 $self->activate_recursive;
1446 $self->enter_map ($map, $x, $y); 1535 $self->enter_map ($map, $x, $y);
1447} 1536}
1448 1537
1538cf::player->attach (
1539 on_logout => sub {
1540 my ($pl) = @_;
1541
1542 # abort map switching before logout
1543 if ($pl->ob->{_link_pos}) {
1544 cf::sync_job {
1545 $pl->ob->leave_link
1546 };
1547 }
1548 },
1549 on_login => sub {
1550 my ($pl) = @_;
1551
1552 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) {
1555 $pl->ob->enter_link;
1556 cf::async {
1557 # we need this sleep as the login has a concurrent enter_exit running
1558 # and this sleep increases chances of the player not ending up in scorn
1559 Coro::Timer::sleep 1;
1560 $pl->ob->leave_link;
1561 };
1562 }
1563 },
1564);
1565
1449=item $player_object->goto_map ($map, $x, $y) 1566=item $player_object->goto_map ($path, $x, $y)
1450 1567
1451=cut 1568=cut
1452 1569
1453sub cf::object::player::goto_map { 1570sub cf::object::player::goto_map {
1454 my ($self, $path, $x, $y) = @_; 1571 my ($self, $path, $x, $y) = @_;
1455 1572
1456 $self->enter_link; 1573 $self->enter_link;
1457 1574
1458 (Coro::async { 1575 (cf::async {
1459 $path = new cf::path $path; 1576 $path = new cf::path $path;
1460 1577
1461 my $map = cf::map::find_map $path->as_string; 1578 my $map = cf::map::find_map $path->as_string;
1462 $map = $map->customise_for ($self) if $map; 1579 $map = $map->customise_for ($self) if $map;
1463 1580
1464 warn "entering ", $map->path, " at ($x, $y)\n" 1581# warn "entering ", $map->path, " at ($x, $y)\n"
1465 if $map; 1582# if $map;
1466 1583
1467 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1584 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1468 1585
1469 $self->leave_link ($map, $x, $y); 1586 $self->leave_link ($map, $x, $y);
1470 })->prio (1); 1587 })->prio (1);
… …
1525 1642
1526 return unless $self->type == cf::PLAYER; 1643 return unless $self->type == cf::PLAYER;
1527 1644
1528 $self->enter_link; 1645 $self->enter_link;
1529 1646
1530 (Coro::async { 1647 (cf::async {
1531 unless (eval { 1648 unless (eval {
1532
1533 prepare_random_map $exit 1649 prepare_random_map $exit
1534 if $exit->slaying eq "/!"; 1650 if $exit->slaying eq "/!";
1535 1651
1536 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1652 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1537 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1653 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1599 on_reply => sub { 1715 on_reply => sub {
1600 my ($ns, $msg) = @_; 1716 my ($ns, $msg) = @_;
1601 1717
1602 # this weird shuffling is so that direct followup queries 1718 # this weird shuffling is so that direct followup queries
1603 # get handled first 1719 # get handled first
1604 my $queue = delete $ns->{query_queue}; 1720 my $queue = delete $ns->{query_queue}
1721 or return; # be conservative, not sure how that can happen, but we saw a crash here
1605 1722
1606 (shift @$queue)->[1]->($msg); 1723 (shift @$queue)->[1]->($msg);
1607 1724
1608 push @{ $ns->{query_queue} }, @$queue; 1725 push @{ $ns->{query_queue} }, @$queue;
1609 1726
… …
1626=cut 1743=cut
1627 1744
1628sub cf::client::coro { 1745sub cf::client::coro {
1629 my ($self, $cb) = @_; 1746 my ($self, $cb) = @_;
1630 1747
1631 my $coro; $coro = async { 1748 my $coro = &cf::async ($cb);
1632 eval {
1633 $cb->();
1634 };
1635 warn $@ if $@;
1636 };
1637 1749
1638 $coro->on_destroy (sub { 1750 $coro->on_destroy (sub {
1639 delete $self->{_coro}{$coro+0}; 1751 delete $self->{_coro}{$coro+0};
1640 }); 1752 });
1641 1753
… …
1813 1925
1814{ 1926{
1815 my $path = cf::localdir . "/database.pst"; 1927 my $path = cf::localdir . "/database.pst";
1816 1928
1817 sub db_load() { 1929 sub db_load() {
1818 warn "loading database $path\n";#d# remove later
1819 $DB = stat $path ? Storable::retrieve $path : { }; 1930 $DB = stat $path ? Storable::retrieve $path : { };
1820 } 1931 }
1821 1932
1822 my $pid; 1933 my $pid;
1823 1934
1824 sub db_save() { 1935 sub db_save() {
1825 warn "saving database $path\n";#d# remove later
1826 waitpid $pid, 0 if $pid; 1936 waitpid $pid, 0 if $pid;
1827 if (0 == ($pid = fork)) { 1937 if (0 == ($pid = fork)) {
1828 $DB->{_meta}{version} = 1; 1938 $DB->{_meta}{version} = 1;
1829 Storable::nstore $DB, "$path~"; 1939 Storable::nstore $DB, "$path~";
1830 rename "$path~", $path; 1940 rename "$path~", $path;
… …
2090 or warn "ERROR: unable to write runtime file: $!"; 2200 or warn "ERROR: unable to write runtime file: $!";
2091 })->(); 2201 })->();
2092 }, 2202 },
2093); 2203);
2094 2204
2205END { cf::emergency_save }
2206
20951 22071
2096 2208

Diff Legend

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