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.114 by root, Mon Jan 1 16:00:10 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
… …
1143 $map->per_player (0) if $path->{user_rel}; 1226 $map->per_player (0) if $path->{user_rel};
1144 } 1227 }
1145 1228
1146 $map->path ($key); 1229 $map->path ($key);
1147 $map->{path} = $path; 1230 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME;
1148 $map->last_access ($cf::RUNTIME); 1232 $map->last_access ($cf::RUNTIME);
1149 1233
1150 if ($map->should_reset) { 1234 if ($map->should_reset) {
1151 $map->reset; 1235 $map->reset;
1236 undef $guard;
1152 $map = find_map $path; 1237 $map = find_map $path
1238 or return;
1153 } 1239 }
1154 1240
1155 $cf::MAP{$key} = $map 1241 $cf::MAP{$key} = $map
1156 } 1242 }
1157} 1243}
1158 1244
1159sub load { 1245sub load {
1160 my ($self) = @_; 1246 my ($self) = @_;
1161 1247
1248 my $path = $self->{path};
1249 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1250
1162 return if $self->in_memory != cf::MAP_SWAPPED; 1251 return if $self->in_memory != cf::MAP_SWAPPED;
1163 1252
1164 $self->in_memory (cf::MAP_LOADING); 1253 $self->in_memory (cf::MAP_LOADING);
1165
1166 my $path = $self->{path};
1167 1254
1168 $self->alloc; 1255 $self->alloc;
1169 $self->load_objects ($self->{load_path}, 1) 1256 $self->load_objects ($self->{load_path}, 1)
1170 or return; 1257 or return;
1171 1258
… …
1213} 1300}
1214 1301
1215sub save { 1302sub save {
1216 my ($self) = @_; 1303 my ($self) = @_;
1217 1304
1305 $self->{last_save} = $cf::RUNTIME;
1306
1307 return unless $self->dirty;
1308
1218 my $save = $self->{path}->save_path; utf8::encode $save; 1309 my $save = $self->{path}->save_path; utf8::encode $save;
1219 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220
1221 $self->{last_save} = $cf::RUNTIME;
1222
1223 return unless $self->dirty;
1224 1311
1225 $self->{load_path} = $save; 1312 $self->{load_path} = $save;
1226 1313
1227 return if $self->{deny_save}; 1314 return if $self->{deny_save};
1228 1315
… …
1235} 1322}
1236 1323
1237sub swap_out { 1324sub swap_out {
1238 my ($self) = @_; 1325 my ($self) = @_;
1239 1326
1327 # save first because save cedes
1328 $self->save;
1329
1240 return if $self->players; 1330 return if $self->players;
1241 return if $self->in_memory != cf::MAP_IN_MEMORY; 1331 return if $self->in_memory != cf::MAP_IN_MEMORY;
1242 return if $self->{deny_save}; 1332 return if $self->{deny_save};
1243 1333
1244 $self->save;
1245 $self->clear; 1334 $self->clear;
1246 $self->in_memory (cf::MAP_SWAPPED); 1335 $self->in_memory (cf::MAP_SWAPPED);
1247} 1336}
1248 1337
1249sub reset_at { 1338sub reset_at {
… …
1383 (ref $cf::CFG{"may_$access"} 1472 (ref $cf::CFG{"may_$access"}
1384 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1473 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1385 : $cf::CFG{"may_$access"}) 1474 : $cf::CFG{"may_$access"})
1386} 1475}
1387 1476
1477=item $player_object->enter_link
1478
1479Freezes the player and moves him/her to a special map (C<{link}>).
1480
1481The player should be reaosnably safe there for short amounts of time. You
1482I<MUST> call C<leave_link> as soon as possible, though.
1483
1484=item $player_object->leave_link ($map, $x, $y)
1485
1486Moves the player out of the specila link map onto the given map. If the
1487map is not valid (or omitted), the player will be moved back to the
1488location he/she was before the call to C<enter_link>, or, if that fails,
1489to the emergency map position.
1490
1491Might block.
1492
1493=cut
1494
1388sub cf::object::player::enter_link { 1495sub cf::object::player::enter_link {
1389 my ($self) = @_; 1496 my ($self) = @_;
1390 1497
1498 $self->deactivate_recursive;
1499
1391 return if $self->map == $LINK_MAP; 1500 return if $self->map == $LINK_MAP;
1392 1501
1393 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1394 if $self->map; 1503 if $self->map;
1395 1504
1396 $self->enter_map ($LINK_MAP, 20, 20); 1505 $self->enter_map ($LINK_MAP, 20, 20);
1397 $self->deactivate_recursive;
1398} 1506}
1399 1507
1400sub cf::object::player::leave_link { 1508sub cf::object::player::leave_link {
1401 my ($self, $map, $x, $y) = @_; 1509 my ($self, $map, $x, $y) = @_;
1402 1510
1403 my $link_pos = delete $self->{_link_pos}; 1511 my $link_pos = delete $self->{_link_pos};
1404 1512
1405 unless ($map) { 1513 unless ($map) {
1406 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1407
1408 # restore original map position 1514 # restore original map position
1409 ($map, $x, $y) = @{ $link_pos || [] }; 1515 ($map, $x, $y) = @{ $link_pos || [] };
1410 $map = cf::map::find_map $map; 1516 $map = cf::map::find_map $map;
1411 1517
1412 unless ($map) { 1518 unless ($map) {
… …
1427 1533
1428 $self->activate_recursive; 1534 $self->activate_recursive;
1429 $self->enter_map ($map, $x, $y); 1535 $self->enter_map ($map, $x, $y);
1430} 1536}
1431 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
1432=item $player_object->goto_map ($map, $x, $y) 1566=item $player_object->goto_map ($path, $x, $y)
1433 1567
1434=cut 1568=cut
1435 1569
1436sub cf::object::player::goto_map { 1570sub cf::object::player::goto_map {
1437 my ($self, $path, $x, $y) = @_; 1571 my ($self, $path, $x, $y) = @_;
1438 1572
1439 $self->enter_link; 1573 $self->enter_link;
1440 1574
1441 (Coro::async { 1575 (cf::async {
1442 $path = new cf::path $path; 1576 $path = new cf::path $path;
1443 1577
1444 my $map = cf::map::find_map $path->as_string; 1578 my $map = cf::map::find_map $path->as_string;
1445 $map = $map->customise_for ($self) if $map; 1579 $map = $map->customise_for ($self) if $map;
1446 1580
1447 warn "entering ", $map->path, " at ($x, $y)\n" 1581# warn "entering ", $map->path, " at ($x, $y)\n"
1448 if $map; 1582# if $map;
1583
1584 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1449 1585
1450 $self->leave_link ($map, $x, $y); 1586 $self->leave_link ($map, $x, $y);
1451 })->prio (1); 1587 })->prio (1);
1452} 1588}
1453 1589
… …
1506 1642
1507 return unless $self->type == cf::PLAYER; 1643 return unless $self->type == cf::PLAYER;
1508 1644
1509 $self->enter_link; 1645 $self->enter_link;
1510 1646
1511 (Coro::async { 1647 (cf::async {
1512 unless (eval { 1648 unless (eval {
1513
1514 prepare_random_map $exit 1649 prepare_random_map $exit
1515 if $exit->slaying eq "/!"; 1650 if $exit->slaying eq "/!";
1516 1651
1517 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;
1518 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1653 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1580 on_reply => sub { 1715 on_reply => sub {
1581 my ($ns, $msg) = @_; 1716 my ($ns, $msg) = @_;
1582 1717
1583 # this weird shuffling is so that direct followup queries 1718 # this weird shuffling is so that direct followup queries
1584 # get handled first 1719 # get handled first
1585 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
1586 1722
1587 (shift @$queue)->[1]->($msg); 1723 (shift @$queue)->[1]->($msg);
1588 1724
1589 push @{ $ns->{query_queue} }, @$queue; 1725 push @{ $ns->{query_queue} }, @$queue;
1590 1726
… …
1607=cut 1743=cut
1608 1744
1609sub cf::client::coro { 1745sub cf::client::coro {
1610 my ($self, $cb) = @_; 1746 my ($self, $cb) = @_;
1611 1747
1612 my $coro; $coro = async { 1748 my $coro = &cf::async ($cb);
1613 eval {
1614 $cb->();
1615 };
1616 warn $@ if $@;
1617 };
1618 1749
1619 $coro->on_destroy (sub { 1750 $coro->on_destroy (sub {
1620 delete $self->{_coro}{$coro+0}; 1751 delete $self->{_coro}{$coro+0};
1621 }); 1752 });
1622 1753
… …
1794 1925
1795{ 1926{
1796 my $path = cf::localdir . "/database.pst"; 1927 my $path = cf::localdir . "/database.pst";
1797 1928
1798 sub db_load() { 1929 sub db_load() {
1799 warn "loading database $path\n";#d# remove later
1800 $DB = stat $path ? Storable::retrieve $path : { }; 1930 $DB = stat $path ? Storable::retrieve $path : { };
1801 } 1931 }
1802 1932
1803 my $pid; 1933 my $pid;
1804 1934
1805 sub db_save() { 1935 sub db_save() {
1806 warn "saving database $path\n";#d# remove later
1807 waitpid $pid, 0 if $pid; 1936 waitpid $pid, 0 if $pid;
1808 if (0 == ($pid = fork)) { 1937 if (0 == ($pid = fork)) {
1809 $DB->{_meta}{version} = 1; 1938 $DB->{_meta}{version} = 1;
1810 Storable::nstore $DB, "$path~"; 1939 Storable::nstore $DB, "$path~";
1811 rename "$path~", $path; 1940 rename "$path~", $path;
… …
1864} 1993}
1865 1994
1866sub main { 1995sub main {
1867 # we must not ever block the main coroutine 1996 # we must not ever block the main coroutine
1868 local $Coro::idle = sub { 1997 local $Coro::idle = sub {
1869 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 1998 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1870 (Coro::unblock_sub { 1999 (Coro::unblock_sub {
1871 Event::one_event; 2000 Event::one_event;
1872 })->(); 2001 })->();
1873 }; 2002 };
1874 2003
… …
2071 or warn "ERROR: unable to write runtime file: $!"; 2200 or warn "ERROR: unable to write runtime file: $!";
2072 })->(); 2201 })->();
2073 }, 2202 },
2074); 2203);
2075 2204
2205END { cf::emergency_save }
2206
20761 22071
2077 2208

Diff Legend

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