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.132 by root, Thu Jan 4 01:35:56 2007 UTC vs.
Revision 1.138 by root, Fri Jan 5 17:07:17 2007 UTC

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;
180sub to_json($) { 179sub to_json($) {
181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
183} 182}
184 183
185=item my $guard = cf::guard { BLOCK }
186
187Run the given callback when the guard object gets destroyed (useful for
188coroutine cancellations).
189
190You can call C<< ->cancel >> on the guard object to stop the block from
191being executed.
192
193=cut
194
195sub guard(&) {
196 bless \(my $cb = $_[0]), cf::guard::;
197}
198
199sub cf::guard::cancel {
200 ${$_[0]} = sub { };
201}
202
203sub cf::guard::DESTROY {
204 ${$_[0]}->();
205}
206
207=item cf::lock_wait $string 184=item cf::lock_wait $string
208 185
209Wait until the given lock is available. See cf::lock_acquire. 186Wait until the given lock is available. See cf::lock_acquire.
210 187
211=item my $lock = cf::lock_acquire $string 188=item my $lock = cf::lock_acquire $string
212 189
213Wait 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
214a 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,
215for example when the coroutine gets canceled), the lock is automatically 192for example when the coroutine gets canceled), the lock is automatically
216returned. 193returned.
217 194
218Lock names should begin with a unique identifier (for example, find_map 195Lock names should begin with a unique identifier (for example, cf::map::find
219uses map_find and load_map uses map_load). 196uses map_find and cf::map::load uses map_load).
220 197
221=cut 198=cut
222 199
223our %LOCK; 200our %LOCK;
224 201
238 # wait, to be sure we are not locked 215 # wait, to be sure we are not locked
239 lock_wait $key; 216 lock_wait $key;
240 217
241 $LOCK{$key} = []; 218 $LOCK{$key} = [];
242 219
243 cf::guard { 220 Coro::guard {
244 # wake up all waiters, to be on the safe side 221 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} }; 222 $_->ready for @{ delete $LOCK{$key} };
246 } 223 }
247} 224}
248 225
249=item cf::async { BLOCK } 226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
250 228
251Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 229 my $guard = Coro::guard { $TICK_WATCHER->start };
252error instead of exiting the server in case of a problem. 230 $TICK_WATCHER->stop;
253 231 $guard
254=cut
255
256sub async(&) {
257 my ($cb) = @_;
258
259 Coro::async {
260 eval { $cb->() };
261 warn $@ if $@;
262 }
263} 232}
264 233
265=item cf::sync_job { BLOCK } 234=item cf::sync_job { BLOCK }
266 235
267The design of crossfire+ requires that the main coro ($Coro::main) is 236The design of crossfire+ requires that the main coro ($Coro::main) is
282 # this is the main coro, too bad, we have to block 251 # this is the main coro, too bad, we have to block
283 # till the operation succeeds, freezing the server :/ 252 # till the operation succeeds, freezing the server :/
284 253
285 # TODO: use suspend/resume instead 254 # TODO: use suspend/resume instead
286 # (but this is cancel-safe) 255 # (but this is cancel-safe)
287 local $FREEZE = 1; 256 my $freeze_guard = freeze_mainloop;
288 257
289 my $busy = 1; 258 my $busy = 1;
290 my @res; 259 my @res;
291 260
292 (Coro::async { 261 (Coro::async_pool {
293 @res = eval { $job->() }; 262 @res = eval { $job->() };
294 warn $@ if $@; 263 warn $@ if $@;
295 undef $busy; 264 undef $busy;
296 })->prio (Coro::PRIO_MAX); 265 })->prio (Coro::PRIO_MAX);
297 266
308 } 277 }
309} 278}
310 279
311=item $coro = cf::coro { BLOCK } 280=item $coro = cf::coro { BLOCK }
312 281
313Creates and returns a new coro. This coro is automcatially being canceled 282Creates (and readies) and returns a new coro. This coro is automcatially
314when the extension calling this is being unloaded. 283being canceled when the extension calling this is being unloaded.
315 284
316=cut 285=cut
317 286
318sub coro(&) { 287sub coro(&) {
319 my $cb = shift; 288 my $cb = shift;
320 289
321 my $coro = &cf::async ($cb); 290 my $coro = &Coro::async_pool ($cb);
322 291
323 $coro->on_destroy (sub { 292 $coro->on_destroy (sub {
324 delete $EXT_CORO{$coro+0}; 293 delete $EXT_CORO{$coro+0};
325 }); 294 });
326 $EXT_CORO{$coro+0} = $coro; 295 $EXT_CORO{$coro+0} = $coro;
1136package cf::map; 1105package cf::map;
1137 1106
1138use Fcntl; 1107use Fcntl;
1139use Coro::AIO; 1108use Coro::AIO;
1140 1109
1141our $MAX_RESET = 7200; 1110our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1111our $DEFAULT_RESET = 3000;
1143 1112
1144sub generate_random_map { 1113sub generate_random_map {
1145 my ($path, $rmp) = @_; 1114 my ($path, $rmp) = @_;
1146 1115
1147 # mit "rum" bekleckern, nicht 1116 # mit "rum" bekleckern, nicht
1177 or return; 1146 or return;
1178 1147
1179 my $map = cf::map::new 1148 my $map = cf::map::new
1180 or return; 1149 or return;
1181 1150
1151 # for better error messages only, will be overwritten
1152 $map->path ($path);
1153
1182 $map->load_header ($path) 1154 $map->load_header ($path)
1183 or return; 1155 or return;
1184 1156
1185 $map->{load_path} = $path; 1157 $map->{load_path} = $path;
1186 1158
1187 $map 1159 $map
1188} 1160}
1189 1161
1190sub find_map; 1162sub find;
1191sub find_map { 1163sub find {
1192 my ($path, $origin) = @_; 1164 my ($path, $origin) = @_;
1193 1165
1194 #warn "find_map<$path,$origin>\n";#d# 1166 #warn "find<$path,$origin>\n";#d#
1195 1167
1196 $path = new cf::path $path, $origin && $origin->path; 1168 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1169 my $key = $path->as_string;
1198 1170
1199 cf::lock_wait "map_find:$key"; 1171 cf::lock_wait "map_find:$key";
1201 $cf::MAP{$key} || do { 1173 $cf::MAP{$key} || do {
1202 my $guard = cf::lock_acquire "map_find:$key"; 1174 my $guard = cf::lock_acquire "map_find:$key";
1203 1175
1204 # do it the slow way 1176 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1177 my $map = try_load_header $path->save_path;
1178
1179 Coro::cede;
1206 1180
1207 if ($map) { 1181 if ($map) {
1208 $map->last_access ((delete $map->{last_access}) 1182 $map->last_access ((delete $map->{last_access})
1209 || $cf::RUNTIME); #d# 1183 || $cf::RUNTIME); #d#
1210 # safety 1184 # safety
1230 1204
1231 $map->path ($key); 1205 $map->path ($key);
1232 $map->{path} = $path; 1206 $map->{path} = $path;
1233 $map->{last_save} = $cf::RUNTIME; 1207 $map->{last_save} = $cf::RUNTIME;
1234 1208
1209 Coro::cede;
1210
1235 if ($map->should_reset) { 1211 if ($map->should_reset) {
1236 $map->reset; 1212 $map->reset;
1237 undef $guard; 1213 undef $guard;
1238 $map = find_map $path 1214 $map = find $path
1239 or return; 1215 or return;
1240 } 1216 }
1241 1217
1242 $cf::MAP{$key} = $map 1218 $cf::MAP{$key} = $map
1243 } 1219 }
1265 if (aio_open $uniq, O_RDONLY, 0) { 1241 if (aio_open $uniq, O_RDONLY, 0) {
1266 $self->clear_unique_items; 1242 $self->clear_unique_items;
1267 $self->load_objects ($uniq, 0); 1243 $self->load_objects ($uniq, 0);
1268 } 1244 }
1269 } 1245 }
1246
1247 Coro::cede;
1270 1248
1271 # now do the right thing for maps 1249 # now do the right thing for maps
1272 $self->link_multipart_objects; 1250 $self->link_multipart_objects;
1273 1251
1274 if ($self->{path}->is_style_map) { 1252 if ($self->{path}->is_style_map) {
1282 $self->difficulty ($self->estimate_difficulty) 1260 $self->difficulty ($self->estimate_difficulty)
1283 unless $self->difficulty; 1261 unless $self->difficulty;
1284 $self->activate; 1262 $self->activate;
1285 } 1263 }
1286 1264
1265 Coro::cede;
1266
1287 $self->in_memory (cf::MAP_IN_MEMORY); 1267 $self->in_memory (cf::MAP_IN_MEMORY);
1288} 1268}
1289 1269
1290sub load_map_sync { 1270sub find_sync {
1291 my ($path, $origin) = @_; 1271 my ($path, $origin) = @_;
1292 1272
1293 #warn "load_map_sync<$path, $origin>\n";#d# 1273 cf::sync_job { cf::map::find $path, $origin }
1274}
1294 1275
1295 cf::sync_job { 1276sub do_load_sync {
1296 my $map = cf::map::find_map $path, $origin 1277 my ($map) = @_;
1297 or return; 1278
1298 $map->load; 1279 cf::sync_job { $map->load };
1299 $map
1300 }
1301} 1280}
1302 1281
1303sub save { 1282sub save {
1304 my ($self) = @_; 1283 my ($self) = @_;
1284
1285 my $lock = cf::lock_acquire "map_data:" . $self->path;
1305 1286
1306 $self->{last_save} = $cf::RUNTIME; 1287 $self->{last_save} = $cf::RUNTIME;
1307 1288
1308 return unless $self->dirty; 1289 return unless $self->dirty;
1309 1290
1328 my ($self) = @_; 1309 my ($self) = @_;
1329 1310
1330 # save first because save cedes 1311 # save first because save cedes
1331 $self->save; 1312 $self->save;
1332 1313
1314 my $lock = cf::lock_acquire "map_data:" . $self->path;
1315
1333 return if $self->players; 1316 return if $self->players;
1334 return if $self->in_memory != cf::MAP_IN_MEMORY; 1317 return if $self->in_memory != cf::MAP_IN_MEMORY;
1335 return if $self->{deny_save}; 1318 return if $self->{deny_save};
1336 1319
1337 $self->clear; 1320 $self->clear;
1379} 1362}
1380 1363
1381sub reset { 1364sub reset {
1382 my ($self) = @_; 1365 my ($self) = @_;
1383 1366
1367 my $lock = cf::lock_acquire "map_data:" . $self->path;
1368
1384 return if $self->players; 1369 return if $self->players;
1385 return if $self->{path}{user_rel};#d# 1370 return if $self->{path}{user_rel};#d#
1386 1371
1387 warn "resetting map ", $self->path;#d# 1372 warn "resetting map ", $self->path;#d#
1388 1373
1407 1392
1408sub customise_for { 1393sub customise_for {
1409 my ($map, $ob) = @_; 1394 my ($map, $ob) = @_;
1410 1395
1411 if ($map->per_player) { 1396 if ($map->per_player) {
1412 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1397 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1413 } 1398 }
1414 1399
1415 $map 1400 $map
1416} 1401}
1417 1402
1418sub emergency_save { 1403sub emergency_save {
1419 local $cf::FREEZE = 1; 1404 my $freeze_guard = cf::freeze_mainloop;
1420 1405
1421 warn "enter emergency map save\n"; 1406 warn "enter emergency map save\n";
1422 1407
1423 cf::sync_job { 1408 cf::sync_job {
1424 warn "begin emergency map save\n"; 1409 warn "begin emergency map save\n";
1514 my $link_pos = delete $self->{_link_pos}; 1499 my $link_pos = delete $self->{_link_pos};
1515 1500
1516 unless ($map) { 1501 unless ($map) {
1517 # restore original map position 1502 # restore original map position
1518 ($map, $x, $y) = @{ $link_pos || [] }; 1503 ($map, $x, $y) = @{ $link_pos || [] };
1519 $map = cf::map::find_map $map; 1504 $map = cf::map::find $map;
1520 1505
1521 unless ($map) { 1506 unless ($map) {
1522 ($map, $x, $y) = @$EMERGENCY_POSITION; 1507 ($map, $x, $y) = @$EMERGENCY_POSITION;
1523 $map = cf::map::find_map $map 1508 $map = cf::map::find $map
1524 or die "FATAL: cannot load emergency map\n"; 1509 or die "FATAL: cannot load emergency map\n";
1525 } 1510 }
1526 } 1511 }
1527 1512
1528 ($x, $y) = (-1, -1) 1513 ($x, $y) = (-1, -1)
1554 1539
1555 # try to abort aborted map switching on player login :) 1540 # try to abort aborted map switching on player login :)
1556 # should happen only on crashes 1541 # should happen only on crashes
1557 if ($pl->ob->{_link_pos}) { 1542 if ($pl->ob->{_link_pos}) {
1558 $pl->ob->enter_link; 1543 $pl->ob->enter_link;
1559 cf::async { 1544 Coro::async_pool {
1560 # we need this sleep as the login has a concurrent enter_exit running 1545 # we need this sleep as the login has a concurrent enter_exit running
1561 # and this sleep increases chances of the player not ending up in scorn 1546 # and this sleep increases chances of the player not ending up in scorn
1562 Coro::Timer::sleep 1; 1547 Coro::Timer::sleep 1;
1563 $pl->ob->leave_link; 1548 $pl->ob->leave_link;
1564 }; 1549 };
1565 } 1550 }
1566 }, 1551 },
1567); 1552);
1568 1553
1569=item $player_object->goto_map ($path, $x, $y) 1554=item $player_object->goto ($path, $x, $y)
1570 1555
1571=cut 1556=cut
1572 1557
1573sub cf::object::player::goto_map { 1558sub cf::object::player::goto {
1574 my ($self, $path, $x, $y) = @_; 1559 my ($self, $path, $x, $y) = @_;
1575 1560
1576 $self->enter_link; 1561 $self->enter_link;
1577 1562
1578 (cf::async { 1563 (Coro::async_pool {
1579 $path = new cf::path $path; 1564 $path = new cf::path $path;
1580 1565
1581 my $map = cf::map::find_map $path->as_string; 1566 my $map = cf::map::find $path->as_string;
1582 $map = $map->customise_for ($self) if $map; 1567 $map = $map->customise_for ($self) if $map;
1583 1568
1584# warn "entering ", $map->path, " at ($x, $y)\n" 1569# warn "entering ", $map->path, " at ($x, $y)\n"
1585# if $map; 1570# if $map;
1586 1571
1645 1630
1646 return unless $self->type == cf::PLAYER; 1631 return unless $self->type == cf::PLAYER;
1647 1632
1648 $self->enter_link; 1633 $self->enter_link;
1649 1634
1650 (cf::async { 1635 (Coro::async_pool {
1636 $self->deactivate_recursive; # just to be sure
1651 unless (eval { 1637 unless (eval {
1652 prepare_random_map $exit 1638 prepare_random_map $exit
1653 if $exit->slaying eq "/!"; 1639 if $exit->slaying eq "/!";
1654 1640
1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1641 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1656 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1642 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1657 1643
1658 1; 1644 1;
1659 }) { 1645 }) {
1660 $self->message ("Something went wrong deep within the crossfire server. " 1646 $self->message ("Something went wrong deep within the crossfire server. "
1661 . "I'll try to bring you back to the map you were before. " 1647 . "I'll try to bring you back to the map you were before. "
1746=cut 1732=cut
1747 1733
1748sub cf::client::coro { 1734sub cf::client::coro {
1749 my ($self, $cb) = @_; 1735 my ($self, $cb) = @_;
1750 1736
1751 my $coro = &cf::async ($cb); 1737 my $coro = &Coro::async_pool ($cb);
1752 1738
1753 $coro->on_destroy (sub { 1739 $coro->on_destroy (sub {
1754 delete $self->{_coro}{$coro+0}; 1740 delete $self->{_coro}{$coro+0};
1755 }); 1741 });
1756 1742
2030 return; 2016 return;
2031 } 2017 }
2032 2018
2033 warn "reloading..."; 2019 warn "reloading...";
2034 2020
2035 local $FREEZE = 1; 2021 my $guard = freeze_mainloop;
2036 cf::emergency_save; 2022 cf::emergency_save;
2037 2023
2038 eval { 2024 eval {
2039 # if anything goes wrong in here, we should simply crash as we already saved 2025 # if anything goes wrong in here, we should simply crash as we already saved
2040 2026
2176 reentrant => 0, 2162 reentrant => 0,
2177 prio => 0, 2163 prio => 0,
2178 at => $NEXT_TICK || $TICK, 2164 at => $NEXT_TICK || $TICK,
2179 data => WF_AUTOCANCEL, 2165 data => WF_AUTOCANCEL,
2180 cb => sub { 2166 cb => sub {
2181 unless ($FREEZE) {
2182 cf::server_tick; # one server iteration 2167 cf::server_tick; # one server iteration
2183 $RUNTIME += $TICK; 2168 $RUNTIME += $TICK;
2184 }
2185
2186 $NEXT_TICK += $TICK; 2169 $NEXT_TICK += $TICK;
2187 2170
2188 # if we are delayed by four ticks or more, skip them all 2171 # if we are delayed by four ticks or more, skip them all
2189 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2190 2173

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines