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.123 by root, Tue Jan 2 19:18:33 2007 UTC vs.
Revision 1.137 by root, Fri Jan 5 10:23:05 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
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
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 184=item cf::lock_wait $string
209 185
210Wait until the given lock is available. See cf::lock_acquire. 186Wait until the given lock is available. See cf::lock_acquire.
211 187
212=item my $lock = cf::lock_acquire $string 188=item my $lock = cf::lock_acquire $string
213 189
214Wait until the given lock is available and then acquires it and returns 190Wait 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, 191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 192for example when the coroutine gets canceled), the lock is automatically
217returned. 193returned.
218 194
219Lock names should begin with a unique identifier (for example, find_map 195Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 196uses map_find and cf::map::load uses map_load).
221 197
222=cut 198=cut
223 199
224our %LOCK; 200our %LOCK;
225 201
… …
239 # wait, to be sure we are not locked 215 # wait, to be sure we are not locked
240 lock_wait $key; 216 lock_wait $key;
241 217
242 $LOCK{$key} = []; 218 $LOCK{$key} = [];
243 219
244 cf::guard { 220 Coro::guard {
245 # wake up all waiters, to be on the safe side 221 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 222 $_->ready for @{ delete $LOCK{$key} };
247 } 223 }
224}
225
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active;
244
245 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop;
247 $guard
248} 248}
249 249
250=item cf::sync_job { BLOCK } 250=item cf::sync_job { BLOCK }
251 251
252The design of crossfire+ requires that the main coro ($Coro::main) is 252The design of crossfire+ requires that the main coro ($Coro::main) is
… …
267 # this is the main coro, too bad, we have to block 267 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 268 # till the operation succeeds, freezing the server :/
269 269
270 # TODO: use suspend/resume instead 270 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 271 # (but this is cancel-safe)
272 local $FREEZE = 1; 272 my $freeze_guard = freeze_mainloop;
273 273
274 my $busy = 1; 274 my $busy = 1;
275 my @res; 275 my @res;
276 276
277 (Coro::async { 277 (Coro::async {
… …
301=cut 301=cut
302 302
303sub coro(&) { 303sub coro(&) {
304 my $cb = shift; 304 my $cb = shift;
305 305
306 my $coro; $coro = async { 306 my $coro = &cf::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 307
313 $coro->on_destroy (sub { 308 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 309 delete $EXT_CORO{$coro+0};
315 }); 310 });
316 $EXT_CORO{$coro+0} = $coro; 311 $EXT_CORO{$coro+0} = $coro;
… …
1126package cf::map; 1121package cf::map;
1127 1122
1128use Fcntl; 1123use Fcntl;
1129use Coro::AIO; 1124use Coro::AIO;
1130 1125
1131our $MAX_RESET = 7200; 1126our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1127our $DEFAULT_RESET = 3000;
1133 1128
1134sub generate_random_map { 1129sub generate_random_map {
1135 my ($path, $rmp) = @_; 1130 my ($path, $rmp) = @_;
1136 1131
1137 # mit "rum" bekleckern, nicht 1132 # mit "rum" bekleckern, nicht
… …
1167 or return; 1162 or return;
1168 1163
1169 my $map = cf::map::new 1164 my $map = cf::map::new
1170 or return; 1165 or return;
1171 1166
1167 # for better error messages only, will be overwritten
1168 $map->path ($path);
1169
1172 $map->load_header ($path) 1170 $map->load_header ($path)
1173 or return; 1171 or return;
1174 1172
1175 $map->{load_path} = $path; 1173 $map->{load_path} = $path;
1176 1174
1177 $map 1175 $map
1178} 1176}
1179 1177
1178sub find;
1180sub find_map { 1179sub find {
1181 my ($path, $origin) = @_; 1180 my ($path, $origin) = @_;
1182 1181
1183 #warn "find_map<$path,$origin>\n";#d# 1182 #warn "find<$path,$origin>\n";#d#
1184 1183
1185 $path = new cf::path $path, $origin && $origin->path; 1184 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1185 my $key = $path->as_string;
1187 1186
1188 cf::lock_wait "map_find:$key"; 1187 cf::lock_wait "map_find:$key";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1190 my $guard = cf::lock_acquire "map_find:$key";
1192 1191
1193 # do it the slow way 1192 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1193 my $map = try_load_header $path->save_path;
1195 1194
1195 Coro::cede;
1196
1196 if ($map) { 1197 if ($map) {
1198 $map->last_access ((delete $map->{last_access})
1199 || $cf::RUNTIME); #d#
1197 # safety 1200 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1201 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1202 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1203 } else {
1201 if (my $rmp = $path->random_map_params) { 1204 if (my $rmp = $path->random_map_params) {
… …
1206 1209
1207 $map or return; 1210 $map or return;
1208 1211
1209 $map->{load_original} = 1; 1212 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1213 $map->{instantiate_time} = $cf::RUNTIME;
1214 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1215 $map->instantiate;
1212 1216
1213 # per-player maps become, after loading, normal maps 1217 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1218 $map->per_player (0) if $path->{user_rel};
1215 } 1219 }
1216 1220
1217 $map->path ($key); 1221 $map->path ($key);
1218 $map->{path} = $path; 1222 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1223 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1224
1225 Coro::cede;
1221 1226
1222 if ($map->should_reset) { 1227 if ($map->should_reset) {
1223 $map->reset; 1228 $map->reset;
1224 undef $guard; 1229 undef $guard;
1225 $map = find_map $path; 1230 $map = find $path
1231 or return;
1226 } 1232 }
1227 1233
1228 $cf::MAP{$key} = $map 1234 $cf::MAP{$key} = $map
1229 } 1235 }
1230} 1236}
… …
1251 if (aio_open $uniq, O_RDONLY, 0) { 1257 if (aio_open $uniq, O_RDONLY, 0) {
1252 $self->clear_unique_items; 1258 $self->clear_unique_items;
1253 $self->load_objects ($uniq, 0); 1259 $self->load_objects ($uniq, 0);
1254 } 1260 }
1255 } 1261 }
1262
1263 Coro::cede;
1256 1264
1257 # now do the right thing for maps 1265 # now do the right thing for maps
1258 $self->link_multipart_objects; 1266 $self->link_multipart_objects;
1259 1267
1260 if ($self->{path}->is_style_map) { 1268 if ($self->{path}->is_style_map) {
… …
1268 $self->difficulty ($self->estimate_difficulty) 1276 $self->difficulty ($self->estimate_difficulty)
1269 unless $self->difficulty; 1277 unless $self->difficulty;
1270 $self->activate; 1278 $self->activate;
1271 } 1279 }
1272 1280
1281 Coro::cede;
1282
1273 $self->in_memory (cf::MAP_IN_MEMORY); 1283 $self->in_memory (cf::MAP_IN_MEMORY);
1274} 1284}
1275 1285
1276sub load_map_sync { 1286sub find_sync {
1277 my ($path, $origin) = @_; 1287 my ($path, $origin) = @_;
1278 1288
1279 #warn "load_map_sync<$path, $origin>\n";#d# 1289 cf::sync_job { cf::map::find $path, $origin }
1290}
1280 1291
1281 cf::sync_job { 1292sub do_load_sync {
1282 my $map = cf::map::find_map $path, $origin 1293 my ($map) = @_;
1283 or return; 1294
1284 $map->load; 1295 cf::sync_job { $map->load };
1285 $map
1286 }
1287} 1296}
1288 1297
1289sub save { 1298sub save {
1290 my ($self) = @_; 1299 my ($self) = @_;
1291 1300
1301 my $lock = cf::lock_acquire "map_data:" . $self->path;
1302
1292 $self->{last_save} = $cf::RUNTIME; 1303 $self->{last_save} = $cf::RUNTIME;
1293 1304
1294 return unless $self->dirty; 1305 return unless $self->dirty;
1295 1306
1296 my $save = $self->{path}->save_path; utf8::encode $save; 1307 my $save = $self->{path}->save_path; utf8::encode $save;
1297 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1308 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1298 1309
1299 $self->{load_path} = $save; 1310 $self->{load_path} = $save;
1300 1311
1301 return if $self->{deny_save}; 1312 return if $self->{deny_save};
1313
1314 local $self->{last_access} = $self->last_access;#d#
1302 1315
1303 if ($uniq) { 1316 if ($uniq) {
1304 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1305 $self->save_objects ($uniq, cf::IO_UNIQUES); 1318 $self->save_objects ($uniq, cf::IO_UNIQUES);
1306 } else { 1319 } else {
… …
1309} 1322}
1310 1323
1311sub swap_out { 1324sub swap_out {
1312 my ($self) = @_; 1325 my ($self) = @_;
1313 1326
1327 # save first because save cedes
1328 $self->save;
1329
1330 my $lock = cf::lock_acquire "map_data:" . $self->path;
1331
1314 return if $self->players; 1332 return if $self->players;
1315 return if $self->in_memory != cf::MAP_IN_MEMORY; 1333 return if $self->in_memory != cf::MAP_IN_MEMORY;
1316 return if $self->{deny_save}; 1334 return if $self->{deny_save};
1317 1335
1318 $self->save;
1319 $self->clear; 1336 $self->clear;
1320 $self->in_memory (cf::MAP_SWAPPED); 1337 $self->in_memory (cf::MAP_SWAPPED);
1321} 1338}
1322 1339
1323sub reset_at { 1340sub reset_at {
… …
1361} 1378}
1362 1379
1363sub reset { 1380sub reset {
1364 my ($self) = @_; 1381 my ($self) = @_;
1365 1382
1383 my $lock = cf::lock_acquire "map_data:" . $self->path;
1384
1366 return if $self->players; 1385 return if $self->players;
1367 return if $self->{path}{user_rel};#d# 1386 return if $self->{path}{user_rel};#d#
1368 1387
1369 warn "resetting map ", $self->path;#d# 1388 warn "resetting map ", $self->path;#d#
1370 1389
… …
1389 1408
1390sub customise_for { 1409sub customise_for {
1391 my ($map, $ob) = @_; 1410 my ($map, $ob) = @_;
1392 1411
1393 if ($map->per_player) { 1412 if ($map->per_player) {
1394 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1413 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1395 } 1414 }
1396 1415
1397 $map 1416 $map
1398} 1417}
1399 1418
1400sub emergency_save { 1419sub emergency_save {
1401 local $cf::FREEZE = 1; 1420 my $freeze_guard = cf::freeze_mainloop;
1402 1421
1403 warn "enter emergency map save\n"; 1422 warn "enter emergency map save\n";
1404 1423
1405 cf::sync_job { 1424 cf::sync_job {
1406 warn "begin emergency map save\n"; 1425 warn "begin emergency map save\n";
… …
1496 my $link_pos = delete $self->{_link_pos}; 1515 my $link_pos = delete $self->{_link_pos};
1497 1516
1498 unless ($map) { 1517 unless ($map) {
1499 # restore original map position 1518 # restore original map position
1500 ($map, $x, $y) = @{ $link_pos || [] }; 1519 ($map, $x, $y) = @{ $link_pos || [] };
1501 $map = cf::map::find_map $map; 1520 $map = cf::map::find $map;
1502 1521
1503 unless ($map) { 1522 unless ($map) {
1504 ($map, $x, $y) = @$EMERGENCY_POSITION; 1523 ($map, $x, $y) = @$EMERGENCY_POSITION;
1505 $map = cf::map::find_map $map 1524 $map = cf::map::find $map
1506 or die "FATAL: cannot load emergency map\n"; 1525 or die "FATAL: cannot load emergency map\n";
1507 } 1526 }
1508 } 1527 }
1509 1528
1510 ($x, $y) = (-1, -1) 1529 ($x, $y) = (-1, -1)
… …
1536 1555
1537 # try to abort aborted map switching on player login :) 1556 # try to abort aborted map switching on player login :)
1538 # should happen only on crashes 1557 # should happen only on crashes
1539 if ($pl->ob->{_link_pos}) { 1558 if ($pl->ob->{_link_pos}) {
1540 $pl->ob->enter_link; 1559 $pl->ob->enter_link;
1541 Coro::async { 1560 cf::async {
1542 # we need this sleep as the login has a concurrent enter_exit running 1561 # we need this sleep as the login has a concurrent enter_exit running
1543 # and this sleep increases chances of the player not ending up in scorn 1562 # and this sleep increases chances of the player not ending up in scorn
1544 Coro::Timer::sleep 1; 1563 Coro::Timer::sleep 1;
1545 $pl->ob->leave_link; 1564 $pl->ob->leave_link;
1546 }; 1565 };
1547 } 1566 }
1548 }, 1567 },
1549); 1568);
1550 1569
1551=item $player_object->goto_map ($path, $x, $y) 1570=item $player_object->goto ($path, $x, $y)
1552 1571
1553=cut 1572=cut
1554 1573
1555sub cf::object::player::goto_map { 1574sub cf::object::player::goto {
1556 my ($self, $path, $x, $y) = @_; 1575 my ($self, $path, $x, $y) = @_;
1557 1576
1558 $self->enter_link; 1577 $self->enter_link;
1559 1578
1560 (Coro::async { 1579 (cf::async {
1561 $path = new cf::path $path; 1580 $path = new cf::path $path;
1562 1581
1563 my $map = cf::map::find_map $path->as_string; 1582 my $map = cf::map::find $path->as_string;
1564 $map = $map->customise_for ($self) if $map; 1583 $map = $map->customise_for ($self) if $map;
1565 1584
1566# warn "entering ", $map->path, " at ($x, $y)\n" 1585# warn "entering ", $map->path, " at ($x, $y)\n"
1567# if $map; 1586# if $map;
1568 1587
… …
1627 1646
1628 return unless $self->type == cf::PLAYER; 1647 return unless $self->type == cf::PLAYER;
1629 1648
1630 $self->enter_link; 1649 $self->enter_link;
1631 1650
1632 (Coro::async { 1651 (cf::async {
1652 $self->deactivate_recursive; # just to be sure
1633 unless (eval { 1653 unless (eval {
1634
1635 prepare_random_map $exit 1654 prepare_random_map $exit
1636 if $exit->slaying eq "/!"; 1655 if $exit->slaying eq "/!";
1637 1656
1638 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1657 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1639 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1658 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1640 1659
1641 1; 1660 1;
1642 }) { 1661 }) {
1643 $self->message ("Something went wrong deep within the crossfire server. " 1662 $self->message ("Something went wrong deep within the crossfire server. "
1644 . "I'll try to bring you back to the map you were before. " 1663 . "I'll try to bring you back to the map you were before. "
… …
1701 on_reply => sub { 1720 on_reply => sub {
1702 my ($ns, $msg) = @_; 1721 my ($ns, $msg) = @_;
1703 1722
1704 # this weird shuffling is so that direct followup queries 1723 # this weird shuffling is so that direct followup queries
1705 # get handled first 1724 # get handled first
1706 my $queue = delete $ns->{query_queue}; 1725 my $queue = delete $ns->{query_queue}
1726 or return; # be conservative, not sure how that can happen, but we saw a crash here
1707 1727
1708 (shift @$queue)->[1]->($msg); 1728 (shift @$queue)->[1]->($msg);
1709 1729
1710 push @{ $ns->{query_queue} }, @$queue; 1730 push @{ $ns->{query_queue} }, @$queue;
1711 1731
… …
1728=cut 1748=cut
1729 1749
1730sub cf::client::coro { 1750sub cf::client::coro {
1731 my ($self, $cb) = @_; 1751 my ($self, $cb) = @_;
1732 1752
1733 my $coro; $coro = async { 1753 my $coro = &cf::async ($cb);
1734 eval {
1735 $cb->();
1736 };
1737 warn $@ if $@;
1738 };
1739 1754
1740 $coro->on_destroy (sub { 1755 $coro->on_destroy (sub {
1741 delete $self->{_coro}{$coro+0}; 1756 delete $self->{_coro}{$coro+0};
1742 }); 1757 });
1743 1758
… …
1978 open my $fh, "<:utf8", cf::confdir . "/config" 1993 open my $fh, "<:utf8", cf::confdir . "/config"
1979 or return; 1994 or return;
1980 1995
1981 local $/; 1996 local $/;
1982 *CFG = YAML::Syck::Load <$fh>; 1997 *CFG = YAML::Syck::Load <$fh>;
1998
1999 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2000
2001 if (exists $CFG{mlockall}) {
2002 eval {
2003 $CFG{mlockall} ? &mlockall : &munlockall
2004 and die "WARNING: m(un)lockall failed: $!\n";
2005 };
2006 warn $@ if $@;
2007 }
1983} 2008}
1984 2009
1985sub main { 2010sub main {
1986 # we must not ever block the main coroutine 2011 # we must not ever block the main coroutine
1987 local $Coro::idle = sub { 2012 local $Coro::idle = sub {
… …
2007 return; 2032 return;
2008 } 2033 }
2009 2034
2010 warn "reloading..."; 2035 warn "reloading...";
2011 2036
2012 local $FREEZE = 1; 2037 my $guard = freeze_mainloop;
2013 cf::emergency_save; 2038 cf::emergency_save;
2014 2039
2015 eval { 2040 eval {
2016 # if anything goes wrong in here, we should simply crash as we already saved 2041 # if anything goes wrong in here, we should simply crash as we already saved
2017 2042
… …
2153 reentrant => 0, 2178 reentrant => 0,
2154 prio => 0, 2179 prio => 0,
2155 at => $NEXT_TICK || $TICK, 2180 at => $NEXT_TICK || $TICK,
2156 data => WF_AUTOCANCEL, 2181 data => WF_AUTOCANCEL,
2157 cb => sub { 2182 cb => sub {
2158 unless ($FREEZE) {
2159 cf::server_tick; # one server iteration 2183 cf::server_tick; # one server iteration
2160 $RUNTIME += $TICK; 2184 $RUNTIME += $TICK;
2161 }
2162
2163 $NEXT_TICK += $TICK; 2185 $NEXT_TICK += $TICK;
2164 2186
2165 # if we are delayed by four ticks or more, skip them all 2187 # if we are delayed by four ticks or more, skip them all
2166 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2188 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2167 2189
… …
2190 or warn "ERROR: unable to write runtime file: $!"; 2212 or warn "ERROR: unable to write runtime file: $!";
2191 })->(); 2213 })->();
2192 }, 2214 },
2193); 2215);
2194 2216
2217END { cf::emergency_save }
2218
21951 22191
2196 2220

Diff Legend

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