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.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.223 by root, Sun Mar 11 02:12:44 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;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
39our @EXTS = (); # list of extension package names 43our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 44our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 45our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 46our %EXT_MAP = (); # pluggable maps
43 47
48our $RELOAD; # number of reloads so far
44our @EVENT; 49our @EVENT;
45our $LIBDIR = datadir . "/ext"; 50our $LIBDIR = datadir . "/ext";
46 51
47our $TICK = MAX_TIME * 1e-6; 52our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 53our $TICK_WATCHER;
54our $AIO_POLL_WATCHER;
55our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 56our $NEXT_TICK;
50our $NOW; 57our $NOW;
58our $USE_FSYNC = 1; # use fsync to write maps - default off
59
60our $BDB_POLL_WATCHER;
61our $DB_ENV;
51 62
52our %CFG; 63our %CFG;
53 64
54our $UPTIME; $UPTIME ||= time; 65our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 66our $RUNTIME;
56 67
57our %PLAYER; # all users 68our %PLAYER; # all users
58our %MAP; # all maps 69our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 70our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 71our $RANDOM_MAPS = cf::localdir . "/random";
72our $BDB_ENV_DIR = cf::localdir . "/db";
61 73
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 74our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 75our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 76
65# used to convert map paths into valid unix filenames by replacing / by ∕ 77# used to convert map paths into valid unix filenames by replacing / by ∕
… …
78mkdir cf::localdir; 90mkdir cf::localdir;
79mkdir cf::localdir . "/" . cf::playerdir; 91mkdir cf::localdir . "/" . cf::playerdir;
80mkdir cf::localdir . "/" . cf::tmpdir; 92mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir; 93mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS; 94mkdir $RANDOM_MAPS;
95mkdir $BDB_ENV_DIR;
83 96
84our $EMERGENCY_POSITION; 97our $EMERGENCY_POSITION;
98
99sub cf::map::normalise;
85 100
86############################################################################# 101#############################################################################
87 102
88=head2 GLOBAL VARIABLES 103=head2 GLOBAL VARIABLES
89 104
… …
257} 272}
258 273
259sub freeze_mainloop { 274sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 275 return unless $TICK_WATCHER->is_active;
261 276
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 277 my $guard = Coro::guard {
278 $TICK_WATCHER->start;
279 };
263 $TICK_WATCHER->stop; 280 $TICK_WATCHER->stop;
264 $guard 281 $guard
265} 282}
266 283
267=item cf::async { BLOCK } 284=item cf::async { BLOCK }
… …
338 355
339 $coro 356 $coro
340} 357}
341 358
342sub write_runtime { 359sub write_runtime {
343 return unless $TICK_WATCHER->is_active; 360 my $guard = cf::lock_acquire "write_runtime";
344 361
345 my $runtime = cf::localdir . "/runtime"; 362 my $runtime = cf::localdir . "/runtime";
346 363
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 364 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 365 or return;
349 366
367 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 368 # 10 is the runtime save interval, for a monotonic clock
369 # 60 allows for the watchdog to kill the server.
370
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 371 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 372 and return;
353 373
374 # always fsync - this file is important
354 aio_fsync $fh 375 aio_fsync $fh
355 and return; 376 and return;
356 377
357 close $fh 378 close $fh
358 or return; 379 or return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 520our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 521our @CB_MAP = ();
501 522
502my %attachment; 523my %attachment;
503 524
525sub cf::attachable::thawer_merge {
526 # simply override everything except _meta
527 local $_[0]{_meta};
528 %{$_[0]} = %{$_[1]};
529}
530
504sub _attach_cb($$$$) { 531sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 532 my ($registry, $event, $prio, $cb) = @_;
506 533
507 use sort 'stable'; 534 use sort 'stable';
508 535
… …
679# object support 706# object support
680 707
681sub reattach { 708sub reattach {
682 # basically do the same as instantiate, without calling instantiate 709 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 710 my ($obj) = @_;
711
712 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 713
685 my $registry = $obj->registry; 714 my $registry = $obj->registry;
686 715
687 @$registry = (); 716 @$registry = ();
688 717
… …
735 $filename, length $$rdata, scalar @$objs; 764 $filename, length $$rdata, scalar @$objs;
736 765
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 767 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 768 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 769 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 770 close $fh;
742 771
743 if (@$objs) { 772 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 773 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 774 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 775 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 776 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 777 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 778 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 779 aio_rename "$filename.pst~", "$filename.pst";
751 } 780 }
752 } else { 781 } else {
753 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
… …
945 974
946sub exists($) { 975sub exists($) {
947 my ($login) = @_; 976 my ($login) = @_;
948 977
949 $cf::PLAYER{$login} 978 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 979 or cf::sync_job { !aio_stat path $login }
951} 980}
952 981
953sub find($) { 982sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 983 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 984 my $login = $_[0];
… …
1001 1030
1002=cut 1031=cut
1003 1032
1004sub quit_character { 1033sub quit_character {
1005 my ($pl) = @_; 1034 my ($pl) = @_;
1035
1036 my $name = $pl->ob->name;
1006 1037
1007 $pl->{deny_save} = 1; 1038 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir 1039 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009 1040
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1041 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1015 my $path = playerdir $pl; 1046 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~"; 1047 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp; 1048 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name}; 1049 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy; 1050 $pl->destroy;
1051
1052 my $prefix = qr<^~\Q$name\E/>;
1053
1054 # nuke player maps
1055 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1056
1020 IO::AIO::aio_rmtree $temp; 1057 IO::AIO::aio_rmtree $temp;
1058}
1059
1060=item $pl->kick
1061
1062Kicks a player out of the game. This destroys the connection.
1063
1064=cut
1065
1066sub kick {
1067 my ($pl, $kicker) = @_;
1068
1069 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1070 $pl->killer ("kicked");
1071 $pl->ns->destroy;
1021} 1072}
1022 1073
1023=item cf::player::list_logins 1074=item cf::player::list_logins
1024 1075
1025Returns am arrayref of all valid playernames in the system, can take a 1076Returns am arrayref of all valid playernames in the system, can take a
… …
1053=cut 1104=cut
1054 1105
1055sub maps($) { 1106sub maps($) {
1056 my ($pl) = @_; 1107 my ($pl) = @_;
1057 1108
1109 $pl = ref $pl ? $pl->ob->name : $pl;
1110
1058 my $files = aio_readdir playerdir $pl 1111 my $files = aio_readdir playerdir $pl
1059 or return; 1112 or return;
1060 1113
1061 my @paths; 1114 my @paths;
1062 1115
1063 for (@$files) { 1116 for (@$files) {
1064 utf8::decode $_; 1117 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1118 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1119 next unless /^$PATH_SEP/o;
1067 1120
1068 s/\.map$//; 1121 push @paths, cf::map::normalise "~$pl/$_";
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 } 1122 }
1071 1123
1072 \@paths 1124 \@paths
1073} 1125}
1074 1126
… …
1101 1153
1102use Fcntl; 1154use Fcntl;
1103use Coro::AIO; 1155use Coro::AIO;
1104 1156
1105use overload 1157use overload
1106 '""' => \&as_string; 1158 '""' => \&as_string,
1159 fallback => 1;
1107 1160
1108our $MAX_RESET = 3600; 1161our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1162our $DEFAULT_RESET = 3000;
1110 1163
1111sub generate_random_map { 1164sub generate_random_map {
1112 my ($self, $rmp) = @_; 1165 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1166 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1167 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1168 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1169 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1170 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1177 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1178 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1179 )
1128} 1180}
1129 1181
1182=item cf::map->register ($regex, $prio)
1183
1184Register a handler for the map path matching the given regex at the
1185givne priority (higher is better, built-in handlers have priority 0, the
1186default).
1187
1188=cut
1189
1130sub register { 1190sub register {
1131 my (undef, $regex) = @_; 1191 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1192 my $pkg = caller;
1133 1193
1134 no strict; 1194 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1195 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1196
1137 $EXT_MAP{$pkg} = qr<$regex>; 1197 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1198}
1139 1199
1140# also paths starting with '/' 1200# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1201$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1202
1203sub thawer_merge {
1204 my ($self, $merge) = @_;
1205
1206 # we have to keep some variables in memory intact
1207 local $self->{path};
1208 local $self->{load_path};
1209 local $self->{deny_save};
1210 local $self->{deny_reset};
1211
1212 $self->SUPER::thawer_merge ($merge);
1213}
1142 1214
1143sub normalise { 1215sub normalise {
1144 my ($path, $base) = @_; 1216 my ($path, $base) = @_;
1217
1218 $path = "$path"; # make sure its a string
1219
1220 $path =~ s/\.map$//;
1145 1221
1146 # map plan: 1222 # map plan:
1147 # 1223 #
1148 # /! non-realised random map exit (special hack!) 1224 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1225 # {... are special paths that are not being touched
… …
1177 1253
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1254 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179 1255
1180 $path = normalise $path, $base; 1256 $path = normalise $path, $base;
1181 1257
1182 for my $pkg (keys %EXT_MAP) { 1258 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1259 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1260 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1261 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1262 $self->init; # pass $1 etc.
1187 return $self; 1263 return $self;
1188 } 1264 }
1189 } 1265 }
1190 1266
1191 Carp::carp "unable to resolve path '$path'."; 1267 Carp::carp "unable to resolve path '$path' (base '$base').";
1192 () 1268 ()
1193} 1269}
1194 1270
1195sub init { 1271sub init {
1196 my ($self) = @_; 1272 my ($self) = @_;
… …
1211 1287
1212# the original (read-only) location 1288# the original (read-only) location
1213sub load_path { 1289sub load_path {
1214 my ($self) = @_; 1290 my ($self) = @_;
1215 1291
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1292 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1217} 1293}
1218 1294
1219# the temporary/swap location 1295# the temporary/swap location
1220sub save_path { 1296sub save_path {
1221 my ($self) = @_; 1297 my ($self) = @_;
1222 1298
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1299 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1300 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1225} 1301}
1226 1302
1227# the unique path, undef == no special unique path 1303# the unique path, undef == no special unique path
1228sub uniq_path { 1304sub uniq_path {
1229 my ($self) = @_; 1305 my ($self) = @_;
… …
1243 1319
1244sub unlink_save { 1320sub unlink_save {
1245 my ($self) = @_; 1321 my ($self) = @_;
1246 1322
1247 utf8::encode (my $save = $self->save_path); 1323 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1324 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1325 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1326}
1251 1327
1252sub load_header_from($) { 1328sub load_header_from($) {
1253 my ($self, $path) = @_; 1329 my ($self, $path) = @_;
1254 1330
1255 utf8::encode $path; 1331 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1332 #aio_open $path, O_RDONLY, 0
1257 or return; 1333 # or return;
1258 1334
1259 $self->_load_header ($path) 1335 $self->_load_header ($path)
1260 or return; 1336 or return;
1261 1337
1262 $self->{load_path} = $path; 1338 $self->{load_path} = $path;
1263 1339
1264 1 1340 1
1265} 1341}
1266 1342
1267sub load_orig { 1343sub load_header_orig {
1268 my ($self) = @_; 1344 my ($self) = @_;
1269 1345
1270 $self->load_header_from ($self->load_path) 1346 $self->load_header_from ($self->load_path)
1271} 1347}
1272 1348
1273sub load_temp { 1349sub load_header_temp {
1274 my ($self) = @_; 1350 my ($self) = @_;
1275 1351
1276 $self->load_header_from ($self->save_path) 1352 $self->load_header_from ($self->save_path)
1353}
1354
1355sub prepare_temp {
1356 my ($self) = @_;
1357
1358 $self->last_access ((delete $self->{last_access})
1359 || $cf::RUNTIME); #d#
1360 # safety
1361 $self->{instantiate_time} = $cf::RUNTIME
1362 if $self->{instantiate_time} > $cf::RUNTIME;
1363}
1364
1365sub prepare_orig {
1366 my ($self) = @_;
1367
1368 $self->{load_original} = 1;
1369 $self->{instantiate_time} = $cf::RUNTIME;
1370 $self->last_access ($cf::RUNTIME);
1371 $self->instantiate;
1277} 1372}
1278 1373
1279sub load_header { 1374sub load_header {
1280 my ($self) = @_; 1375 my ($self) = @_;
1281 1376
1282 if ($self->load_temp) { 1377 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1378 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1379 } else {
1289 $self->load_orig 1380 $self->load_header_orig
1290 or return; 1381 or return;
1291 1382 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1383 }
1297 1384
1298 1 1385 1
1299} 1386}
1300 1387
… …
1314 $map->{last_save} = $cf::RUNTIME; 1401 $map->{last_save} = $cf::RUNTIME;
1315 1402
1316 $map->load_header 1403 $map->load_header
1317 or return; 1404 or return;
1318 1405
1319 if ($map->should_reset) { 1406 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1407 # doing this can freeze the server in a sync job, obviously
1408 #$cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1409 $map->reset;
1321 undef $guard; 1410 undef $guard;
1322 $map = find $path 1411 return find $path;
1323 or return;
1324 } 1412 }
1325 1413
1326 $cf::MAP{$path} = $map 1414 $cf::MAP{$path} = $map
1327 } 1415 }
1328} 1416}
1417
1418sub pre_load { }
1419sub post_load { }
1329 1420
1330sub load { 1421sub load {
1331 my ($self) = @_; 1422 my ($self) = @_;
1332 1423
1424 local $self->{deny_reset} = 1; # loading can take a long time
1425
1333 my $path = $self->{path}; 1426 my $path = $self->{path};
1334 my $guard = cf::lock_acquire "map_load:$path"; 1427 my $guard = cf::lock_acquire "map_load:$path";
1335 1428
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1429 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1430
1338 $self->in_memory (cf::MAP_LOADING); 1431 $self->in_memory (cf::MAP_LOADING);
1339 1432
1340 $self->alloc; 1433 $self->alloc;
1434
1435 $self->pre_load;
1436
1341 $self->_load_objects ($self->{load_path}, 1) 1437 $self->_load_objects ($self->{load_path}, 1)
1342 or return; 1438 or return;
1343 1439
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1440 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1345 if delete $self->{load_original}; 1441 if delete $self->{load_original};
… …
1367 unless $self->difficulty; 1463 unless $self->difficulty;
1368 Coro::cede; 1464 Coro::cede;
1369 $self->activate; 1465 $self->activate;
1370 } 1466 }
1371 1467
1468 $self->post_load;
1469
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1470 $self->in_memory (cf::MAP_IN_MEMORY);
1373} 1471}
1374 1472
1375sub customise_for { 1473sub customise_for {
1376 my ($self, $ob) = @_; 1474 my ($self, $ob) = @_;
… …
1416 1514
1417 cf::sync_job { $map->load }; 1515 cf::sync_job { $map->load };
1418} 1516}
1419 1517
1420our %MAP_PREFETCH; 1518our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1519our $MAP_PREFETCHER = undef;
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433 1520
1434sub find_async { 1521sub find_async {
1435 my ($path, $origin) = @_; 1522 my ($path, $origin) = @_;
1436 1523
1437 $path = normalise $path, $origin && $origin->{path}; 1524 $path = normalise $path, $origin && $origin->{path};
1438 1525
1439 if (my $map = $cf::MAP{$path}) { 1526 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1527 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1528 }
1442 1529
1443 $MAP_PREFETCH{$path} = 0; 1530 undef $MAP_PREFETCH{$path};
1531 $MAP_PREFETCHER ||= cf::async {
1532 while (%MAP_PREFETCH) {
1533 for my $path (keys %MAP_PREFETCH) {
1534 my $map = find $path
1535 or next;
1536 $map->load;
1537
1538 delete $MAP_PREFETCH{$path};
1539 }
1540 }
1541 undef $MAP_PREFETCHER;
1542 };
1444 $MAP_PREFETCHER->ready; 1543 $MAP_PREFETCHER->prio (6);
1445 1544
1446 () 1545 ()
1447} 1546}
1448 1547
1449sub save { 1548sub save {
… …
1494 1593
1495sub reset_at { 1594sub reset_at {
1496 my ($self) = @_; 1595 my ($self) = @_;
1497 1596
1498 # TODO: safety, remove and allow resettable per-player maps 1597 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1598 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1599 return 1e99 if $self->{deny_reset};
1501 1600
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1601 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1602 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 1603
… …
1509 my ($self) = @_; 1608 my ($self) = @_;
1510 1609
1511 $self->reset_at <= $cf::RUNTIME 1610 $self->reset_at <= $cf::RUNTIME
1512} 1611}
1513 1612
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 1613sub reset {
1529 my ($self) = @_; 1614 my ($self) = @_;
1530 1615
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1616 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1617
1533 return if $self->players; 1618 return if $self->players;
1534 return if $self->isa ("ext::map_per_player");#d# 1619 return if $self->isa ("ext::map_per_player");#d#
1535 1620
1536 warn "resetting map ", $self->path;#d# 1621 warn "resetting map ", $self->path;#d#
1537 1622
1623 $self->in_memory (cf::MAP_SWAPPED);
1624
1625 # need to save uniques path
1626 unless ($self->{deny_save}) {
1627 my $uniq = $self->uniq_path; utf8::encode $uniq;
1628
1629 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1630 if $uniq;
1631 }
1632
1538 delete $cf::MAP{$self->path}; 1633 delete $cf::MAP{$self->path};
1539 1634
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear; 1635 $self->clear;
1542 1636
1543 $_->clear_links_to ($self) for values %cf::MAP; 1637 $_->clear_links_to ($self) for values %cf::MAP;
1544 1638
1545 $self->unlink_save; 1639 $self->unlink_save;
… …
1549my $nuke_counter = "aaaa"; 1643my $nuke_counter = "aaaa";
1550 1644
1551sub nuke { 1645sub nuke {
1552 my ($self) = @_; 1646 my ($self) = @_;
1553 1647
1648 delete $cf::MAP{$self->path};
1649
1650 $self->unlink_save;
1651
1652 bless $self, "cf::map";
1653 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1654 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1655 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1656 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1657
1658 $cf::MAP{$self->path} = $self;
1659
1557 $self->reset; # polite request, might not happen 1660 $self->reset; # polite request, might not happen
1558} 1661}
1559 1662
1560=item cf::map::unique_maps 1663=item cf::map::unique_maps
1561 1664
… …
1573 for (@$files) { 1676 for (@$files) {
1574 utf8::decode $_; 1677 utf8::decode $_;
1575 next if /\.pst$/; 1678 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o; 1679 next unless /^$PATH_SEP/o;
1577 1680
1578 s/\.map$//; 1681 push @paths, cf::map::normalise $_;
1579 push @paths, $_;
1580 } 1682 }
1581 1683
1582 \@paths 1684 \@paths
1583} 1685}
1584 1686
… …
1678=cut 1780=cut
1679 1781
1680sub link_map { 1782sub link_map {
1681 unless ($LINK_MAP) { 1783 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 1784 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1785 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 1786 $LINK_MAP->load;
1685 } 1787 }
1686 1788
1687 $LINK_MAP 1789 $LINK_MAP
1688} 1790}
… …
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1797 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 1798
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 1800 if $self->map;
1699 1801
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1802 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 1803}
1702 1804
1703sub cf::object::player::leave_link { 1805sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 1806 my ($self, $map, $x, $y) = @_;
1705 1807
… …
1727 $map->load; 1829 $map->load;
1728 $map->load_diag; 1830 $map->load_diag;
1729 1831
1730 return unless $self->contr->active; 1832 return unless $self->contr->active;
1731 $self->activate_recursive; 1833 $self->activate_recursive;
1834
1835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1732 $self->enter_map ($map, $x, $y); 1836 $self->enter_map ($map, $x, $y);
1733} 1837}
1734 1838
1735cf::player->attach ( 1839cf::player->attach (
1736 on_logout => sub { 1840 on_logout => sub {
… …
1749 # try to abort aborted map switching on player login :) 1853 # try to abort aborted map switching on player login :)
1750 # should happen only on crashes 1854 # should happen only on crashes
1751 if ($pl->ob->{_link_pos}) { 1855 if ($pl->ob->{_link_pos}) {
1752 $pl->ob->enter_link; 1856 $pl->ob->enter_link;
1753 (async { 1857 (async {
1754 # we need this sleep as the login has a concurrent enter_exit running
1755 # and this sleep increases chances of the player not ending up in scorn
1756 $pl->ob->reply (undef, 1858 $pl->ob->reply (undef,
1757 "There was an internal problem at your last logout, " 1859 "There was an internal problem at your last logout, "
1758 . "the server will try to bring you to your intended destination in a second.", 1860 . "the server will try to bring you to your intended destination in a second.",
1759 cf::NDI_RED); 1861 cf::NDI_RED);
1862 # we need this sleep as the login has a concurrent enter_exit running
1863 # and this sleep increases chances of the player not ending up in scorn
1760 Coro::Timer::sleep 1; 1864 Coro::Timer::sleep 1;
1761 $pl->ob->leave_link; 1865 $pl->ob->leave_link;
1762 })->prio (2); 1866 })->prio (2);
1763 } 1867 }
1764 }, 1868 },
… …
1772 my ($self, $path, $x, $y) = @_; 1876 my ($self, $path, $x, $y) = @_;
1773 1877
1774 $self->enter_link; 1878 $self->enter_link;
1775 1879
1776 (async { 1880 (async {
1881 my $map = eval {
1777 my $map = cf::map::find $path; 1882 my $map = cf::map::find $path;
1778 $map = $map->customise_for ($self) if $map; 1883 $map = $map->customise_for ($self) if $map;
1779 1884 $map
1780# warn "entering ", $map->path, " at ($x, $y)\n" 1885 } or
1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1886 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1784 1887
1785 $self->leave_link ($map, $x, $y); 1888 $self->leave_link ($map, $x, $y);
1786 })->prio (1); 1889 })->prio (1);
1787} 1890}
1788 1891
… …
1792 1895
1793sub parse_random_map_params { 1896sub parse_random_map_params {
1794 my ($spec) = @_; 1897 my ($spec) = @_;
1795 1898
1796 my $rmp = { # defaults 1899 my $rmp = { # defaults
1797 xsize => 10, 1900 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 1901 ysize => (cf::rndm 15, 40),
1902 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1903 #layout => string,
1799 }; 1904 };
1800 1905
1801 for (split /\n/, $spec) { 1906 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 1907 my ($k, $v) = split /\s+/, $_, 2;
1803 1908
… …
1807 $rmp 1912 $rmp
1808} 1913}
1809 1914
1810sub prepare_random_map { 1915sub prepare_random_map {
1811 my ($exit) = @_; 1916 my ($exit) = @_;
1917
1918 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 1919
1813 # all this does is basically replace the /! path by 1920 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 1921 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 1922 # that depends on the exit object
1816 1923
1817 my $rmp = parse_random_map_params $exit->msg; 1924 my $rmp = parse_random_map_params $exit->msg;
1818 1925
1819 if ($exit->map) { 1926 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 1927 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 1928 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 1929 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 1930 $rmp->{origin_y} = $exit->y;
1824 } 1931 }
1825 1932
1826 $rmp->{random_seed} ||= $exit->random_seed; 1933 $rmp->{random_seed} ||= $exit->random_seed;
1827 1934
1828 my $data = cf::to_json $rmp; 1935 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 1936 my $md5 = Digest::MD5::md5_hex $data;
1937 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1830 1938
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1939 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 1940 aio_write $fh, 0, (length $data), $data, 0;
1941 undef $fh;
1942 aio_rename "$meta~", $meta;
1833 1943
1834 $exit->slaying ("?random/$md5"); 1944 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 1945 $exit->msg (undef);
1836 } 1946 }
1837} 1947}
1838 1948
1839sub cf::object::player::enter_exit { 1949sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 1950 my ($self, $exit) = @_;
1841 1951
1842 return unless $self->type == cf::PLAYER; 1952 return unless $self->type == cf::PLAYER;
1953
1954 if ($exit->slaying eq "/!") {
1955 #TODO: this should de-fi-ni-te-ly not be a sync-job
1956 cf::sync_job { prepare_random_map $exit };
1957 }
1958
1959 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1960 my $hp = $exit->stats->hp;
1961 my $sp = $exit->stats->sp;
1843 1962
1844 $self->enter_link; 1963 $self->enter_link;
1845 1964
1846 (async { 1965 (async {
1847 $self->deactivate_recursive; # just to be sure 1966 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 1967 unless (eval {
1849 prepare_random_map $exit 1968 $self->goto ($slaying, $hp, $sp);
1850 if $exit->slaying eq "/!";
1851
1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1854 1969
1855 1; 1970 1;
1856 }) { 1971 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 1972 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "I'll try to bring you back to the map you were before. " 1973 . "I'll try to bring you back to the map you were before. "
… …
1919 # get handled first 2034 # get handled first
1920 my $queue = delete $ns->{query_queue} 2035 my $queue = delete $ns->{query_queue}
1921 or return; # be conservative, not sure how that can happen, but we saw a crash here 2036 or return; # be conservative, not sure how that can happen, but we saw a crash here
1922 2037
1923 (shift @$queue)->[1]->($msg); 2038 (shift @$queue)->[1]->($msg);
2039 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1924 2040
1925 push @{ $ns->{query_queue} }, @$queue; 2041 push @{ $ns->{query_queue} }, @$queue;
1926 2042
1927 if (@{ $ns->{query_queue} } == @$queue) { 2043 if (@{ $ns->{query_queue} } == @$queue) {
1928 if (@$queue) { 2044 if (@$queue) {
… …
2089The parameter C<$family> should best start with the name of the extension 2205The parameter C<$family> should best start with the name of the extension
2090using it, it should be unique. 2206using it, it should be unique.
2091 2207
2092=over 4 2208=over 4
2093 2209
2094=item $hashref = cf::db_get $family
2095
2096Return a hashref for use by the extension C<$family>, which can be
2097modified. After modifications, you have to call C<cf::db_dirty> or
2098C<cf::db_sync>.
2099
2100=item $value = cf::db_get $family => $key 2210=item $value = cf::db_get $family => $key
2101 2211
2102Returns a single value from the database 2212Returns a single value from the database.
2103
2104=item cf::db_put $family => $hashref
2105
2106Stores the given family hashref into the database. Updates are delayed, if
2107you want the data to be synced to disk immediately, use C<cf::db_sync>.
2108 2213
2109=item cf::db_put $family => $key => $value 2214=item cf::db_put $family => $key => $value
2110 2215
2111Stores the given C<$value> in the family hash. Updates are delayed, if you 2216Stores the given C<$value> in the family.
2112want the data to be synced to disk immediately, use C<cf::db_sync>.
2113
2114=item cf::db_dirty
2115
2116Marks the database as dirty, to be updated at a later time.
2117
2118=item cf::db_sync
2119
2120Immediately write the database to disk I<if it is dirty>.
2121 2217
2122=cut 2218=cut
2123 2219
2124our $DB; 2220our $DB;
2125 2221
2126{ 2222sub db_init {
2223 unless ($DB) {
2224 $DB = BDB::db_create $DB_ENV;
2225
2226 cf::sync_job {
2227 eval {
2228 $DB->set_flags (BDB::CHKSUM);
2229
2230 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2231 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2232 cf::cleanup "db_open(db): $!" if $!;
2233 };
2234 cf::cleanup "db_open(db): $@" if $@;
2235 };
2236
2127 my $path = cf::localdir . "/database.pst"; 2237 my $path = cf::localdir . "/database.pst";
2238 if (stat $path) {
2239 cf::sync_job {
2240 my $pst = Storable::retrieve $path;
2128 2241
2129 sub db_load() { 2242 cf::db_put (board => data => $pst->{board});
2130 $DB = stat $path ? Storable::retrieve $path : { }; 2243 cf::db_put (guildrules => data => $pst->{guildrules});
2131 } 2244 cf::db_put (rent => balance => $pst->{rent}{balance});
2245 BDB::db_env_txn_checkpoint $DB_ENV;
2132 2246
2133 my $pid; 2247 unlink $path;
2134
2135 sub db_save() {
2136 waitpid $pid, 0 if $pid;
2137 if (0 == ($pid = fork)) {
2138 $DB->{_meta}{version} = 1;
2139 Storable::nstore $DB, "$path~";
2140 rename "$path~", $path;
2141 cf::_exit 0 if defined $pid;
2142 } 2248 };
2143 }
2144
2145 my $dirty;
2146
2147 sub db_sync() {
2148 db_save if $dirty;
2149 undef $dirty;
2150 }
2151
2152 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2153 db_sync;
2154 });
2155
2156 sub db_dirty() {
2157 $dirty = 1;
2158 $idle->start;
2159 }
2160
2161 sub db_get($;$) {
2162 @_ >= 2
2163 ? $DB->{$_[0]}{$_[1]}
2164 : ($DB->{$_[0]} ||= { })
2165 }
2166
2167 sub db_put($$;$) {
2168 if (@_ >= 3) {
2169 $DB->{$_[0]}{$_[1]} = $_[2];
2170 } else {
2171 $DB->{$_[0]} = $_[1];
2172 }
2173 db_dirty;
2174 }
2175
2176 cf::global->attach (
2177 prio => 10000,
2178 on_cleanup => sub {
2179 db_sync;
2180 }, 2249 }
2181 ); 2250 }
2251}
2252
2253sub db_get($$) {
2254 my $key = "$_[0]/$_[1]";
2255
2256 cf::sync_job {
2257 BDB::db_get $DB, undef, $key, my $data;
2258
2259 $! ? ()
2260 : Compress::LZF::sthaw $data
2261 }
2262}
2263
2264sub db_put($$$) {
2265 BDB::dbreq_pri 4;
2266 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2182} 2267}
2183 2268
2184############################################################################# 2269#############################################################################
2185# the server's main() 2270# the server's init and main functions
2271
2272sub load_faces {
2273 my $path = sprintf "%s/faces", cf::datadir;
2274
2275 warn "loading faces from $path\n";
2276
2277 my $faces;
2278 0 < aio_load $path, $faces
2279 or die "$path: $!";
2280
2281 Coro::cede;
2282 $faces = Storable::thaw $faces;
2283 Coro::cede;
2284
2285 while (my ($face, $info) = each %$faces) {
2286 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2287 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2288 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2289 Coro::cede;
2290 }
2291
2292 1
2293}
2294
2295sub reload_resources {
2296 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2297 or die "unable to load regions file\n";#d#
2298 load_faces
2299 or die "unable to load faces\n";#d#
2300}
2301
2302sub init {
2303 reload_resources;
2304}
2186 2305
2187sub cfg_load { 2306sub cfg_load {
2188 open my $fh, "<:utf8", cf::confdir . "/config" 2307 open my $fh, "<:utf8", cf::confdir . "/config"
2189 or return; 2308 or return;
2190 2309
… …
2207 2326
2208sub main { 2327sub main {
2209 # we must not ever block the main coroutine 2328 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2329 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2330 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2331 (async {
2212 async { Event::one_event }; 2332 Event::one_event;
2333 })->prio (Coro::PRIO_MAX);
2213 }; 2334 };
2214 2335
2215 cfg_load; 2336 cfg_load;
2216 db_load; 2337 db_init;
2217 load_extensions; 2338 load_extensions;
2339
2340 $TICK_WATCHER->start;
2218 Event::loop; 2341 Event::loop;
2219} 2342}
2220 2343
2221############################################################################# 2344#############################################################################
2222# initialisation and cleanup 2345# initialisation and cleanup
2223 2346
2224# install some emergency cleanup handlers 2347# install some emergency cleanup handlers
2225BEGIN { 2348BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 2349 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 2350 Event->signal (
2351 reentrant => 0,
2228 data => WF_AUTOCANCEL, 2352 data => WF_AUTOCANCEL,
2229 signal => $signal, 2353 signal => $signal,
2354 prio => 0,
2230 cb => sub { 2355 cb => sub {
2231 cf::cleanup "SIG$signal"; 2356 cf::cleanup "SIG$signal";
2232 }, 2357 },
2233 ); 2358 );
2234 } 2359 }
2235} 2360}
… …
2256 my $map = $cf::MAP{$path} or next; 2381 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next; 2382 $map->valid or next;
2258 $map->save; 2383 $map->save;
2259 } 2384 }
2260 warn "end emergency map save\n"; 2385 warn "end emergency map save\n";
2386
2387 warn "begin emergency database checkpoint\n";
2388 BDB::db_env_txn_checkpoint $DB_ENV;
2389 warn "end emergency database checkpoint\n";
2261 }; 2390 };
2262 2391
2263 warn "leave emergency perl save\n"; 2392 warn "leave emergency perl save\n";
2393}
2394
2395sub post_cleanup {
2396 my ($make_core) = @_;
2397
2398 warn Carp::longmess "post_cleanup backtrace"
2399 if $make_core;
2264} 2400}
2265 2401
2266sub reload() { 2402sub reload() {
2267 # can/must only be called in main 2403 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 2404 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 2405 warn "can only reload from main coroutine";
2270 return; 2406 return;
2271 } 2407 }
2272 2408
2273 warn "reloading..."; 2409 warn "reloading...";
2274 2410
2275 warn "freezing server"; 2411 warn "entering sync_job";
2276 my $guard = freeze_mainloop; 2412
2413 cf::sync_job {
2414 cf::write_runtime; # external watchdog should not bark
2277 cf::emergency_save; 2415 cf::emergency_save;
2416 cf::write_runtime; # external watchdog should not bark
2278 2417
2279 warn "sync database to disk"; 2418 warn "syncing database to disk";
2280 cf::db_sync; 2419 BDB::db_env_txn_checkpoint $DB_ENV;
2281 IO::AIO::flush;
2282 2420
2283 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 2421 # if anything goes wrong in here, we should simply crash as we already saved
2285 2422
2286 warn "cancel all watchers"; 2423 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 2424 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 2425 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 2426 }
2290 2427
2428 warn "flushing outstanding aio requests";
2429 for (;;) {
2430 BDB::flush;
2431 IO::AIO::flush;
2432 Coro::cede;
2433 last unless IO::AIO::nreqs || BDB::nreqs;
2434 warn "iterate...";
2435 }
2436
2437 ++$RELOAD;
2438
2291 warn "cancel all extension coros"; 2439 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 2440 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 2441 %EXT_CORO = ();
2294 2442
2295 warn "remove commands"; 2443 warn "removing commands";
2296 %COMMAND = (); 2444 %COMMAND = ();
2297 2445
2298 warn "remove ext commands"; 2446 warn "removing ext commands";
2299 %EXTCMD = (); 2447 %EXTCMD = ();
2300 2448
2301 warn "unload/nuke all extensions"; 2449 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 2450 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 2451 warn "... unloading $pkg";
2304 2452
2305 if (my $cb = $pkg->can ("unload")) { 2453 if (my $cb = $pkg->can ("unload")) {
2306 eval { 2454 eval {
… …
2311 2459
2312 warn "... nuking $pkg"; 2460 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 2461 Symbol::delete_package $pkg;
2314 } 2462 }
2315 2463
2316 warn "unload all perl modules loaded from $LIBDIR"; 2464 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 2465 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2466 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 2467
2320 warn "removing <$k>"; 2468 warn "... unloading $k";
2321 delete $INC{$k}; 2469 delete $INC{$k};
2322 2470
2323 $k =~ s/\.pm$//; 2471 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 2472 $k =~ s/\//::/g;
2325 2473
… …
2328 } 2476 }
2329 2477
2330 Symbol::delete_package $k; 2478 Symbol::delete_package $k;
2331 } 2479 }
2332 2480
2333 warn "get rid of safe::, as good as possible"; 2481 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 2482 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2483 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 2484
2337 warn "unload cf.pm \"a bit\""; 2485 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 2486 delete $INC{"cf.pm"};
2339 2487
2340 # don't, removes xs symbols, too, 2488 # don't, removes xs symbols, too,
2341 # and global variables created in xs 2489 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 2490 #Symbol::delete_package __PACKAGE__;
2343 2491
2492 warn "unload completed, starting to reload now";
2493
2344 warn "reloading cf.pm"; 2494 warn "reloading cf.pm";
2345 require cf; 2495 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2496 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 2497
2348 warn "load config and database again"; 2498 warn "loading config and database again";
2349 cf::cfg_load; 2499 cf::cfg_load;
2350 cf::db_load;
2351 2500
2352 warn "load extensions"; 2501 warn "loading extensions";
2353 cf::load_extensions; 2502 cf::load_extensions;
2354 2503
2355 warn "reattach attachments to objects/players"; 2504 warn "reattaching attachments to objects/players";
2356 _global_reattach; 2505 _global_reattach; # objects, sockets
2357 warn "reattach attachments to maps"; 2506 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 2507 reattach $_ for values %MAP;
2359 }; 2508 warn "reattaching attachments to players";
2509 reattach $_ for values %PLAYER;
2360 2510
2361 if ($@) { 2511 warn "loading reloadable resources";
2512 reload_resources;
2513
2514 warn "leaving sync_job";
2515
2516 1
2517 } or do {
2362 warn $@; 2518 warn $@;
2363 warn "error while reloading, exiting."; 2519 warn "error while reloading, exiting.";
2364 exit 1; 2520 exit 1;
2365 } 2521 };
2366 2522
2367 warn "reloaded"; 2523 warn "reloaded";
2368}; 2524};
2369 2525
2526our $RELOAD_WATCHER; # used only during reload
2527
2370register_command "reload" => sub { 2528register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2529 my ($who, $arg) = @_;
2372 2530
2373 if ($who->flag (FLAG_WIZ)) { 2531 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload."); 2532 $who->message ("reloading server.");
2533
2534 # doing reload synchronously and two reloads happen back-to-back,
2535 # coro crashes during coro_state_free->destroy here.
2536
2537 $RELOAD_WATCHER ||= Event->timer (
2538 reentrant => 0,
2539 after => 0,
2540 data => WF_AUTOCANCEL,
2541 cb => sub {
2375 reload; 2542 reload;
2376 $who->message ("end of reload."); 2543 undef $RELOAD_WATCHER;
2544 },
2545 );
2377 } 2546 }
2378}; 2547};
2379 2548
2380unshift @INC, $LIBDIR; 2549unshift @INC, $LIBDIR;
2550
2551my $bug_warning = 0;
2381 2552
2382$TICK_WATCHER = Event->timer ( 2553$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 2554 reentrant => 0,
2555 parked => 1,
2384 prio => 0, 2556 prio => 0,
2385 at => $NEXT_TICK || $TICK, 2557 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 2558 data => WF_AUTOCANCEL,
2387 cb => sub { 2559 cb => sub {
2560 if ($Coro::current != $Coro::main) {
2561 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2562 unless ++$bug_warning > 10;
2563 return;
2564 }
2565
2388 $NOW = Event::time; 2566 $NOW = Event::time;
2389 2567
2390 cf::server_tick; # one server iteration 2568 cf::server_tick; # one server iteration
2391 $RUNTIME += $TICK; 2569 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 2570 $NEXT_TICK += $TICK;
2393 2571
2572 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2573 $NEXT_RUNTIME_WRITE = $NOW + 10;
2574 Coro::async_pool {
2575 write_runtime
2576 or warn "ERROR: unable to write runtime file: $!";
2577 };
2578 }
2579
2394 $WAIT_FOR_TICK->broadcast; 2580 $WAIT_FOR_TICK->broadcast;
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2581 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2582
2583# my $AFTER = Event::time;
2584# warn $AFTER - $NOW;#d#
2396 2585
2397 # if we are delayed by four ticks or more, skip them all 2586 # if we are delayed by four ticks or more, skip them all
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2587 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2399 2588
2400 $TICK_WATCHER->at ($NEXT_TICK); 2589 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 2590 $TICK_WATCHER->start;
2402 }, 2591 },
2403); 2592);
2404 2593
2594{
2405IO::AIO::max_poll_time $TICK * 0.2; 2595 BDB::max_poll_time $TICK * 0.1;
2406 2596 $BDB_POLL_WATCHER = Event->io (
2407Event->io ( 2597 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 2598 fd => BDB::poll_fileno,
2409 poll => 'r', 2599 poll => 'r',
2410 prio => 5, 2600 prio => 0,
2411 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb,
2413);
2414
2415Event->timer (
2416 data => WF_AUTOCANCEL, 2601 data => WF_AUTOCANCEL,
2417 after => 0, 2602 cb => \&BDB::poll_cb,
2418 interval => 10, 2603 );
2419 cb => sub { 2604 BDB::min_parallel 8;
2420 (Coro::unblock_sub { 2605
2421 write_runtime 2606 BDB::set_sync_prepare {
2422 or warn "ERROR: unable to write runtime file: $!"; 2607 my $status;
2608 my $current = $Coro::current;
2609 (
2610 sub {
2611 $status = $!;
2612 $current->ready; undef $current;
2613 },
2614 sub {
2615 Coro::schedule while defined $current;
2616 $! = $status;
2617 },
2618 )
2619 };
2620
2621 unless ($DB_ENV) {
2622 $DB_ENV = BDB::db_env_create;
2623
2624 cf::sync_job {
2625 eval {
2626 BDB::db_env_open
2627 $DB_ENV,
2628 $BDB_ENV_DIR,
2629 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2630 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2631 0666;
2632
2633 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2634
2635 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2636 $DB_ENV->set_lk_detect;
2637 };
2638
2639 cf::cleanup "db_env_open(db): $@" if $@;
2423 })->(); 2640 };
2424 }, 2641 }
2425); 2642}
2643
2644{
2645 IO::AIO::min_parallel 8;
2646
2647 undef $Coro::AIO::WATCHER;
2648 IO::AIO::max_poll_time $TICK * 0.1;
2649 $AIO_POLL_WATCHER = Event->io (
2650 reentrant => 0,
2651 data => WF_AUTOCANCEL,
2652 fd => IO::AIO::poll_fileno,
2653 poll => 'r',
2654 prio => 6,
2655 cb => \&IO::AIO::poll_cb,
2656 );
2657}
2426 2658
2427END { cf::emergency_save } 2659END { cf::emergency_save }
2428 2660
24291 26611
2430 2662

Diff Legend

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