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.226 by root, Wed Mar 14 04:12:29 2007 UTC

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

Diff Legend

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