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.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.194 by root, Wed Jan 24 22:42: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.5 ();
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;
… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
… …
257} 259}
258 260
259sub freeze_mainloop { 261sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
261 263
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
264 $guard 270 $guard
265} 271}
266 272
267=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
338 344
339 $coro 345 $coro
340} 346}
341 347
342sub write_runtime { 348sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
345 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
346 350
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 352 or return;
349 353
354 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 359 and return;
353 360
354 aio_fsync $fh 361 aio_fsync $fh
355 and return; 362 and return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 507our @CB_MAP = ();
501 508
502my %attachment; 509my %attachment;
503 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
504sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
506 519
507 use sort 'stable'; 520 use sort 'stable';
508 521
… …
679# object support 692# object support
680 693
681sub reattach { 694sub reattach {
682 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 699
685 my $registry = $obj->registry; 700 my $registry = $obj->registry;
686 701
687 @$registry = (); 702 @$registry = ();
688 703
… …
900 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
901 } 916 }
902} 917}
903 918
904############################################################################# 919#############################################################################
905# load/save/clean perl data associated with a map
906
907*cf::mapsupport::on_clean = sub {
908 my ($map) = @_;
909
910 my $path = $map->tmpname;
911 defined $path or return;
912
913 unlink "$path.pst";
914};
915
916cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918#############################################################################
919 920
920=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
921 922
922Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
923 924
… …
959 960
960sub exists($) { 961sub exists($) {
961 my ($login) = @_; 962 my ($login) = @_;
962 963
963 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
965} 966}
966 967
967sub find($) { 968sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 970 my $login = $_[0];
… …
1077 for (@$files) { 1078 for (@$files) {
1078 utf8::decode $_; 1079 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1081 next unless /^$PATH_SEP/o;
1081 1082
1083 s/\.map$//;
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1083 } 1085 }
1084 1086
1085 \@paths 1087 \@paths
1086} 1088}
… …
1114 1116
1115use Fcntl; 1117use Fcntl;
1116use Coro::AIO; 1118use Coro::AIO;
1117 1119
1118use overload 1120use overload
1119 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1120 1123
1121our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1123 1126
1124sub generate_random_map { 1127sub generate_random_map {
1125 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1130 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1142 )
1141} 1143}
1142 1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1143sub register { 1153sub register {
1144 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1155 my $pkg = caller;
1146 1156
1147 no strict; 1157 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1159
1150 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1161}
1152 1162
1153# also paths starting with '/' 1163# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1155 1177
1156sub normalise { 1178sub normalise {
1157 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1180
1181 $path = "$path"; # make sure its a string
1158 1182
1159 # map plan: 1183 # map plan:
1160 # 1184 #
1161 # /! non-realised random map exit (special hack!) 1185 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched 1186 # {... are special paths that are not being touched
… …
1190 1214
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1215 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192 1216
1193 $path = normalise $path, $base; 1217 $path = normalise $path, $base;
1194 1218
1195 for my $pkg (keys %EXT_MAP) { 1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1221 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1222 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1223 $self->init; # pass $1 etc.
1200 return $self; 1224 return $self;
1201 } 1225 }
1202 } 1226 }
1203 1227
1204 Carp::carp "unable to resolve path '$path'."; 1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1205 () 1229 ()
1206} 1230}
1207 1231
1208sub init { 1232sub init {
1209 my ($self) = @_; 1233 my ($self) = @_;
… …
1220# the displayed name, this is a one way mapping 1244# the displayed name, this is a one way mapping
1221sub visible_name { 1245sub visible_name {
1222 &as_string 1246 &as_string
1223} 1247}
1224 1248
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location 1249# the original (read-only) location
1233sub load_path { 1250sub load_path {
1234 my ($self) = @_; 1251 my ($self) = @_;
1235 1252
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
… …
1238 1255
1239# the temporary/swap location 1256# the temporary/swap location
1240sub save_path { 1257sub save_path {
1241 my ($self) = @_; 1258 my ($self) = @_;
1242 1259
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1244} 1262}
1245 1263
1246# the unique path, undef == no special unique path 1264# the unique path, undef == no special unique path
1247sub uniq_path { 1265sub uniq_path {
1248 my ($self) = @_; 1266 my ($self) = @_;
1249 1267
1268 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1269 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1270}
1252 1271
1253# and all this just because we cannot iterate over 1272# and all this just because we cannot iterate over
1254# all maps in C++... 1273# all maps in C++...
1255sub change_all_map_light { 1274sub change_all_map_light {
… …
1261 1280
1262sub unlink_save { 1281sub unlink_save {
1263 my ($self) = @_; 1282 my ($self) = @_;
1264 1283
1265 utf8::encode (my $save = $self->save_path); 1284 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1287}
1269 1288
1270sub load_header_from($) { 1289sub load_header_from($) {
1271 my ($self, $path) = @_; 1290 my ($self, $path) = @_;
1272 1291
… …
1280 $self->{load_path} = $path; 1299 $self->{load_path} = $path;
1281 1300
1282 1 1301 1
1283} 1302}
1284 1303
1285sub load_orig { 1304sub load_header_orig {
1286 my ($self) = @_; 1305 my ($self) = @_;
1287 1306
1288 $self->load_header_from ($self->load_path) 1307 $self->load_header_from ($self->load_path)
1289} 1308}
1290 1309
1291sub load_temp { 1310sub load_header_temp {
1292 my ($self) = @_; 1311 my ($self) = @_;
1293 1312
1294 $self->load_header_from ($self->save_path) 1313 $self->load_header_from ($self->save_path)
1314}
1315
1316sub prepare_temp {
1317 my ($self) = @_;
1318
1319 $self->last_access ((delete $self->{last_access})
1320 || $cf::RUNTIME); #d#
1321 # safety
1322 $self->{instantiate_time} = $cf::RUNTIME
1323 if $self->{instantiate_time} > $cf::RUNTIME;
1324}
1325
1326sub prepare_orig {
1327 my ($self) = @_;
1328
1329 $self->{load_original} = 1;
1330 $self->{instantiate_time} = $cf::RUNTIME;
1331 $self->last_access ($cf::RUNTIME);
1332 $self->instantiate;
1295} 1333}
1296 1334
1297sub load_header { 1335sub load_header {
1298 my ($self) = @_; 1336 my ($self) = @_;
1299 1337
1300 if ($self->load_temp) { 1338 if ($self->load_header_temp) {
1301 $self->last_access ((delete $self->{last_access}) 1339 $self->prepare_temp;
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else { 1340 } else {
1307 $self->load_orig 1341 $self->load_header_orig
1308 or return; 1342 or return;
1309 1343 $self->prepare_orig;
1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 } 1344 }
1315 1345
1316 1 1346 1
1317} 1347}
1318 1348
… …
1333 1363
1334 $map->load_header 1364 $map->load_header
1335 or return; 1365 or return;
1336 1366
1337 if ($map->should_reset) { 1367 if ($map->should_reset) {
1368 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1370 $map->reset;
1339 undef $guard; 1371 undef $guard;
1340 $map = find $path 1372 return find $path;
1341 or return;
1342 } 1373 }
1343 1374
1344 $cf::MAP{$path} = $map 1375 $cf::MAP{$path} = $map
1345 } 1376 }
1346} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1347 1381
1348sub load { 1382sub load {
1349 my ($self) = @_; 1383 my ($self) = @_;
1350 1384
1351 my $path = $self->{path}; 1385 my $path = $self->{path};
… …
1354 return if $self->in_memory != cf::MAP_SWAPPED; 1388 return if $self->in_memory != cf::MAP_SWAPPED;
1355 1389
1356 $self->in_memory (cf::MAP_LOADING); 1390 $self->in_memory (cf::MAP_LOADING);
1357 1391
1358 $self->alloc; 1392 $self->alloc;
1393
1394 $self->pre_load;
1395
1359 $self->_load_objects ($self->{load_path}, 1) 1396 $self->_load_objects ($self->{load_path}, 1)
1360 or return; 1397 or return;
1361 1398
1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1399 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1363 if delete $self->{load_original}; 1400 if delete $self->{load_original};
… …
1385 unless $self->difficulty; 1422 unless $self->difficulty;
1386 Coro::cede; 1423 Coro::cede;
1387 $self->activate; 1424 $self->activate;
1388 } 1425 }
1389 1426
1427 $self->post_load;
1428
1390 $self->in_memory (cf::MAP_IN_MEMORY); 1429 $self->in_memory (cf::MAP_IN_MEMORY);
1391} 1430}
1392 1431
1393sub customise_for { 1432sub customise_for {
1394 my ($self, $ob) = @_; 1433 my ($self, $ob) = @_;
… …
1434 1473
1435 cf::sync_job { $map->load }; 1474 cf::sync_job { $map->load };
1436} 1475}
1437 1476
1438our %MAP_PREFETCH; 1477our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1478our $MAP_PREFETCHER = undef;
1440 while () {
1441 for my $path (keys %MAP_PREFETCH) {
1442 my $map = find $path
1443 or next;
1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1447 }
1448 Coro::schedule;
1449 }
1450};
1451 1479
1452sub find_async { 1480sub find_async {
1453 my ($path, $origin) = @_; 1481 my ($path, $origin) = @_;
1454 1482
1455 $path = normalise $path, $origin && $origin->{path}; 1483 $path = normalise $path, $origin && $origin->{path};
1456 1484
1457 if (my $map = $cf::MAP{$path}) { 1485 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1486 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 1487 }
1460 1488
1461 $MAP_PREFETCH{$path} = 0; 1489 undef $MAP_PREFETCH{$path};
1490 $MAP_PREFETCHER ||= cf::async {
1491 while (%MAP_PREFETCH) {
1492 for my $path (keys %MAP_PREFETCH) {
1493 my $map = find $path
1494 or next;
1495 $map->load;
1496
1497 delete $MAP_PREFETCH{$path};
1498 }
1499 }
1500 undef $MAP_PREFETCHER;
1501 };
1462 $MAP_PREFETCHER->ready; 1502 $MAP_PREFETCHER->prio (6);
1463 1503
1464 () 1504 ()
1465} 1505}
1466 1506
1467sub save { 1507sub save {
… …
1512 1552
1513sub reset_at { 1553sub reset_at {
1514 my ($self) = @_; 1554 my ($self) = @_;
1515 1555
1516 # TODO: safety, remove and allow resettable per-player maps 1556 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1557 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1558 return 1e99 if $self->{deny_reset};
1519 1559
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1560 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1561 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1562
… …
1527 my ($self) = @_; 1567 my ($self) = @_;
1528 1568
1529 $self->reset_at <= $cf::RUNTIME 1569 $self->reset_at <= $cf::RUNTIME
1530} 1570}
1531 1571
1532sub rename {
1533 my ($self, $new_path) = @_;
1534
1535 normalise $new_path;
1536
1537 $self->unlink_save;
1538
1539 delete $cf::MAP{$self->path};
1540 $self->{path} = $new_path; $self->path ($self->{path});
1541 $cf::MAP{$self->path} = $self;
1542
1543 $self->save;
1544}
1545
1546sub reset { 1572sub reset {
1547 my ($self) = @_; 1573 my ($self) = @_;
1548 1574
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1575 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1576
1551 return if $self->players; 1577 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1578 return if $self->isa ("ext::map_per_player");#d#
1553 1579
1554 warn "resetting map ", $self->path;#d# 1580 warn "resetting map ", $self->path;#d#
1555 1581
1556 delete $cf::MAP{$self->path}; 1582 delete $cf::MAP{$self->path};
1557 1583
1584 $self->in_memory (cf::MAP_SWAPPED);
1585 $self->clear;
1586
1558 $_->clear_links_to ($self) for values %cf::MAP; 1587 $_->clear_links_to ($self) for values %cf::MAP;
1559 1588
1560 $self->unlink_save; 1589 $self->unlink_save;
1561 $self->destroy; 1590 $self->destroy;
1562} 1591}
… …
1564my $nuke_counter = "aaaa"; 1593my $nuke_counter = "aaaa";
1565 1594
1566sub nuke { 1595sub nuke {
1567 my ($self) = @_; 1596 my ($self) = @_;
1568 1597
1598 delete $cf::MAP{$self->path};
1599
1600 $self->unlink_save;
1601
1602 bless $self, "cf::map";
1603 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1604 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1605 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1606 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1607
1608 $cf::MAP{$self->path} = $self;
1609
1572 $self->reset; # polite request, might not happen 1610 $self->reset; # polite request, might not happen
1573} 1611}
1574 1612
1575=item cf::map::unique_maps 1613=item cf::map::unique_maps
1576 1614
… …
1588 for (@$files) { 1626 for (@$files) {
1589 utf8::decode $_; 1627 utf8::decode $_;
1590 next if /\.pst$/; 1628 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1629 next unless /^$PATH_SEP/o;
1592 1630
1631 s/\.map$//;
1593 push @paths, $_; 1632 push @paths, $_;
1594 } 1633 }
1595 1634
1596 \@paths 1635 \@paths
1597} 1636}
… …
1709 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1748 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1749
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1751 if $self->map;
1713 1752
1714 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1753 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1754}
1716 1755
1717sub cf::object::player::leave_link { 1756sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1757 my ($self, $map, $x, $y) = @_;
1719 1758
… …
1806 1845
1807sub parse_random_map_params { 1846sub parse_random_map_params {
1808 my ($spec) = @_; 1847 my ($spec) = @_;
1809 1848
1810 my $rmp = { # defaults 1849 my $rmp = { # defaults
1811 xsize => 10, 1850 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1851 ysize => (cf::rndm 15, 40),
1852 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1853 #layout => string,
1813 }; 1854 };
1814 1855
1815 for (split /\n/, $spec) { 1856 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1857 my ($k, $v) = split /\s+/, $_, 2;
1817 1858
… …
1821 $rmp 1862 $rmp
1822} 1863}
1823 1864
1824sub prepare_random_map { 1865sub prepare_random_map {
1825 my ($exit) = @_; 1866 my ($exit) = @_;
1867
1868 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1869
1827 # all this does is basically replace the /! path by 1870 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1871 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1872 # that depends on the exit object
1830 1873
… …
1839 1882
1840 $rmp->{random_seed} ||= $exit->random_seed; 1883 $rmp->{random_seed} ||= $exit->random_seed;
1841 1884
1842 my $data = cf::to_json $rmp; 1885 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1886 my $md5 = Digest::MD5::md5_hex $data;
1887 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1888
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1889 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1890 aio_write $fh, 0, (length $data), $data, 0;
1891 undef $fh;
1892 aio_rename "$meta~", $meta;
1847 1893
1848 $exit->slaying ("?random/$md5"); 1894 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1895 $exit->msg (undef);
1850 } 1896 }
1851} 1897}
… …
2161 sub db_sync() { 2207 sub db_sync() {
2162 db_save if $dirty; 2208 db_save if $dirty;
2163 undef $dirty; 2209 undef $dirty;
2164 } 2210 }
2165 2211
2166 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2212 my $idle = Event->idle (
2167 db_sync; 2213 reentrant => 0,
2214 min => 10,
2215 max => 20,
2216 repeat => 0,
2217 data => WF_AUTOCANCEL,
2218 cb => \&db_sync,
2168 }); 2219 );
2169 2220
2170 sub db_dirty() { 2221 sub db_dirty() {
2171 $dirty = 1; 2222 $dirty = 1;
2172 $idle->start; 2223 $idle->start;
2173 } 2224 }
… …
2221 2272
2222sub main { 2273sub main {
2223 # we must not ever block the main coroutine 2274 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2275 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2276 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2277 (async {
2226 async { Event::one_event }; 2278 Event::one_event;
2279 })->prio (Coro::PRIO_MAX);
2227 }; 2280 };
2228 2281
2229 cfg_load; 2282 cfg_load;
2230 db_load; 2283 db_load;
2231 load_extensions; 2284 load_extensions;
2285
2286 $TICK_WATCHER->start;
2232 Event::loop; 2287 Event::loop;
2233} 2288}
2234 2289
2235############################################################################# 2290#############################################################################
2236# initialisation and cleanup 2291# initialisation and cleanup
2237 2292
2238# install some emergency cleanup handlers 2293# install some emergency cleanup handlers
2239BEGIN { 2294BEGIN {
2240 for my $signal (qw(INT HUP TERM)) { 2295 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal ( 2296 Event->signal (
2297 reentrant => 0,
2242 data => WF_AUTOCANCEL, 2298 data => WF_AUTOCANCEL,
2243 signal => $signal, 2299 signal => $signal,
2300 prio => 0,
2244 cb => sub { 2301 cb => sub {
2245 cf::cleanup "SIG$signal"; 2302 cf::cleanup "SIG$signal";
2246 }, 2303 },
2247 ); 2304 );
2248 } 2305 }
2249} 2306}
… …
2254 warn "enter emergency perl save\n"; 2311 warn "enter emergency perl save\n";
2255 2312
2256 cf::sync_job { 2313 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2314 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2315 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2316 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2317 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2318 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2319 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2320 $pl->valid or next;
2264 $pl->save; 2321 $pl->save;
… …
2278} 2335}
2279 2336
2280sub reload() { 2337sub reload() {
2281 # can/must only be called in main 2338 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2339 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2340 warn "can only reload from main coroutine";
2284 return; 2341 return;
2285 } 2342 }
2286 2343
2287 warn "reloading..."; 2344 warn "reloading...";
2288 2345
2289 warn "freezing server"; 2346 warn "cancelling server ticker";
2290 my $guard = freeze_mainloop; 2347 $TICK_WATCHER->cancel;
2348
2291 cf::emergency_save; 2349 cf::emergency_save;
2292
2293 warn "sync database to disk";
2294 cf::db_sync;
2295 IO::AIO::flush;
2296 2350
2297 eval { 2351 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2352 # if anything goes wrong in here, we should simply crash as we already saved
2299 2353
2354 warn "syncing database to disk";
2355 cf::db_sync;
2356
2300 warn "cancel all watchers"; 2357 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2358 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2359 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2360 }
2304 2361
2362 warn "flushing outstanding aio requests";
2363 for (;;) {
2364 IO::AIO::flush;
2365 Coro::cede;
2366 last unless IO::AIO::nreqs;
2367 warn "iterate...";
2368 }
2369
2305 warn "cancel all extension coros"; 2370 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2371 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2372 %EXT_CORO = ();
2308 2373
2309 warn "remove commands"; 2374 warn "removing commands";
2310 %COMMAND = (); 2375 %COMMAND = ();
2311 2376
2312 warn "remove ext commands"; 2377 warn "removing ext commands";
2313 %EXTCMD = (); 2378 %EXTCMD = ();
2314 2379
2315 warn "unload/nuke all extensions"; 2380 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2381 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2382 warn "... unloading $pkg";
2318 2383
2319 if (my $cb = $pkg->can ("unload")) { 2384 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2385 eval {
… …
2325 2390
2326 warn "... nuking $pkg"; 2391 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2392 Symbol::delete_package $pkg;
2328 } 2393 }
2329 2394
2330 warn "unload all perl modules loaded from $LIBDIR"; 2395 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2396 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2397 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2398
2334 warn "removing <$k>"; 2399 warn "... unloading $k";
2335 delete $INC{$k}; 2400 delete $INC{$k};
2336 2401
2337 $k =~ s/\.pm$//; 2402 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2403 $k =~ s/\//::/g;
2339 2404
… …
2342 } 2407 }
2343 2408
2344 Symbol::delete_package $k; 2409 Symbol::delete_package $k;
2345 } 2410 }
2346 2411
2347 warn "get rid of safe::, as good as possible"; 2412 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2413 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2414 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2415
2351 warn "unload cf.pm \"a bit\""; 2416 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2417 delete $INC{"cf.pm"};
2353 2418
2354 # don't, removes xs symbols, too, 2419 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2420 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2421 #Symbol::delete_package __PACKAGE__;
2357 2422
2423 warn "unload completed, starting to reload now";
2424
2358 warn "reloading cf.pm"; 2425 warn "reloading cf.pm";
2359 require cf; 2426 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2427 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2428
2362 warn "load config and database again"; 2429 warn "loading config and database again";
2363 cf::cfg_load; 2430 cf::cfg_load;
2364 cf::db_load; 2431 cf::db_load;
2365 2432
2366 warn "load extensions"; 2433 warn "loading extensions";
2367 cf::load_extensions; 2434 cf::load_extensions;
2368 2435
2369 warn "reattach attachments to objects/players"; 2436 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2437 _global_reattach;
2371 warn "reattach attachments to maps"; 2438 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2439 reattach $_ for values %MAP;
2440
2441 warn "restarting server ticker";
2442
2443 $TICK_WATCHER->start;
2373 }; 2444 };
2374 2445
2375 if ($@) { 2446 if ($@) {
2376 warn $@; 2447 warn $@;
2377 warn "error while reloading, exiting."; 2448 warn "error while reloading, exiting.";
… …
2379 } 2450 }
2380 2451
2381 warn "reloaded"; 2452 warn "reloaded";
2382}; 2453};
2383 2454
2455our $RELOAD_WATCHER; # used only during reload
2456
2384register_command "reload" => sub { 2457register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2458 my ($who, $arg) = @_;
2386 2459
2387 if ($who->flag (FLAG_WIZ)) { 2460 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2461 $who->message ("reloading server.");
2462
2463 # doing reload synchronously and two reloads happen back-to-back,
2464 # coro crashes during coro_state_free->destroy here.
2465
2466 $RELOAD_WATCHER ||= Event->timer (
2467 reentrant => 0,
2468 after => 0,
2469 data => WF_AUTOCANCEL,
2470 cb => sub {
2389 reload; 2471 reload;
2390 $who->message ("end of reload."); 2472 undef $RELOAD_WATCHER;
2473 },
2474 );
2391 } 2475 }
2392}; 2476};
2393 2477
2394unshift @INC, $LIBDIR; 2478unshift @INC, $LIBDIR;
2479
2480my $bug_warning = 0;
2395 2481
2396$TICK_WATCHER = Event->timer ( 2482$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2483 reentrant => 0,
2484 parked => 1,
2398 prio => 0, 2485 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2486 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2487 data => WF_AUTOCANCEL,
2401 cb => sub { 2488 cb => sub {
2489 if ($Coro::current != $Coro::main) {
2490 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2491 unless ++$bug_warning > 10;
2492 return;
2493 }
2494
2402 $NOW = Event::time; 2495 $NOW = Event::time;
2403 2496
2404 cf::server_tick; # one server iteration 2497 cf::server_tick; # one server iteration
2405 $RUNTIME += $TICK; 2498 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2499 $NEXT_TICK += $TICK;
2407 2500
2408 $WAIT_FOR_TICK->broadcast; 2501 $WAIT_FOR_TICK->broadcast;
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2502 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2503
2504 Event::sweep;
2505 Coro::cede_notself;
2506
2507# my $AFTER = Event::time;
2508# warn $AFTER - $NOW;#d#
2410 2509
2411 # if we are delayed by four ticks or more, skip them all 2510 # if we are delayed by four ticks or more, skip them all
2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2511 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2413 2512
2414 $TICK_WATCHER->at ($NEXT_TICK); 2513 $TICK_WATCHER->at ($NEXT_TICK);
2415 $TICK_WATCHER->start; 2514 $TICK_WATCHER->start;
2416 }, 2515 },
2417); 2516);
2418 2517
2419IO::AIO::max_poll_time $TICK * 0.2; 2518IO::AIO::max_poll_time $TICK * 0.1;
2420 2519
2421Event->io ( 2520undef $Coro::AIO::WATCHER;
2521$AIO_POLL_WATCHER = Event->io (
2522 reentrant => 0,
2422 fd => IO::AIO::poll_fileno, 2523 fd => IO::AIO::poll_fileno,
2423 poll => 'r', 2524 poll => 'r',
2424 prio => 5, 2525 prio => 6,
2425 data => WF_AUTOCANCEL, 2526 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb, 2527 cb => \&IO::AIO::poll_cb,
2427); 2528);
2428 2529
2429Event->timer ( 2530$WRITE_RUNTIME_WATCHER = Event->timer (
2531 reentrant => 0,
2430 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2431 after => 0, 2533 after => 1,
2432 interval => 10, 2534 interval => 10,
2433 cb => sub { 2535 prio => 6, # keep it lowest so it acts like a watchdog
2434 (Coro::unblock_sub { 2536 cb => Coro::unblock_sub {
2435 write_runtime 2537 write_runtime
2436 or warn "ERROR: unable to write runtime file: $!"; 2538 or warn "ERROR: unable to write runtime file: $!";
2437 })->();
2438 }, 2539 },
2439); 2540);
2440 2541
2441END { cf::emergency_save } 2542END { cf::emergency_save }
2442 2543

Diff Legend

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