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.126 by root, Tue Jan 2 23:12:47 2007 UTC vs.
Revision 1.133 by root, Thu Jan 4 16:19:32 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;
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
214Wait until the given lock is available and then acquires it and returns 212Wait 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, 213a guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 214for example when the coroutine gets canceled), the lock is automatically
217returned. 215returned.
218 216
219Lock names should begin with a unique identifier (for example, find_map 217Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 218uses map_find and cf::map::load uses map_load).
221 219
222=cut 220=cut
223 221
224our %LOCK; 222our %LOCK;
225 223
… …
243 241
244 cf::guard { 242 cf::guard {
245 # wake up all waiters, to be on the safe side 243 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 244 $_->ready for @{ delete $LOCK{$key} };
247 } 245 }
246}
247
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active;
266
267 my $guard = guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop;
269 $guard
248} 270}
249 271
250=item cf::sync_job { BLOCK } 272=item cf::sync_job { BLOCK }
251 273
252The design of crossfire+ requires that the main coro ($Coro::main) is 274The design of crossfire+ requires that the main coro ($Coro::main) is
… …
267 # this is the main coro, too bad, we have to block 289 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 290 # till the operation succeeds, freezing the server :/
269 291
270 # TODO: use suspend/resume instead 292 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 293 # (but this is cancel-safe)
272 local $FREEZE = 1; 294 my $freeze_guard = freeze_mainloop;
273 295
274 my $busy = 1; 296 my $busy = 1;
275 my @res; 297 my @res;
276 298
277 (Coro::async { 299 (Coro::async {
… …
301=cut 323=cut
302 324
303sub coro(&) { 325sub coro(&) {
304 my $cb = shift; 326 my $cb = shift;
305 327
306 my $coro; $coro = async { 328 my $coro = &cf::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 329
313 $coro->on_destroy (sub { 330 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 331 delete $EXT_CORO{$coro+0};
315 }); 332 });
316 $EXT_CORO{$coro+0} = $coro; 333 $EXT_CORO{$coro+0} = $coro;
… …
1126package cf::map; 1143package cf::map;
1127 1144
1128use Fcntl; 1145use Fcntl;
1129use Coro::AIO; 1146use Coro::AIO;
1130 1147
1131our $MAX_RESET = 7200; 1148our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1149our $DEFAULT_RESET = 3000;
1133 1150
1134sub generate_random_map { 1151sub generate_random_map {
1135 my ($path, $rmp) = @_; 1152 my ($path, $rmp) = @_;
1136 1153
1137 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
… …
1175 $map->{load_path} = $path; 1192 $map->{load_path} = $path;
1176 1193
1177 $map 1194 $map
1178} 1195}
1179 1196
1180sub find_map; 1197sub find;
1181sub find_map { 1198sub find {
1182 my ($path, $origin) = @_; 1199 my ($path, $origin) = @_;
1183 1200
1184 #warn "find_map<$path,$origin>\n";#d# 1201 #warn "find<$path,$origin>\n";#d#
1185 1202
1186 $path = new cf::path $path, $origin && $origin->path; 1203 $path = new cf::path $path, $origin && $origin->path;
1187 my $key = $path->as_string; 1204 my $key = $path->as_string;
1188 1205
1189 cf::lock_wait "map_find:$key"; 1206 cf::lock_wait "map_find:$key";
… …
1193 1210
1194 # do it the slow way 1211 # do it the slow way
1195 my $map = try_load_header $path->save_path; 1212 my $map = try_load_header $path->save_path;
1196 1213
1197 if ($map) { 1214 if ($map) {
1215 $map->last_access ((delete $map->{last_access})
1216 || $cf::RUNTIME); #d#
1198 # safety 1217 # safety
1199 $map->{instantiate_time} = $cf::RUNTIME 1218 $map->{instantiate_time} = $cf::RUNTIME
1200 if $map->{instantiate_time} > $cf::RUNTIME; 1219 if $map->{instantiate_time} > $cf::RUNTIME;
1201 } else { 1220 } else {
1202 if (my $rmp = $path->random_map_params) { 1221 if (my $rmp = $path->random_map_params) {
… …
1207 1226
1208 $map or return; 1227 $map or return;
1209 1228
1210 $map->{load_original} = 1; 1229 $map->{load_original} = 1;
1211 $map->{instantiate_time} = $cf::RUNTIME; 1230 $map->{instantiate_time} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME);
1212 $map->instantiate; 1232 $map->instantiate;
1213 1233
1214 # per-player maps become, after loading, normal maps 1234 # per-player maps become, after loading, normal maps
1215 $map->per_player (0) if $path->{user_rel}; 1235 $map->per_player (0) if $path->{user_rel};
1216 } 1236 }
1217 1237
1218 $map->path ($key); 1238 $map->path ($key);
1219 $map->{path} = $path; 1239 $map->{path} = $path;
1220 $map->{last_save} = $cf::RUNTIME; 1240 $map->{last_save} = $cf::RUNTIME;
1221 $map->last_access ($cf::RUNTIME);
1222 1241
1223 if ($map->should_reset) { 1242 if ($map->should_reset) {
1224 $map->reset; 1243 $map->reset;
1225 undef $guard; 1244 undef $guard;
1226 $map = find_map $path 1245 $map = find $path
1227 or return; 1246 or return;
1228 } 1247 }
1229 1248
1230 $cf::MAP{$key} = $map 1249 $cf::MAP{$key} = $map
1231 } 1250 }
… …
1273 } 1292 }
1274 1293
1275 $self->in_memory (cf::MAP_IN_MEMORY); 1294 $self->in_memory (cf::MAP_IN_MEMORY);
1276} 1295}
1277 1296
1278sub load_map_sync { 1297sub find_sync {
1279 my ($path, $origin) = @_; 1298 my ($path, $origin) = @_;
1280 1299
1281 #warn "load_map_sync<$path, $origin>\n";#d# 1300 cf::sync_job { cf::map::find $path, $origin }
1301}
1282 1302
1283 cf::sync_job { 1303sub do_load_sync {
1284 my $map = cf::map::find_map $path, $origin 1304 my ($map) = @_;
1285 or return; 1305
1286 $map->load; 1306 cf::sync_job { $map->load };
1287 $map
1288 }
1289} 1307}
1290 1308
1291sub save { 1309sub save {
1292 my ($self) = @_; 1310 my ($self) = @_;
1293 1311
… …
1299 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1317 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1300 1318
1301 $self->{load_path} = $save; 1319 $self->{load_path} = $save;
1302 1320
1303 return if $self->{deny_save}; 1321 return if $self->{deny_save};
1322
1323 local $self->{last_access} = $self->last_access;#d#
1304 1324
1305 if ($uniq) { 1325 if ($uniq) {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1326 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1307 $self->save_objects ($uniq, cf::IO_UNIQUES); 1327 $self->save_objects ($uniq, cf::IO_UNIQUES);
1308 } else { 1328 } else {
… …
1311} 1331}
1312 1332
1313sub swap_out { 1333sub swap_out {
1314 my ($self) = @_; 1334 my ($self) = @_;
1315 1335
1336 # save first because save cedes
1337 $self->save;
1338
1316 return if $self->players; 1339 return if $self->players;
1317 return if $self->in_memory != cf::MAP_IN_MEMORY; 1340 return if $self->in_memory != cf::MAP_IN_MEMORY;
1318 return if $self->{deny_save}; 1341 return if $self->{deny_save};
1319 1342
1320 $self->save;
1321 $self->clear; 1343 $self->clear;
1322 $self->in_memory (cf::MAP_SWAPPED); 1344 $self->in_memory (cf::MAP_SWAPPED);
1323} 1345}
1324 1346
1325sub reset_at { 1347sub reset_at {
… …
1391 1413
1392sub customise_for { 1414sub customise_for {
1393 my ($map, $ob) = @_; 1415 my ($map, $ob) = @_;
1394 1416
1395 if ($map->per_player) { 1417 if ($map->per_player) {
1396 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1418 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1397 } 1419 }
1398 1420
1399 $map 1421 $map
1400} 1422}
1401 1423
1402sub emergency_save { 1424sub emergency_save {
1403 local $cf::FREEZE = 1; 1425 my $freeze_guard = cf::freeze_mainloop;
1404 1426
1405 warn "enter emergency map save\n"; 1427 warn "enter emergency map save\n";
1406 1428
1407 cf::sync_job { 1429 cf::sync_job {
1408 warn "begin emergency map save\n"; 1430 warn "begin emergency map save\n";
… …
1498 my $link_pos = delete $self->{_link_pos}; 1520 my $link_pos = delete $self->{_link_pos};
1499 1521
1500 unless ($map) { 1522 unless ($map) {
1501 # restore original map position 1523 # restore original map position
1502 ($map, $x, $y) = @{ $link_pos || [] }; 1524 ($map, $x, $y) = @{ $link_pos || [] };
1503 $map = cf::map::find_map $map; 1525 $map = cf::map::find $map;
1504 1526
1505 unless ($map) { 1527 unless ($map) {
1506 ($map, $x, $y) = @$EMERGENCY_POSITION; 1528 ($map, $x, $y) = @$EMERGENCY_POSITION;
1507 $map = cf::map::find_map $map 1529 $map = cf::map::find $map
1508 or die "FATAL: cannot load emergency map\n"; 1530 or die "FATAL: cannot load emergency map\n";
1509 } 1531 }
1510 } 1532 }
1511 1533
1512 ($x, $y) = (-1, -1) 1534 ($x, $y) = (-1, -1)
… …
1538 1560
1539 # try to abort aborted map switching on player login :) 1561 # try to abort aborted map switching on player login :)
1540 # should happen only on crashes 1562 # should happen only on crashes
1541 if ($pl->ob->{_link_pos}) { 1563 if ($pl->ob->{_link_pos}) {
1542 $pl->ob->enter_link; 1564 $pl->ob->enter_link;
1543 Coro::async { 1565 cf::async {
1544 # we need this sleep as the login has a concurrent enter_exit running 1566 # we need this sleep as the login has a concurrent enter_exit running
1545 # and this sleep increases chances of the player not ending up in scorn 1567 # and this sleep increases chances of the player not ending up in scorn
1546 Coro::Timer::sleep 1; 1568 Coro::Timer::sleep 1;
1547 $pl->ob->leave_link; 1569 $pl->ob->leave_link;
1548 }; 1570 };
… …
1557sub cf::object::player::goto_map { 1579sub cf::object::player::goto_map {
1558 my ($self, $path, $x, $y) = @_; 1580 my ($self, $path, $x, $y) = @_;
1559 1581
1560 $self->enter_link; 1582 $self->enter_link;
1561 1583
1562 (Coro::async { 1584 (cf::async {
1563 $path = new cf::path $path; 1585 $path = new cf::path $path;
1564 1586
1565 my $map = cf::map::find_map $path->as_string; 1587 my $map = cf::map::find $path->as_string;
1566 $map = $map->customise_for ($self) if $map; 1588 $map = $map->customise_for ($self) if $map;
1567 1589
1568# warn "entering ", $map->path, " at ($x, $y)\n" 1590# warn "entering ", $map->path, " at ($x, $y)\n"
1569# if $map; 1591# if $map;
1570 1592
… …
1629 1651
1630 return unless $self->type == cf::PLAYER; 1652 return unless $self->type == cf::PLAYER;
1631 1653
1632 $self->enter_link; 1654 $self->enter_link;
1633 1655
1634 (Coro::async { 1656 (cf::async {
1657 $self->deactivate_recursive; # just to be sure
1635 unless (eval { 1658 unless (eval {
1636
1637 prepare_random_map $exit 1659 prepare_random_map $exit
1638 if $exit->slaying eq "/!"; 1660 if $exit->slaying eq "/!";
1639 1661
1640 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1662 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1641 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1663 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1703 on_reply => sub { 1725 on_reply => sub {
1704 my ($ns, $msg) = @_; 1726 my ($ns, $msg) = @_;
1705 1727
1706 # this weird shuffling is so that direct followup queries 1728 # this weird shuffling is so that direct followup queries
1707 # get handled first 1729 # get handled first
1708 my $queue = delete $ns->{query_queue}; 1730 my $queue = delete $ns->{query_queue}
1731 or return; # be conservative, not sure how that can happen, but we saw a crash here
1709 1732
1710 (shift @$queue)->[1]->($msg); 1733 (shift @$queue)->[1]->($msg);
1711 1734
1712 push @{ $ns->{query_queue} }, @$queue; 1735 push @{ $ns->{query_queue} }, @$queue;
1713 1736
… …
1730=cut 1753=cut
1731 1754
1732sub cf::client::coro { 1755sub cf::client::coro {
1733 my ($self, $cb) = @_; 1756 my ($self, $cb) = @_;
1734 1757
1735 my $coro; $coro = async { 1758 my $coro = &cf::async ($cb);
1736 eval {
1737 $cb->();
1738 };
1739 warn $@ if $@;
1740 };
1741 1759
1742 $coro->on_destroy (sub { 1760 $coro->on_destroy (sub {
1743 delete $self->{_coro}{$coro+0}; 1761 delete $self->{_coro}{$coro+0};
1744 }); 1762 });
1745 1763
… …
1980 open my $fh, "<:utf8", cf::confdir . "/config" 1998 open my $fh, "<:utf8", cf::confdir . "/config"
1981 or return; 1999 or return;
1982 2000
1983 local $/; 2001 local $/;
1984 *CFG = YAML::Syck::Load <$fh>; 2002 *CFG = YAML::Syck::Load <$fh>;
2003
2004 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2005
2006 if (exists $CFG{mlockall}) {
2007 eval {
2008 $CFG{mlockall} ? &mlockall : &munlockall
2009 and die "WARNING: m(un)lockall failed: $!\n";
2010 };
2011 warn $@ if $@;
2012 }
1985} 2013}
1986 2014
1987sub main { 2015sub main {
1988 # we must not ever block the main coroutine 2016 # we must not ever block the main coroutine
1989 local $Coro::idle = sub { 2017 local $Coro::idle = sub {
… …
2009 return; 2037 return;
2010 } 2038 }
2011 2039
2012 warn "reloading..."; 2040 warn "reloading...";
2013 2041
2014 local $FREEZE = 1; 2042 my $guard = freeze_mainloop;
2015 cf::emergency_save; 2043 cf::emergency_save;
2016 2044
2017 eval { 2045 eval {
2018 # if anything goes wrong in here, we should simply crash as we already saved 2046 # if anything goes wrong in here, we should simply crash as we already saved
2019 2047
… …
2155 reentrant => 0, 2183 reentrant => 0,
2156 prio => 0, 2184 prio => 0,
2157 at => $NEXT_TICK || $TICK, 2185 at => $NEXT_TICK || $TICK,
2158 data => WF_AUTOCANCEL, 2186 data => WF_AUTOCANCEL,
2159 cb => sub { 2187 cb => sub {
2160 unless ($FREEZE) {
2161 cf::server_tick; # one server iteration 2188 cf::server_tick; # one server iteration
2162 $RUNTIME += $TICK; 2189 $RUNTIME += $TICK;
2163 }
2164
2165 $NEXT_TICK += $TICK; 2190 $NEXT_TICK += $TICK;
2166 2191
2167 # if we are delayed by four ticks or more, skip them all 2192 # if we are delayed by four ticks or more, skip them all
2168 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2193 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2169 2194

Diff Legend

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