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.134 by root, Thu Jan 4 17:28:49 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";
… …
1192 my $guard = cf::lock_acquire "map_find:$key"; 1209 my $guard = cf::lock_acquire "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
1214 Coro::cede;
1215
1197 if ($map) { 1216 if ($map) {
1217 $map->last_access ((delete $map->{last_access})
1218 || $cf::RUNTIME); #d#
1198 # safety 1219 # safety
1199 $map->{instantiate_time} = $cf::RUNTIME 1220 $map->{instantiate_time} = $cf::RUNTIME
1200 if $map->{instantiate_time} > $cf::RUNTIME; 1221 if $map->{instantiate_time} > $cf::RUNTIME;
1201 } else { 1222 } else {
1202 if (my $rmp = $path->random_map_params) { 1223 if (my $rmp = $path->random_map_params) {
… …
1207 1228
1208 $map or return; 1229 $map or return;
1209 1230
1210 $map->{load_original} = 1; 1231 $map->{load_original} = 1;
1211 $map->{instantiate_time} = $cf::RUNTIME; 1232 $map->{instantiate_time} = $cf::RUNTIME;
1233 $map->last_access ($cf::RUNTIME);
1212 $map->instantiate; 1234 $map->instantiate;
1213 1235
1214 # per-player maps become, after loading, normal maps 1236 # per-player maps become, after loading, normal maps
1215 $map->per_player (0) if $path->{user_rel}; 1237 $map->per_player (0) if $path->{user_rel};
1216 } 1238 }
1217 1239
1218 $map->path ($key); 1240 $map->path ($key);
1219 $map->{path} = $path; 1241 $map->{path} = $path;
1220 $map->{last_save} = $cf::RUNTIME; 1242 $map->{last_save} = $cf::RUNTIME;
1221 $map->last_access ($cf::RUNTIME); 1243
1244 Coro::cede;
1222 1245
1223 if ($map->should_reset) { 1246 if ($map->should_reset) {
1224 $map->reset; 1247 $map->reset;
1225 undef $guard; 1248 undef $guard;
1226 $map = find_map $path 1249 $map = find $path
1227 or return; 1250 or return;
1228 } 1251 }
1229 1252
1230 $cf::MAP{$key} = $map 1253 $cf::MAP{$key} = $map
1231 } 1254 }
… …
1253 if (aio_open $uniq, O_RDONLY, 0) { 1276 if (aio_open $uniq, O_RDONLY, 0) {
1254 $self->clear_unique_items; 1277 $self->clear_unique_items;
1255 $self->load_objects ($uniq, 0); 1278 $self->load_objects ($uniq, 0);
1256 } 1279 }
1257 } 1280 }
1281
1282 Coro::cede;
1258 1283
1259 # now do the right thing for maps 1284 # now do the right thing for maps
1260 $self->link_multipart_objects; 1285 $self->link_multipart_objects;
1261 1286
1262 if ($self->{path}->is_style_map) { 1287 if ($self->{path}->is_style_map) {
… …
1270 $self->difficulty ($self->estimate_difficulty) 1295 $self->difficulty ($self->estimate_difficulty)
1271 unless $self->difficulty; 1296 unless $self->difficulty;
1272 $self->activate; 1297 $self->activate;
1273 } 1298 }
1274 1299
1300 Coro::cede;
1301
1275 $self->in_memory (cf::MAP_IN_MEMORY); 1302 $self->in_memory (cf::MAP_IN_MEMORY);
1276} 1303}
1277 1304
1278sub load_map_sync { 1305sub find_sync {
1279 my ($path, $origin) = @_; 1306 my ($path, $origin) = @_;
1280 1307
1281 #warn "load_map_sync<$path, $origin>\n";#d# 1308 cf::sync_job { cf::map::find $path, $origin }
1309}
1282 1310
1283 cf::sync_job { 1311sub do_load_sync {
1284 my $map = cf::map::find_map $path, $origin 1312 my ($map) = @_;
1285 or return; 1313
1286 $map->load; 1314 cf::sync_job { $map->load };
1287 $map
1288 }
1289} 1315}
1290 1316
1291sub save { 1317sub save {
1292 my ($self) = @_; 1318 my ($self) = @_;
1293 1319
… …
1299 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1325 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1300 1326
1301 $self->{load_path} = $save; 1327 $self->{load_path} = $save;
1302 1328
1303 return if $self->{deny_save}; 1329 return if $self->{deny_save};
1330
1331 local $self->{last_access} = $self->last_access;#d#
1304 1332
1305 if ($uniq) { 1333 if ($uniq) {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1307 $self->save_objects ($uniq, cf::IO_UNIQUES); 1335 $self->save_objects ($uniq, cf::IO_UNIQUES);
1308 } else { 1336 } else {
… …
1311} 1339}
1312 1340
1313sub swap_out { 1341sub swap_out {
1314 my ($self) = @_; 1342 my ($self) = @_;
1315 1343
1344 # save first because save cedes
1345 $self->save;
1346
1316 return if $self->players; 1347 return if $self->players;
1317 return if $self->in_memory != cf::MAP_IN_MEMORY; 1348 return if $self->in_memory != cf::MAP_IN_MEMORY;
1318 return if $self->{deny_save}; 1349 return if $self->{deny_save};
1319 1350
1320 $self->save;
1321 $self->clear; 1351 $self->clear;
1322 $self->in_memory (cf::MAP_SWAPPED); 1352 $self->in_memory (cf::MAP_SWAPPED);
1323} 1353}
1324 1354
1325sub reset_at { 1355sub reset_at {
… …
1391 1421
1392sub customise_for { 1422sub customise_for {
1393 my ($map, $ob) = @_; 1423 my ($map, $ob) = @_;
1394 1424
1395 if ($map->per_player) { 1425 if ($map->per_player) {
1396 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1426 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1397 } 1427 }
1398 1428
1399 $map 1429 $map
1400} 1430}
1401 1431
1402sub emergency_save { 1432sub emergency_save {
1403 local $cf::FREEZE = 1; 1433 my $freeze_guard = cf::freeze_mainloop;
1404 1434
1405 warn "enter emergency map save\n"; 1435 warn "enter emergency map save\n";
1406 1436
1407 cf::sync_job { 1437 cf::sync_job {
1408 warn "begin emergency map save\n"; 1438 warn "begin emergency map save\n";
… …
1498 my $link_pos = delete $self->{_link_pos}; 1528 my $link_pos = delete $self->{_link_pos};
1499 1529
1500 unless ($map) { 1530 unless ($map) {
1501 # restore original map position 1531 # restore original map position
1502 ($map, $x, $y) = @{ $link_pos || [] }; 1532 ($map, $x, $y) = @{ $link_pos || [] };
1503 $map = cf::map::find_map $map; 1533 $map = cf::map::find $map;
1504 1534
1505 unless ($map) { 1535 unless ($map) {
1506 ($map, $x, $y) = @$EMERGENCY_POSITION; 1536 ($map, $x, $y) = @$EMERGENCY_POSITION;
1507 $map = cf::map::find_map $map 1537 $map = cf::map::find $map
1508 or die "FATAL: cannot load emergency map\n"; 1538 or die "FATAL: cannot load emergency map\n";
1509 } 1539 }
1510 } 1540 }
1511 1541
1512 ($x, $y) = (-1, -1) 1542 ($x, $y) = (-1, -1)
… …
1538 1568
1539 # try to abort aborted map switching on player login :) 1569 # try to abort aborted map switching on player login :)
1540 # should happen only on crashes 1570 # should happen only on crashes
1541 if ($pl->ob->{_link_pos}) { 1571 if ($pl->ob->{_link_pos}) {
1542 $pl->ob->enter_link; 1572 $pl->ob->enter_link;
1543 Coro::async { 1573 cf::async {
1544 # we need this sleep as the login has a concurrent enter_exit running 1574 # 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 1575 # and this sleep increases chances of the player not ending up in scorn
1546 Coro::Timer::sleep 1; 1576 Coro::Timer::sleep 1;
1547 $pl->ob->leave_link; 1577 $pl->ob->leave_link;
1548 }; 1578 };
… …
1557sub cf::object::player::goto_map { 1587sub cf::object::player::goto_map {
1558 my ($self, $path, $x, $y) = @_; 1588 my ($self, $path, $x, $y) = @_;
1559 1589
1560 $self->enter_link; 1590 $self->enter_link;
1561 1591
1562 (Coro::async { 1592 (cf::async {
1563 $path = new cf::path $path; 1593 $path = new cf::path $path;
1564 1594
1565 my $map = cf::map::find_map $path->as_string; 1595 my $map = cf::map::find $path->as_string;
1566 $map = $map->customise_for ($self) if $map; 1596 $map = $map->customise_for ($self) if $map;
1567 1597
1568# warn "entering ", $map->path, " at ($x, $y)\n" 1598# warn "entering ", $map->path, " at ($x, $y)\n"
1569# if $map; 1599# if $map;
1570 1600
… …
1629 1659
1630 return unless $self->type == cf::PLAYER; 1660 return unless $self->type == cf::PLAYER;
1631 1661
1632 $self->enter_link; 1662 $self->enter_link;
1633 1663
1634 (Coro::async { 1664 (cf::async {
1665 $self->deactivate_recursive; # just to be sure
1635 unless (eval { 1666 unless (eval {
1636
1637 prepare_random_map $exit 1667 prepare_random_map $exit
1638 if $exit->slaying eq "/!"; 1668 if $exit->slaying eq "/!";
1639 1669
1640 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1641 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1703 on_reply => sub { 1733 on_reply => sub {
1704 my ($ns, $msg) = @_; 1734 my ($ns, $msg) = @_;
1705 1735
1706 # this weird shuffling is so that direct followup queries 1736 # this weird shuffling is so that direct followup queries
1707 # get handled first 1737 # get handled first
1708 my $queue = delete $ns->{query_queue}; 1738 my $queue = delete $ns->{query_queue}
1739 or return; # be conservative, not sure how that can happen, but we saw a crash here
1709 1740
1710 (shift @$queue)->[1]->($msg); 1741 (shift @$queue)->[1]->($msg);
1711 1742
1712 push @{ $ns->{query_queue} }, @$queue; 1743 push @{ $ns->{query_queue} }, @$queue;
1713 1744
… …
1730=cut 1761=cut
1731 1762
1732sub cf::client::coro { 1763sub cf::client::coro {
1733 my ($self, $cb) = @_; 1764 my ($self, $cb) = @_;
1734 1765
1735 my $coro; $coro = async { 1766 my $coro = &cf::async ($cb);
1736 eval {
1737 $cb->();
1738 };
1739 warn $@ if $@;
1740 };
1741 1767
1742 $coro->on_destroy (sub { 1768 $coro->on_destroy (sub {
1743 delete $self->{_coro}{$coro+0}; 1769 delete $self->{_coro}{$coro+0};
1744 }); 1770 });
1745 1771
… …
1980 open my $fh, "<:utf8", cf::confdir . "/config" 2006 open my $fh, "<:utf8", cf::confdir . "/config"
1981 or return; 2007 or return;
1982 2008
1983 local $/; 2009 local $/;
1984 *CFG = YAML::Syck::Load <$fh>; 2010 *CFG = YAML::Syck::Load <$fh>;
2011
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013
2014 if (exists $CFG{mlockall}) {
2015 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall
2017 and die "WARNING: m(un)lockall failed: $!\n";
2018 };
2019 warn $@ if $@;
2020 }
1985} 2021}
1986 2022
1987sub main { 2023sub main {
1988 # we must not ever block the main coroutine 2024 # we must not ever block the main coroutine
1989 local $Coro::idle = sub { 2025 local $Coro::idle = sub {
… …
2009 return; 2045 return;
2010 } 2046 }
2011 2047
2012 warn "reloading..."; 2048 warn "reloading...";
2013 2049
2014 local $FREEZE = 1; 2050 my $guard = freeze_mainloop;
2015 cf::emergency_save; 2051 cf::emergency_save;
2016 2052
2017 eval { 2053 eval {
2018 # if anything goes wrong in here, we should simply crash as we already saved 2054 # if anything goes wrong in here, we should simply crash as we already saved
2019 2055
… …
2155 reentrant => 0, 2191 reentrant => 0,
2156 prio => 0, 2192 prio => 0,
2157 at => $NEXT_TICK || $TICK, 2193 at => $NEXT_TICK || $TICK,
2158 data => WF_AUTOCANCEL, 2194 data => WF_AUTOCANCEL,
2159 cb => sub { 2195 cb => sub {
2160 unless ($FREEZE) {
2161 cf::server_tick; # one server iteration 2196 cf::server_tick; # one server iteration
2162 $RUNTIME += $TICK; 2197 $RUNTIME += $TICK;
2163 }
2164
2165 $NEXT_TICK += $TICK; 2198 $NEXT_TICK += $TICK;
2166 2199
2167 # if we are delayed by four ticks or more, skip them all 2200 # if we are delayed by four ticks or more, skip them all
2168 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2169 2202

Diff Legend

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