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.169 by root, Sun Jan 14 01:09:46 2007 UTC vs.
Revision 1.204 by root, Fri Feb 2 19:59:22 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;
… …
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 50our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 51our $NEXT_TICK;
52our $NOW; 52our $NOW;
53our $USE_FSYNC; # use fsync to write maps - default off
53 54
54our %CFG; 55our %CFG;
55 56
56our $UPTIME; $UPTIME ||= time; 57our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 58our $RUNTIME;
… …
82mkdir cf::localdir . "/" . cf::tmpdir; 83mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 84mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 85mkdir $RANDOM_MAPS;
85 86
86our $EMERGENCY_POSITION; 87our $EMERGENCY_POSITION;
88
89sub cf::map::normalise;
87 90
88############################################################################# 91#############################################################################
89 92
90=head2 GLOBAL VARIABLES 93=head2 GLOBAL VARIABLES
91 94
… …
349 my $runtime = cf::localdir . "/runtime"; 352 my $runtime = cf::localdir . "/runtime";
350 353
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 355 or return;
353 356
357 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 358 # 10 is the runtime save interval, for a monotonic clock
359 # 60 allows for the watchdog to kill the server.
360
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 361 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 362 and return;
357 363
364 # always fsync - this file is important
358 aio_fsync $fh 365 aio_fsync $fh
359 and return; 366 and return;
360 367
361 close $fh 368 close $fh
362 or return; 369 or return;
… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 510our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 511our @CB_MAP = ();
505 512
506my %attachment; 513my %attachment;
507 514
515sub cf::attachable::thawer_merge {
516 # simply override everything except _meta
517 local $_[0]{_meta};
518 %{$_[0]} = %{$_[1]};
519}
520
508sub _attach_cb($$$$) { 521sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 522 my ($registry, $event, $prio, $cb) = @_;
510 523
511 use sort 'stable'; 524 use sort 'stable';
512 525
… …
741 $filename, length $$rdata, scalar @$objs; 754 $filename, length $$rdata, scalar @$objs;
742 755
743 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 756 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
744 chmod SAVE_MODE, $fh; 757 chmod SAVE_MODE, $fh;
745 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 758 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
746 aio_fsync $fh; 759 aio_fsync $fh if $cf::USE_FSYNC;
747 close $fh; 760 close $fh;
748 761
749 if (@$objs) { 762 if (@$objs) {
750 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
751 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
752 my $data = Storable::nfreeze { version => 1, objs => $objs }; 765 my $data = Storable::nfreeze { version => 1, objs => $objs };
753 aio_write $fh, 0, (length $data), $data, 0; 766 aio_write $fh, 0, (length $data), $data, 0;
754 aio_fsync $fh; 767 aio_fsync $fh if $cf::USE_FSYNC;
755 close $fh; 768 close $fh;
756 aio_rename "$filename.pst~", "$filename.pst"; 769 aio_rename "$filename.pst~", "$filename.pst";
757 } 770 }
758 } else { 771 } else {
759 aio_unlink "$filename.pst"; 772 aio_unlink "$filename.pst";
… …
765 } 778 }
766 } else { 779 } else {
767 aio_unlink $filename; 780 aio_unlink $filename;
768 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
769 } 782 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
770 } 789 }
771} 790}
772 791
773sub object_freezer_as_string { 792sub object_freezer_as_string {
774 my ($rdata, $objs) = @_; 793 my ($rdata, $objs) = @_;
… …
780 799
781sub object_thawer_load { 800sub object_thawer_load {
782 my ($filename) = @_; 801 my ($filename) = @_;
783 802
784 my ($data, $av); 803 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
785 807
786 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
787 or return; 809 or return;
788 810
789 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
951 973
952sub exists($) { 974sub exists($) {
953 my ($login) = @_; 975 my ($login) = @_;
954 976
955 $cf::PLAYER{$login} 977 $cf::PLAYER{$login}
956 or cf::sync_job { !aio_stat $login } 978 or cf::sync_job { !aio_stat path $login }
957} 979}
958 980
959sub find($) { 981sub find($) {
960 return $cf::PLAYER{$_[0]} || do { 982 return $cf::PLAYER{$_[0]} || do {
961 my $login = $_[0]; 983 my $login = $_[0];
… …
1059=cut 1081=cut
1060 1082
1061sub maps($) { 1083sub maps($) {
1062 my ($pl) = @_; 1084 my ($pl) = @_;
1063 1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1087
1064 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1065 or return; 1089 or return;
1066 1090
1067 my @paths; 1091 my @paths;
1068 1092
1069 for (@$files) { 1093 for (@$files) {
1070 utf8::decode $_; 1094 utf8::decode $_;
1071 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1072 next unless /^$PATH_SEP/o; 1096 next unless /^$PATH_SEP/o;
1073 1097
1074 s/\.map$//; 1098 push @paths, cf::map::normalise "~$pl/$_";
1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1076 } 1099 }
1077 1100
1078 \@paths 1101 \@paths
1079} 1102}
1080 1103
… …
1107 1130
1108use Fcntl; 1131use Fcntl;
1109use Coro::AIO; 1132use Coro::AIO;
1110 1133
1111use overload 1134use overload
1112 '""' => \&as_string; 1135 '""' => \&as_string,
1136 fallback => 1;
1113 1137
1114our $MAX_RESET = 3600; 1138our $MAX_RESET = 3600;
1115our $DEFAULT_RESET = 3000; 1139our $DEFAULT_RESET = 3000;
1116 1140
1117sub generate_random_map { 1141sub generate_random_map {
1118 my ($self, $rmp) = @_; 1142 my ($self, $rmp) = @_;
1119
1120 # mit "rum" bekleckern, nicht 1143 # mit "rum" bekleckern, nicht
1121 $self->_create_random_map ( 1144 $self->_create_random_map (
1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1145 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1146 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1147 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1154 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1132 (cf::region::find $rmp->{region}), $rmp->{custom} 1155 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 ) 1156 )
1134} 1157}
1135 1158
1159=item cf::map->register ($regex, $prio)
1160
1161Register a handler for the map path matching the given regex at the
1162givne priority (higher is better, built-in handlers have priority 0, the
1163default).
1164
1165=cut
1166
1136sub register { 1167sub register {
1137 my (undef, $regex) = @_; 1168 my (undef, $regex, $prio) = @_;
1138 my $pkg = caller; 1169 my $pkg = caller;
1139 1170
1140 no strict; 1171 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__; 1172 push @{"$pkg\::ISA"}, __PACKAGE__;
1142 1173
1143 $EXT_MAP{$pkg} = qr<$regex>; 1174 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1144} 1175}
1145 1176
1146# also paths starting with '/' 1177# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1178$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1179
1180sub thawer_merge {
1181 my ($self, $merge) = @_;
1182
1183 # we have to keep some variables in memory intact
1184 local $self->{path};
1185 local $self->{load_path};
1186 local $self->{deny_save};
1187 local $self->{deny_reset};
1188
1189 $self->SUPER::thawer_merge ($merge);
1190}
1148 1191
1149sub normalise { 1192sub normalise {
1150 my ($path, $base) = @_; 1193 my ($path, $base) = @_;
1194
1195 $path = "$path"; # make sure its a string
1196
1197 $path =~ s/\.map$//;
1151 1198
1152 # map plan: 1199 # map plan:
1153 # 1200 #
1154 # /! non-realised random map exit (special hack!) 1201 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched 1202 # {... are special paths that are not being touched
… …
1183 1230
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1231 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185 1232
1186 $path = normalise $path, $base; 1233 $path = normalise $path, $base;
1187 1234
1188 for my $pkg (keys %EXT_MAP) { 1235 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) { 1236 if ($path =~ $EXT_MAP{$pkg}[1]) {
1190 my $self = bless cf::map::new, $pkg; 1237 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path); 1238 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc. 1239 $self->init; # pass $1 etc.
1193 return $self; 1240 return $self;
1194 } 1241 }
1195 } 1242 }
1196 1243
1197 Carp::carp "unable to resolve path '$path'."; 1244 Carp::carp "unable to resolve path '$path' (base '$base').";
1198 () 1245 ()
1199} 1246}
1200 1247
1201sub init { 1248sub init {
1202 my ($self) = @_; 1249 my ($self) = @_;
… …
1217 1264
1218# the original (read-only) location 1265# the original (read-only) location
1219sub load_path { 1266sub load_path {
1220 my ($self) = @_; 1267 my ($self) = @_;
1221 1268
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1223} 1270}
1224 1271
1225# the temporary/swap location 1272# the temporary/swap location
1226sub save_path { 1273sub save_path {
1227 my ($self) = @_; 1274 my ($self) = @_;
1228 1275
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1231} 1278}
1232 1279
1233# the unique path, undef == no special unique path 1280# the unique path, undef == no special unique path
1234sub uniq_path { 1281sub uniq_path {
1235 my ($self) = @_; 1282 my ($self) = @_;
… …
1249 1296
1250sub unlink_save { 1297sub unlink_save {
1251 my ($self) = @_; 1298 my ($self) = @_;
1252 1299
1253 utf8::encode (my $save = $self->save_path); 1300 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1256} 1308}
1257 1309
1258sub load_header_from($) { 1310sub load_header_from($) {
1259 my ($self, $path) = @_; 1311 my ($self, $path) = @_;
1260 1312
1261 utf8::encode $path; 1313 utf8::encode $path;
1262 aio_open $path, O_RDONLY, 0 1314 #aio_open $path, O_RDONLY, 0
1263 or return; 1315 # or return;
1264 1316
1265 $self->_load_header ($path) 1317 $self->_load_header ($path)
1266 or return; 1318 or return;
1267 1319
1268 $self->{load_path} = $path; 1320 $self->{load_path} = $path;
1269 1321
1270 1 1322 1
1271} 1323}
1272 1324
1273sub load_orig { 1325sub load_header_orig {
1274 my ($self) = @_; 1326 my ($self) = @_;
1275 1327
1276 $self->load_header_from ($self->load_path) 1328 $self->load_header_from ($self->load_path)
1277} 1329}
1278 1330
1279sub load_temp { 1331sub load_header_temp {
1280 my ($self) = @_; 1332 my ($self) = @_;
1281 1333
1282 $self->load_header_from ($self->save_path) 1334 $self->load_header_from ($self->save_path)
1335}
1336
1337sub prepare_temp {
1338 my ($self) = @_;
1339
1340 $self->last_access ((delete $self->{last_access})
1341 || $cf::RUNTIME); #d#
1342 # safety
1343 $self->{instantiate_time} = $cf::RUNTIME
1344 if $self->{instantiate_time} > $cf::RUNTIME;
1345}
1346
1347sub prepare_orig {
1348 my ($self) = @_;
1349
1350 $self->{load_original} = 1;
1351 $self->{instantiate_time} = $cf::RUNTIME;
1352 $self->last_access ($cf::RUNTIME);
1353 $self->instantiate;
1283} 1354}
1284 1355
1285sub load_header { 1356sub load_header {
1286 my ($self) = @_; 1357 my ($self) = @_;
1287 1358
1288 if ($self->load_temp) { 1359 if ($self->load_header_temp) {
1289 $self->last_access ((delete $self->{last_access}) 1360 $self->prepare_temp;
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else { 1361 } else {
1295 $self->load_orig 1362 $self->load_header_orig
1296 or return; 1363 or return;
1297 1364 $self->prepare_orig;
1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 } 1365 }
1303 1366
1304 1 1367 1
1305} 1368}
1306 1369
… …
1320 $map->{last_save} = $cf::RUNTIME; 1383 $map->{last_save} = $cf::RUNTIME;
1321 1384
1322 $map->load_header 1385 $map->load_header
1323 or return; 1386 or return;
1324 1387
1325 if ($map->should_reset) { 1388 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1389 # doing this can freeze the server in a sync job, obviously
1390 #$cf::WAIT_FOR_TICK->wait;
1326 $map->reset; 1391 $map->reset;
1327 undef $guard; 1392 undef $guard;
1328 $map = find $path 1393 return find $path;
1329 or return;
1330 } 1394 }
1331 1395
1332 $cf::MAP{$path} = $map 1396 $cf::MAP{$path} = $map
1333 } 1397 }
1334} 1398}
1399
1400sub pre_load { }
1401sub post_load { }
1335 1402
1336sub load { 1403sub load {
1337 my ($self) = @_; 1404 my ($self) = @_;
1338 1405
1406 local $self->{deny_reset} = 1; # loading can take a long time
1407
1339 my $path = $self->{path}; 1408 my $path = $self->{path};
1340 my $guard = cf::lock_acquire "map_load:$path"; 1409 my $guard = cf::lock_acquire "map_load:$path";
1341 1410
1342 return if $self->in_memory != cf::MAP_SWAPPED; 1411 return if $self->in_memory != cf::MAP_SWAPPED;
1343 1412
1344 $self->in_memory (cf::MAP_LOADING); 1413 $self->in_memory (cf::MAP_LOADING);
1345 1414
1346 $self->alloc; 1415 $self->alloc;
1416
1417 $self->pre_load;
1418
1347 $self->_load_objects ($self->{load_path}, 1) 1419 $self->_load_objects ($self->{load_path}, 1)
1348 or return; 1420 or return;
1349 1421
1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1422 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1351 if delete $self->{load_original}; 1423 if delete $self->{load_original};
… …
1373 unless $self->difficulty; 1445 unless $self->difficulty;
1374 Coro::cede; 1446 Coro::cede;
1375 $self->activate; 1447 $self->activate;
1376 } 1448 }
1377 1449
1450 $self->post_load;
1451
1378 $self->in_memory (cf::MAP_IN_MEMORY); 1452 $self->in_memory (cf::MAP_IN_MEMORY);
1379} 1453}
1380 1454
1381sub customise_for { 1455sub customise_for {
1382 my ($self, $ob) = @_; 1456 my ($self, $ob) = @_;
… …
1422 1496
1423 cf::sync_job { $map->load }; 1497 cf::sync_job { $map->load };
1424} 1498}
1425 1499
1426our %MAP_PREFETCH; 1500our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async { 1501our $MAP_PREFETCHER = undef;
1428 while () {
1429 for my $path (keys %MAP_PREFETCH) {
1430 my $map = find $path
1431 or next;
1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1435 }
1436 Coro::schedule;
1437 }
1438};
1439 1502
1440sub find_async { 1503sub find_async {
1441 my ($path, $origin) = @_; 1504 my ($path, $origin) = @_;
1442 1505
1443 $path = normalise $path, $origin && $origin->{path}; 1506 $path = normalise $path, $origin && $origin->{path};
1444 1507
1445 if (my $map = $cf::MAP{$path}) { 1508 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1509 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1447 } 1510 }
1448 1511
1449 $MAP_PREFETCH{$path} = 0; 1512 undef $MAP_PREFETCH{$path};
1513 $MAP_PREFETCHER ||= cf::async {
1514 while (%MAP_PREFETCH) {
1515 for my $path (keys %MAP_PREFETCH) {
1516 my $map = find $path
1517 or next;
1518 $map->load;
1519
1520 delete $MAP_PREFETCH{$path};
1521 }
1522 }
1523 undef $MAP_PREFETCHER;
1524 };
1450 $MAP_PREFETCHER->ready; 1525 $MAP_PREFETCHER->prio (6);
1451 1526
1452 () 1527 ()
1453} 1528}
1454 1529
1455sub save { 1530sub save {
… …
1515 my ($self) = @_; 1590 my ($self) = @_;
1516 1591
1517 $self->reset_at <= $cf::RUNTIME 1592 $self->reset_at <= $cf::RUNTIME
1518} 1593}
1519 1594
1520sub rename {
1521 my ($self, $new_path) = @_;
1522
1523 normalise $new_path;
1524
1525 $self->unlink_save;
1526
1527 delete $cf::MAP{$self->path};
1528 $self->{path} = $new_path; $self->path ($self->{path});
1529 $cf::MAP{$self->path} = $self;
1530
1531 $self->save;
1532}
1533
1534sub reset { 1595sub reset {
1535 my ($self) = @_; 1596 my ($self) = @_;
1536 1597
1537 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1598 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538 1599
… …
1555my $nuke_counter = "aaaa"; 1616my $nuke_counter = "aaaa";
1556 1617
1557sub nuke { 1618sub nuke {
1558 my ($self) = @_; 1619 my ($self) = @_;
1559 1620
1621 delete $cf::MAP{$self->path};
1622
1623 $self->unlink_save;
1624
1625 bless $self, "cf::map";
1626 delete $self->{deny_reset};
1560 $self->{deny_save} = 1; 1627 $self->{deny_save} = 1;
1561 $self->reset_timeout (1); 1628 $self->reset_timeout (1);
1562 $self->rename ("{nuke}/" . ($nuke_counter++)); 1629 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1630
1631 $cf::MAP{$self->path} = $self;
1632
1563 $self->reset; # polite request, might not happen 1633 $self->reset; # polite request, might not happen
1564} 1634}
1565 1635
1566=item cf::map::unique_maps 1636=item cf::map::unique_maps
1567 1637
… …
1579 for (@$files) { 1649 for (@$files) {
1580 utf8::decode $_; 1650 utf8::decode $_;
1581 next if /\.pst$/; 1651 next if /\.pst$/;
1582 next unless /^$PATH_SEP/o; 1652 next unless /^$PATH_SEP/o;
1583 1653
1584 s/\.map$//; 1654 push @paths, cf::map::normalise $_;
1585 push @paths, $_;
1586 } 1655 }
1587 1656
1588 \@paths 1657 \@paths
1589} 1658}
1590 1659
… …
1684=cut 1753=cut
1685 1754
1686sub link_map { 1755sub link_map {
1687 unless ($LINK_MAP) { 1756 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}" 1757 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1758 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1690 $LINK_MAP->load; 1759 $LINK_MAP->load;
1691 } 1760 }
1692 1761
1693 $LINK_MAP 1762 $LINK_MAP
1694} 1763}
… …
1701 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1770 return if UNIVERSAL::isa $self->map, "ext::map_link";
1702 1771
1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1772 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1704 if $self->map; 1773 if $self->map;
1705 1774
1706 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1775 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1707} 1776}
1708 1777
1709sub cf::object::player::leave_link { 1778sub cf::object::player::leave_link {
1710 my ($self, $map, $x, $y) = @_; 1779 my ($self, $map, $x, $y) = @_;
1711 1780
… …
1778 my ($self, $path, $x, $y) = @_; 1847 my ($self, $path, $x, $y) = @_;
1779 1848
1780 $self->enter_link; 1849 $self->enter_link;
1781 1850
1782 (async { 1851 (async {
1852 my $map = eval {
1783 my $map = cf::map::find $path; 1853 my $map = cf::map::find $path;
1784 $map = $map->customise_for ($self) if $map; 1854 $map = $map->customise_for ($self) if $map;
1785 1855 $map
1786# warn "entering ", $map->path, " at ($x, $y)\n" 1856 } or
1787# if $map;
1788
1789 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1857 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1790 1858
1791 $self->leave_link ($map, $x, $y); 1859 $self->leave_link ($map, $x, $y);
1792 })->prio (1); 1860 })->prio (1);
1793} 1861}
1794 1862
… …
1798 1866
1799sub parse_random_map_params { 1867sub parse_random_map_params {
1800 my ($spec) = @_; 1868 my ($spec) = @_;
1801 1869
1802 my $rmp = { # defaults 1870 my $rmp = { # defaults
1803 xsize => 10, 1871 xsize => (cf::rndm 15, 40),
1804 ysize => 10, 1872 ysize => (cf::rndm 15, 40),
1873 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1874 #layout => string,
1805 }; 1875 };
1806 1876
1807 for (split /\n/, $spec) { 1877 for (split /\n/, $spec) {
1808 my ($k, $v) = split /\s+/, $_, 2; 1878 my ($k, $v) = split /\s+/, $_, 2;
1809 1879
… …
1813 $rmp 1883 $rmp
1814} 1884}
1815 1885
1816sub prepare_random_map { 1886sub prepare_random_map {
1817 my ($exit) = @_; 1887 my ($exit) = @_;
1888
1889 my $guard = cf::lock_acquire "exit_prepare:$exit";
1818 1890
1819 # all this does is basically replace the /! path by 1891 # all this does is basically replace the /! path by
1820 # a new random map path (?random/...) with a seed 1892 # a new random map path (?random/...) with a seed
1821 # that depends on the exit object 1893 # that depends on the exit object
1822 1894
1823 my $rmp = parse_random_map_params $exit->msg; 1895 my $rmp = parse_random_map_params $exit->msg;
1824 1896
1825 if ($exit->map) { 1897 if ($exit->map) {
1826 $rmp->{region} = $exit->map->region_name; 1898 $rmp->{region} = $exit->region->name;
1827 $rmp->{origin_map} = $exit->map->path; 1899 $rmp->{origin_map} = $exit->map->path;
1828 $rmp->{origin_x} = $exit->x; 1900 $rmp->{origin_x} = $exit->x;
1829 $rmp->{origin_y} = $exit->y; 1901 $rmp->{origin_y} = $exit->y;
1830 } 1902 }
1831 1903
1832 $rmp->{random_seed} ||= $exit->random_seed; 1904 $rmp->{random_seed} ||= $exit->random_seed;
1833 1905
1834 my $data = cf::to_json $rmp; 1906 my $data = cf::to_json $rmp;
1835 my $md5 = Digest::MD5::md5_hex $data; 1907 my $md5 = Digest::MD5::md5_hex $data;
1908 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1836 1909
1837 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1910 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1838 aio_write $fh, 0, (length $data), $data, 0; 1911 aio_write $fh, 0, (length $data), $data, 0;
1912 undef $fh;
1913 aio_rename "$meta~", $meta;
1839 1914
1840 $exit->slaying ("?random/$md5"); 1915 $exit->slaying ("?random/$md5");
1841 $exit->msg (undef); 1916 $exit->msg (undef);
1842 } 1917 }
1843} 1918}
1844 1919
1845sub cf::object::player::enter_exit { 1920sub cf::object::player::enter_exit {
1846 my ($self, $exit) = @_; 1921 my ($self, $exit) = @_;
1847 1922
1848 return unless $self->type == cf::PLAYER; 1923 return unless $self->type == cf::PLAYER;
1924
1925 if ($exit->slaying eq "/!") {
1926 #TODO: this should de-fi-ni-te-ly not be a sync-job
1927 cf::sync_job { prepare_random_map $exit };
1928 }
1929
1930 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1931 my $hp = $exit->stats->hp;
1932 my $sp = $exit->stats->sp;
1849 1933
1850 $self->enter_link; 1934 $self->enter_link;
1851 1935
1852 (async { 1936 (async {
1853 $self->deactivate_recursive; # just to be sure 1937 $self->deactivate_recursive; # just to be sure
1854 unless (eval { 1938 unless (eval {
1855 prepare_random_map $exit 1939 $self->goto ($slaying, $hp, $sp);
1856 if $exit->slaying eq "/!";
1857
1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1860 1940
1861 1; 1941 1;
1862 }) { 1942 }) {
1863 $self->message ("Something went wrong deep within the crossfire server. " 1943 $self->message ("Something went wrong deep within the crossfire server. "
1864 . "I'll try to bring you back to the map you were before. " 1944 . "I'll try to bring you back to the map you were before. "
… …
1925 # get handled first 2005 # get handled first
1926 my $queue = delete $ns->{query_queue} 2006 my $queue = delete $ns->{query_queue}
1927 or return; # be conservative, not sure how that can happen, but we saw a crash here 2007 or return; # be conservative, not sure how that can happen, but we saw a crash here
1928 2008
1929 (shift @$queue)->[1]->($msg); 2009 (shift @$queue)->[1]->($msg);
2010 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1930 2011
1931 push @{ $ns->{query_queue} }, @$queue; 2012 push @{ $ns->{query_queue} }, @$queue;
1932 2013
1933 if (@{ $ns->{query_queue} } == @$queue) { 2014 if (@{ $ns->{query_queue} } == @$queue) {
1934 if (@$queue) { 2015 if (@$queue) {
… …
2153 sub db_sync() { 2234 sub db_sync() {
2154 db_save if $dirty; 2235 db_save if $dirty;
2155 undef $dirty; 2236 undef $dirty;
2156 } 2237 }
2157 2238
2158 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2239 my $idle = Event->idle (
2159 db_sync; 2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2160 }); 2246 );
2161 2247
2162 sub db_dirty() { 2248 sub db_dirty() {
2163 $dirty = 1; 2249 $dirty = 1;
2164 $idle->start; 2250 $idle->start;
2165 } 2251 }
… …
2186 }, 2272 },
2187 ); 2273 );
2188} 2274}
2189 2275
2190############################################################################# 2276#############################################################################
2191# the server's main() 2277# the server's init and main functions
2278
2279sub load_resources {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2281 or die "unable to load regions file\n";#d#
2282}
2192 2283
2193sub cfg_load { 2284sub cfg_load {
2194 open my $fh, "<:utf8", cf::confdir . "/config" 2285 open my $fh, "<:utf8", cf::confdir . "/config"
2195 or return; 2286 or return;
2196 2287
… …
2209 }; 2300 };
2210 warn $@ if $@; 2301 warn $@ if $@;
2211 } 2302 }
2212} 2303}
2213 2304
2305sub init {
2306 load_resources;
2307}
2308
2214sub main { 2309sub main {
2215 # we must not ever block the main coroutine 2310 # we must not ever block the main coroutine
2216 local $Coro::idle = sub { 2311 local $Coro::idle = sub {
2217 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2312 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2313 (async {
2218 async { Event::one_event }; 2314 Event::one_event;
2315 })->prio (Coro::PRIO_MAX);
2219 }; 2316 };
2220 2317
2221 cfg_load; 2318 cfg_load;
2222 db_load; 2319 db_load;
2223 load_extensions; 2320 load_extensions;
2321
2322 $TICK_WATCHER->start;
2224 Event::loop; 2323 Event::loop;
2225} 2324}
2226 2325
2227############################################################################# 2326#############################################################################
2228# initialisation and cleanup 2327# initialisation and cleanup
2229 2328
2230# install some emergency cleanup handlers 2329# install some emergency cleanup handlers
2231BEGIN { 2330BEGIN {
2232 for my $signal (qw(INT HUP TERM)) { 2331 for my $signal (qw(INT HUP TERM)) {
2233 Event->signal ( 2332 Event->signal (
2333 reentrant => 0,
2234 data => WF_AUTOCANCEL, 2334 data => WF_AUTOCANCEL,
2235 signal => $signal, 2335 signal => $signal,
2336 prio => 0,
2236 cb => sub { 2337 cb => sub {
2237 cf::cleanup "SIG$signal"; 2338 cf::cleanup "SIG$signal";
2238 }, 2339 },
2239 ); 2340 );
2240 } 2341 }
2241} 2342}
… …
2270} 2371}
2271 2372
2272sub reload() { 2373sub reload() {
2273 # can/must only be called in main 2374 # can/must only be called in main
2274 if ($Coro::current != $Coro::main) { 2375 if ($Coro::current != $Coro::main) {
2275 warn "can only reload from main coroutine\n"; 2376 warn "can only reload from main coroutine";
2276 return; 2377 return;
2277 } 2378 }
2278 2379
2279 warn "reloading..."; 2380 warn "reloading...";
2280 2381
2281 warn "freezing server"; 2382 warn "cancelling server ticker";
2282 my $guard = freeze_mainloop; 2383 $TICK_WATCHER->cancel;
2384
2283 cf::emergency_save; 2385 cf::emergency_save;
2284
2285 warn "sync database to disk";
2286 cf::db_sync;
2287 IO::AIO::flush;
2288 2386
2289 eval { 2387 eval {
2290 # if anything goes wrong in here, we should simply crash as we already saved 2388 # if anything goes wrong in here, we should simply crash as we already saved
2291 2389
2390 warn "syncing database to disk";
2391 cf::db_sync;
2392
2292 warn "cancel all watchers"; 2393 warn "cancelling all WF_AUTOCANCEL watchers";
2293 for (Event::all_watchers) { 2394 for (Event::all_watchers) {
2294 $_->cancel if $_->data & WF_AUTOCANCEL; 2395 $_->cancel if $_->data & WF_AUTOCANCEL;
2295 } 2396 }
2296 2397
2398 warn "flushing outstanding aio requests";
2399 for (;;) {
2400 IO::AIO::flush;
2401 Coro::cede;
2402 last unless IO::AIO::nreqs;
2403 warn "iterate...";
2404 }
2405
2297 warn "cancel all extension coros"; 2406 warn "cancelling all extension coros";
2298 $_->cancel for values %EXT_CORO; 2407 $_->cancel for values %EXT_CORO;
2299 %EXT_CORO = (); 2408 %EXT_CORO = ();
2300 2409
2301 warn "remove commands"; 2410 warn "removing commands";
2302 %COMMAND = (); 2411 %COMMAND = ();
2303 2412
2304 warn "remove ext commands"; 2413 warn "removing ext commands";
2305 %EXTCMD = (); 2414 %EXTCMD = ();
2306 2415
2307 warn "unload/nuke all extensions"; 2416 warn "unloading/nuking all extensions";
2308 for my $pkg (@EXTS) { 2417 for my $pkg (@EXTS) {
2309 warn "... unloading $pkg"; 2418 warn "... unloading $pkg";
2310 2419
2311 if (my $cb = $pkg->can ("unload")) { 2420 if (my $cb = $pkg->can ("unload")) {
2312 eval { 2421 eval {
… …
2317 2426
2318 warn "... nuking $pkg"; 2427 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg; 2428 Symbol::delete_package $pkg;
2320 } 2429 }
2321 2430
2322 warn "unload all perl modules loaded from $LIBDIR"; 2431 warn "unloading all perl modules loaded from $LIBDIR";
2323 while (my ($k, $v) = each %INC) { 2432 while (my ($k, $v) = each %INC) {
2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2433 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2325 2434
2326 warn "removing <$k>"; 2435 warn "... unloading $k";
2327 delete $INC{$k}; 2436 delete $INC{$k};
2328 2437
2329 $k =~ s/\.pm$//; 2438 $k =~ s/\.pm$//;
2330 $k =~ s/\//::/g; 2439 $k =~ s/\//::/g;
2331 2440
… …
2334 } 2443 }
2335 2444
2336 Symbol::delete_package $k; 2445 Symbol::delete_package $k;
2337 } 2446 }
2338 2447
2339 warn "get rid of safe::, as good as possible"; 2448 warn "getting rid of safe::, as good as possible";
2340 Symbol::delete_package "safe::$_" 2449 Symbol::delete_package "safe::$_"
2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2450 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2342 2451
2343 warn "unload cf.pm \"a bit\""; 2452 warn "unloading cf.pm \"a bit\"";
2344 delete $INC{"cf.pm"}; 2453 delete $INC{"cf.pm"};
2345 2454
2346 # don't, removes xs symbols, too, 2455 # don't, removes xs symbols, too,
2347 # and global variables created in xs 2456 # and global variables created in xs
2348 #Symbol::delete_package __PACKAGE__; 2457 #Symbol::delete_package __PACKAGE__;
2349 2458
2459 warn "unload completed, starting to reload now";
2460
2350 warn "reloading cf.pm"; 2461 warn "reloading cf.pm";
2351 require cf; 2462 require cf;
2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2353 2464
2354 warn "load config and database again"; 2465 warn "loading config and database again";
2355 cf::cfg_load; 2466 cf::cfg_load;
2356 cf::db_load; 2467 cf::db_load;
2357 2468
2358 warn "load extensions"; 2469 warn "loading extensions";
2359 cf::load_extensions; 2470 cf::load_extensions;
2360 2471
2361 warn "reattach attachments to objects/players"; 2472 warn "reattaching attachments to objects/players";
2362 _global_reattach; 2473 _global_reattach;
2363 warn "reattach attachments to maps"; 2474 warn "reattaching attachments to maps";
2364 reattach $_ for values %MAP; 2475 reattach $_ for values %MAP;
2476
2477 warn "loading reloadable resources";
2478 load_resources;
2479
2480 warn "restarting server ticker";
2481
2482 $TICK_WATCHER->start;
2365 }; 2483 };
2366 2484
2367 if ($@) { 2485 if ($@) {
2368 warn $@; 2486 warn $@;
2369 warn "error while reloading, exiting."; 2487 warn "error while reloading, exiting.";
… …
2371 } 2489 }
2372 2490
2373 warn "reloaded"; 2491 warn "reloaded";
2374}; 2492};
2375 2493
2494our $RELOAD_WATCHER; # used only during reload
2495
2376register_command "reload" => sub { 2496register_command "reload" => sub {
2377 my ($who, $arg) = @_; 2497 my ($who, $arg) = @_;
2378 2498
2379 if ($who->flag (FLAG_WIZ)) { 2499 if ($who->flag (FLAG_WIZ)) {
2380 $who->message ("start of reload."); 2500 $who->message ("reloading server.");
2501
2502 # doing reload synchronously and two reloads happen back-to-back,
2503 # coro crashes during coro_state_free->destroy here.
2504
2505 $RELOAD_WATCHER ||= Event->timer (
2506 reentrant => 0,
2507 after => 0,
2508 data => WF_AUTOCANCEL,
2509 cb => sub {
2381 reload; 2510 reload;
2382 $who->message ("end of reload."); 2511 undef $RELOAD_WATCHER;
2512 },
2513 );
2383 } 2514 }
2384}; 2515};
2385 2516
2386unshift @INC, $LIBDIR; 2517unshift @INC, $LIBDIR;
2518
2519my $bug_warning = 0;
2387 2520
2388$TICK_WATCHER = Event->timer ( 2521$TICK_WATCHER = Event->timer (
2389 reentrant => 0, 2522 reentrant => 0,
2523 parked => 1,
2390 prio => 0, 2524 prio => 0,
2391 at => $NEXT_TICK || $TICK, 2525 at => $NEXT_TICK || $TICK,
2392 data => WF_AUTOCANCEL, 2526 data => WF_AUTOCANCEL,
2393 cb => sub { 2527 cb => sub {
2528 if ($Coro::current != $Coro::main) {
2529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2530 unless ++$bug_warning > 10;
2531 return;
2532 }
2533
2394 $NOW = Event::time; 2534 $NOW = Event::time;
2395 2535
2396 cf::server_tick; # one server iteration 2536 cf::server_tick; # one server iteration
2397 $RUNTIME += $TICK; 2537 $RUNTIME += $TICK;
2398 $NEXT_TICK += $TICK; 2538 $NEXT_TICK += $TICK;
2399 2539
2400 $WAIT_FOR_TICK->broadcast; 2540 $WAIT_FOR_TICK->broadcast;
2401 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2542
2543 Event::sweep;
2544 Coro::cede_notself;
2545
2546# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d#
2402 2548
2403 # if we are delayed by four ticks or more, skip them all 2549 # if we are delayed by four ticks or more, skip them all
2404 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2405 2551
2406 $TICK_WATCHER->at ($NEXT_TICK); 2552 $TICK_WATCHER->at ($NEXT_TICK);
2407 $TICK_WATCHER->start; 2553 $TICK_WATCHER->start;
2408 }, 2554 },
2409); 2555);
2410 2556
2411IO::AIO::max_poll_time $TICK * 0.2; 2557IO::AIO::max_poll_time $TICK * 0.1;
2412 2558
2559undef $Coro::AIO::WATCHER;
2413$AIO_POLL_WATCHER = Event->io ( 2560$AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0,
2414 fd => IO::AIO::poll_fileno, 2562 fd => IO::AIO::poll_fileno,
2415 poll => 'r', 2563 poll => 'r',
2416 prio => 5, 2564 prio => 6,
2417 data => WF_AUTOCANCEL, 2565 data => WF_AUTOCANCEL,
2418 cb => \&IO::AIO::poll_cb, 2566 cb => \&IO::AIO::poll_cb,
2419); 2567);
2420 2568
2421$WRITE_RUNTIME_WATCHER = Event->timer ( 2569$WRITE_RUNTIME_WATCHER = Event->timer (
2570 reentrant => 0,
2422 data => WF_AUTOCANCEL, 2571 data => WF_AUTOCANCEL,
2423 after => 0, 2572 after => 1,
2424 interval => 10, 2573 interval => 10,
2425 cb => sub { 2574 prio => 6, # keep it lowest so it acts like a watchdog
2426 (Coro::unblock_sub { 2575 cb => Coro::unblock_sub {
2427 write_runtime 2576 write_runtime
2428 or warn "ERROR: unable to write runtime file: $!"; 2577 or warn "ERROR: unable to write runtime file: $!";
2429 })->();
2430 }, 2578 },
2431); 2579);
2432 2580
2433END { cf::emergency_save } 2581END { cf::emergency_save }
2434 2582

Diff Legend

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