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.189 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.248 by root, Tue Apr 17 18:40:32 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.4 (); 14use Coro 3.61 ();
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;
21use Coro::Storable;
19 22
23use BDB ();
20use Data::Dumper; 24use Data::Dumper;
21use Digest::MD5; 25use Digest::MD5;
22use Fcntl; 26use Fcntl;
27use YAML::Syck ();
23use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 29use Time::HiRes;
30use Compress::LZF;
26 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
37
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 39
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
33 42
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 46
36our %COMMAND = (); 47our %COMMAND = ();
37our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
38 49
39our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 51our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
43 54
55our $RELOAD; # number of reloads so far
44our @EVENT; 56our @EVENT;
45our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
46 58
47our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 60our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 61our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 63our $NEXT_TICK;
52our $NOW; 64our $NOW;
65our $USE_FSYNC = 1; # use fsync to write maps - default off
66
67our $BDB_POLL_WATCHER;
68our $DB_ENV;
53 69
54our %CFG; 70our %CFG;
55 71
56our $UPTIME; $UPTIME ||= time; 72our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 73our $RUNTIME;
58 74
59our %PLAYER; # all users 75our %PLAYER; # all users
60our %MAP; # all maps 76our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
63 79our $BDB_ENV_DIR = cf::localdir . "/db";
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 80
67# used to convert map paths into valid unix filenames by replacing / by ∕ 81# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 83
70binmode STDOUT; 84binmode STDOUT;
80mkdir cf::localdir; 94mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 95mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 96mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 97mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
85 100
86our $EMERGENCY_POSITION; 101our $EMERGENCY_POSITION;
102
103sub cf::map::normalise;
87 104
88############################################################################# 105#############################################################################
89 106
90=head2 GLOBAL VARIABLES 107=head2 GLOBAL VARIABLES
91 108
116=item %cf::CFG 133=item %cf::CFG
117 134
118Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 136from wherever your confdir points to.
120 137
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
122 139
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 141returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 142per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 143
128=back 144=back
129 145
130=cut 146=cut
131 147
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 207 $d
192 } || "[unable to dump $_[0]: '$@']"; 208 } || "[unable to dump $_[0]: '$@']";
193} 209}
194 210
195use JSON::Syck (); # TODO# replace by JSON::PC once working 211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 212
197=item $ref = cf::from_json $json 213=item $ref = cf::from_json $json
198 214
199Converts a JSON string into the corresponding perl data structure. 215Converts a JSON string into the corresponding perl data structure.
200 216
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 217=item $json = cf::to_json $ref
209 218
210Converts a perl data structure into its JSON representation. 219Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 220
219=item cf::lock_wait $string 221=item cf::lock_wait $string
220 222
221Wait until the given lock is available. See cf::lock_acquire. 223Wait until the given lock is available. See cf::lock_acquire.
222 224
261sub freeze_mainloop { 263sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
263 265
264 my $guard = Coro::guard { 266 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 267 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 268 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
270 $guard 270 $guard
271} 271}
272 272
273=item cf::async { BLOCK } 273=item cf::async { BLOCK }
344 344
345 $coro 345 $coro
346} 346}
347 347
348sub write_runtime { 348sub write_runtime {
349 my $guard = cf::lock_acquire "write_runtime";
350
349 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
350 352
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 354 or return;
353 355
356 # 60 allows for the watchdog to kill the server. 358 # 60 allows for the watchdog to kill the server.
357 359
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 361 and return;
360 362
363 # always fsync - this file is important
361 aio_fsync $fh 364 aio_fsync $fh
362 and return; 365 and return;
363 366
364 close $fh 367 close $fh
365 or return; 368 or return;
366 369
367 aio_rename "$runtime~", $runtime 370 aio_rename "$runtime~", $runtime
368 and return; 371 and return;
369 372
370 1 373 1
374}
375
376=item cf::datalog type => key => value, ...
377
378Log a datalog packet of the given type with the given key-value pairs.
379
380=cut
381
382sub datalog($@) {
383 my ($type, %kv) = @_;
384 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 385}
372 386
373=back 387=back
374 388
375=cut 389=cut
750 $filename, length $$rdata, scalar @$objs; 764 $filename, length $$rdata, scalar @$objs;
751 765
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 767 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 768 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 769 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 770 close $fh;
757 771
758 if (@$objs) { 772 if (@$objs) {
759 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) {
760 chmod SAVE_MODE, $fh; 774 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 775 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 776 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 777 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 778 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 779 aio_rename "$filename.pst~", "$filename.pst";
766 } 780 }
767 } else { 781 } else {
768 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
947} 961}
948 962
949sub path($) { 963sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 965
952 (playerdir $login) . "/$login.pl" 966 (playerdir $login) . "/playerdata"
953} 967}
954 968
955sub find_active($) { 969sub find_active($) {
956 $cf::PLAYER{$_[0]} 970 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 971 and $cf::PLAYER{$_[0]}->active
970 my $login = $_[0]; 984 my $login = $_[0];
971 985
972 my $guard = cf::lock_acquire "user_find:$login"; 986 my $guard = cf::lock_acquire "user_find:$login";
973 987
974 $cf::PLAYER{$_[0]} || do { 988 $cf::PLAYER{$_[0]} || do {
989 # rename old playerfiles to new ones
990 #TODO: remove when no longer required
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl";
995
975 my $pl = load_pl path $login 996 my $pl = load_pl path $login
976 or return; 997 or return;
977 $cf::PLAYER{$login} = $pl 998 $cf::PLAYER{$login} = $pl
978 } 999 }
979 } 1000 }
1016 1037
1017=cut 1038=cut
1018 1039
1019sub quit_character { 1040sub quit_character {
1020 my ($pl) = @_; 1041 my ($pl) = @_;
1042
1043 my $name = $pl->ob->name;
1021 1044
1022 $pl->{deny_save} = 1; 1045 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1046 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1047
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1048 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1030 my $path = playerdir $pl; 1053 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1054 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1055 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1056 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1057 $pl->destroy;
1058
1059 my $prefix = qr<^~\Q$name\E/>;
1060
1061 # nuke player maps
1062 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1063
1035 IO::AIO::aio_rmtree $temp; 1064 IO::AIO::aio_rmtree $temp;
1065}
1066
1067=item $pl->kick
1068
1069Kicks a player out of the game. This destroys the connection.
1070
1071=cut
1072
1073sub kick {
1074 my ($pl, $kicker) = @_;
1075
1076 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1077 $pl->killer ("kicked");
1078 $pl->ns->destroy;
1036} 1079}
1037 1080
1038=item cf::player::list_logins 1081=item cf::player::list_logins
1039 1082
1040Returns am arrayref of all valid playernames in the system, can take a 1083Returns am arrayref of all valid playernames in the system, can take a
1068=cut 1111=cut
1069 1112
1070sub maps($) { 1113sub maps($) {
1071 my ($pl) = @_; 1114 my ($pl) = @_;
1072 1115
1116 $pl = ref $pl ? $pl->ob->name : $pl;
1117
1073 my $files = aio_readdir playerdir $pl 1118 my $files = aio_readdir playerdir $pl
1074 or return; 1119 or return;
1075 1120
1076 my @paths; 1121 my @paths;
1077 1122
1078 for (@$files) { 1123 for (@$files) {
1079 utf8::decode $_; 1124 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1125 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1126 next unless /^$PATH_SEP/o;
1082 1127
1083 s/\.map$//; 1128 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1129 }
1086 1130
1087 \@paths 1131 \@paths
1088} 1132}
1089 1133
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1134=item $player->ext_reply ($msgid, %msg)
1091 1135
1092Sends an ext reply to the player. 1136Sends an ext reply to the player.
1093 1137
1094=cut 1138=cut
1095 1139
1096sub ext_reply($$$%) { 1140sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1141 my ($self, $id, %msg) = @_;
1098 1142
1099 $msg{msgid} = $id; 1143 $msg{msgid} = $id;
1100 1144
1101 $self->send ("ext " . cf::to_json \%msg); 1145 $self->send ("ext " . cf::to_json \%msg);
1102} 1146}
1103 1147
1104package cf; 1148=item $player->ext_event ($type, %msg)
1149
1150Sends an ext event to the client.
1151
1152=cut
1153
1154sub ext_event($$%) {
1155 my ($self, $type, %msg) = @_;
1156
1157 $self->ns->ext_event ($type, %msg);
1158}
1159
1160=head3 cf::region
1161
1162=over 4
1163
1164=cut
1165
1166package cf::region;
1167
1168=item cf::region::find_by_path $path
1169
1170Tries to decuce the probable region for a map knowing only its path.
1171
1172=cut
1173
1174sub find_by_path($) {
1175 my ($path) = @_;
1176
1177 my ($match, $specificity);
1178
1179 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) {
1181 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity;
1183 }
1184 }
1185
1186 $match
1187}
1105 1188
1106=back 1189=back
1107
1108 1190
1109=head3 cf::map 1191=head3 cf::map
1110 1192
1111=over 4 1193=over 4
1112 1194
1176} 1258}
1177 1259
1178sub normalise { 1260sub normalise {
1179 my ($path, $base) = @_; 1261 my ($path, $base) = @_;
1180 1262
1263 $path = "$path"; # make sure its a string
1264
1265 $path =~ s/\.map$//;
1266
1181 # map plan: 1267 # map plan:
1182 # 1268 #
1183 # /! non-realised random map exit (special hack!) 1269 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1270 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1271 # ?xxx/... are special absolute paths
1221 $self->init; # pass $1 etc. 1307 $self->init; # pass $1 etc.
1222 return $self; 1308 return $self;
1223 } 1309 }
1224 } 1310 }
1225 1311
1226 Carp::carp "unable to resolve path '$path'."; 1312 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1313 ()
1228} 1314}
1229 1315
1230sub init { 1316sub init {
1231 my ($self) = @_; 1317 my ($self) = @_;
1246 1332
1247# the original (read-only) location 1333# the original (read-only) location
1248sub load_path { 1334sub load_path {
1249 my ($self) = @_; 1335 my ($self) = @_;
1250 1336
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1338}
1253 1339
1254# the temporary/swap location 1340# the temporary/swap location
1255sub save_path { 1341sub save_path {
1256 my ($self) = @_; 1342 my ($self) = @_;
1257 1343
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1346}
1261 1347
1262# the unique path, undef == no special unique path 1348# the unique path, undef == no special unique path
1263sub uniq_path { 1349sub uniq_path {
1264 my ($self) = @_; 1350 my ($self) = @_;
1286 1372
1287sub load_header_from($) { 1373sub load_header_from($) {
1288 my ($self, $path) = @_; 1374 my ($self, $path) = @_;
1289 1375
1290 utf8::encode $path; 1376 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1377 #aio_open $path, O_RDONLY, 0
1292 or return; 1378 # or return;
1293 1379
1294 $self->_load_header ($path) 1380 $self->_load_header ($path)
1295 or return; 1381 or return;
1296 1382
1297 $self->{load_path} = $path; 1383 $self->{load_path} = $path;
1339 $self->load_header_orig 1425 $self->load_header_orig
1340 or return; 1426 or return;
1341 $self->prepare_orig; 1427 $self->prepare_orig;
1342 } 1428 }
1343 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1344 1 1433 1
1345} 1434}
1346 1435
1347sub find; 1436sub find;
1348sub find { 1437sub find {
1360 $map->{last_save} = $cf::RUNTIME; 1449 $map->{last_save} = $cf::RUNTIME;
1361 1450
1362 $map->load_header 1451 $map->load_header
1363 or return; 1452 or return;
1364 1453
1365 if ($map->should_reset) { 1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1455 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1456 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1457 $map->reset;
1369 undef $guard; 1458 undef $guard;
1370 $map = find $path 1459 return find $path;
1371 or return;
1372 } 1460 }
1373 1461
1374 $cf::MAP{$path} = $map 1462 $cf::MAP{$path} = $map
1375 } 1463 }
1376} 1464}
1379sub post_load { } 1467sub post_load { }
1380 1468
1381sub load { 1469sub load {
1382 my ($self) = @_; 1470 my ($self) = @_;
1383 1471
1472 local $self->{deny_reset} = 1; # loading can take a long time
1473
1384 my $path = $self->{path}; 1474 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1475 my $guard = cf::lock_acquire "map_load:$path";
1386 1476
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1477 return if $self->in_memory != cf::MAP_SWAPPED;
1388 1478
1389 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1390 1480
1391 $self->alloc; 1481 $self->alloc;
1392 1482
1393 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1394 1485
1395 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1396 or return; 1487 or return;
1397 1488
1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1405 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1406 } 1497 }
1407 } 1498 }
1408 1499
1409 Coro::cede; 1500 Coro::cede;
1410
1411 # now do the right thing for maps 1501 # now do the right thing for maps
1412 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1413 1504
1414 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1415 $self->decay_objects; 1506 $self->decay_objects;
1416 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1417 $self->update_buttons; 1508 $self->update_buttons;
1419 $self->set_darkness_map; 1510 $self->set_darkness_map;
1420 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1421 unless $self->difficulty; 1512 unless $self->difficulty;
1422 Coro::cede; 1513 Coro::cede;
1423 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1424 } 1516 }
1425 1517
1426 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1427 1520
1428 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1429} 1522}
1430 1523
1431sub customise_for { 1524sub customise_for {
1576 return if $self->players; 1669 return if $self->players;
1577 return if $self->isa ("ext::map_per_player");#d# 1670 return if $self->isa ("ext::map_per_player");#d#
1578 1671
1579 warn "resetting map ", $self->path;#d# 1672 warn "resetting map ", $self->path;#d#
1580 1673
1674 $self->in_memory (cf::MAP_SWAPPED);
1675
1676 # need to save uniques path
1677 unless ($self->{deny_save}) {
1678 my $uniq = $self->uniq_path; utf8::encode $uniq;
1679
1680 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1681 if $uniq;
1682 }
1683
1581 delete $cf::MAP{$self->path}; 1684 delete $cf::MAP{$self->path};
1582 1685
1583 $self->in_memory (cf::MAP_SWAPPED);
1584 $self->clear; 1686 $self->clear;
1585 1687
1586 $_->clear_links_to ($self) for values %cf::MAP; 1688 $_->clear_links_to ($self) for values %cf::MAP;
1587 1689
1588 $self->unlink_save; 1690 $self->unlink_save;
1625 for (@$files) { 1727 for (@$files) {
1626 utf8::decode $_; 1728 utf8::decode $_;
1627 next if /\.pst$/; 1729 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o; 1730 next unless /^$PATH_SEP/o;
1629 1731
1630 s/\.map$//; 1732 push @paths, cf::map::normalise $_;
1631 push @paths, $_;
1632 } 1733 }
1633 1734
1634 \@paths 1735 \@paths
1635} 1736}
1636 1737
1730=cut 1831=cut
1731 1832
1732sub link_map { 1833sub link_map {
1733 unless ($LINK_MAP) { 1834 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 1835 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1836 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 1837 $LINK_MAP->load;
1737 } 1838 }
1738 1839
1739 $LINK_MAP 1840 $LINK_MAP
1740} 1841}
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1848 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 1849
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 1851 if $self->map;
1751 1852
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1853 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 1854}
1754 1855
1755sub cf::object::player::leave_link { 1856sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 1857 my ($self, $map, $x, $y) = @_;
1757 1858
1779 $map->load; 1880 $map->load;
1780 $map->load_diag; 1881 $map->load_diag;
1781 1882
1782 return unless $self->contr->active; 1883 return unless $self->contr->active;
1783 $self->activate_recursive; 1884 $self->activate_recursive;
1885
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1784 $self->enter_map ($map, $x, $y); 1887 $self->enter_map ($map, $x, $y);
1785} 1888}
1786 1889
1787cf::player->attach ( 1890cf::player->attach (
1788 on_logout => sub { 1891 on_logout => sub {
1801 # try to abort aborted map switching on player login :) 1904 # try to abort aborted map switching on player login :)
1802 # should happen only on crashes 1905 # should happen only on crashes
1803 if ($pl->ob->{_link_pos}) { 1906 if ($pl->ob->{_link_pos}) {
1804 $pl->ob->enter_link; 1907 $pl->ob->enter_link;
1805 (async { 1908 (async {
1806 # we need this sleep as the login has a concurrent enter_exit running
1807 # and this sleep increases chances of the player not ending up in scorn
1808 $pl->ob->reply (undef, 1909 $pl->ob->reply (undef,
1809 "There was an internal problem at your last logout, " 1910 "There was an internal problem at your last logout, "
1810 . "the server will try to bring you to your intended destination in a second.", 1911 . "the server will try to bring you to your intended destination in a second.",
1811 cf::NDI_RED); 1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1812 Coro::Timer::sleep 1; 1915 Coro::Timer::sleep 1;
1813 $pl->ob->leave_link; 1916 $pl->ob->leave_link;
1814 })->prio (2); 1917 })->prio (2);
1815 } 1918 }
1816 }, 1919 },
1824 my ($self, $path, $x, $y) = @_; 1927 my ($self, $path, $x, $y) = @_;
1825 1928
1826 $self->enter_link; 1929 $self->enter_link;
1827 1930
1828 (async { 1931 (async {
1932 my $map = eval {
1829 my $map = cf::map::find $path; 1933 my $map = cf::map::find $path;
1830 $map = $map->customise_for ($self) if $map; 1934 $map = $map->customise_for ($self) if $map;
1831 1935 $map
1832# warn "entering ", $map->path, " at ($x, $y)\n" 1936 } or
1833# if $map;
1834
1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1836 1938
1837 $self->leave_link ($map, $x, $y); 1939 $self->leave_link ($map, $x, $y);
1838 })->prio (1); 1940 })->prio (1);
1839} 1941}
1840 1942
1871 # that depends on the exit object 1973 # that depends on the exit object
1872 1974
1873 my $rmp = parse_random_map_params $exit->msg; 1975 my $rmp = parse_random_map_params $exit->msg;
1874 1976
1875 if ($exit->map) { 1977 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 1978 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 1979 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 1980 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 1981 $rmp->{origin_y} = $exit->y;
1880 } 1982 }
1881 1983
1898sub cf::object::player::enter_exit { 2000sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 2001 my ($self, $exit) = @_;
1900 2002
1901 return unless $self->type == cf::PLAYER; 2003 return unless $self->type == cf::PLAYER;
1902 2004
2005 if ($exit->slaying eq "/!") {
2006 #TODO: this should de-fi-ni-te-ly not be a sync-job
2007 # the problem is that $exit might not survive long enough
2008 # so it needs to be done right now, right here
2009 cf::sync_job { prepare_random_map $exit };
2010 }
2011
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp;
2015
1903 $self->enter_link; 2016 $self->enter_link;
1904 2017
1905 (async { 2018 (async {
1906 $self->deactivate_recursive; # just to be sure 2019 $self->deactivate_recursive; # just to be sure
1907 unless (eval { 2020 unless (eval {
1908 prepare_random_map $exit 2021 $self->goto ($slaying, $hp, $sp);
1909 if $exit->slaying eq "/!";
1910
1911 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1912 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1913 2022
1914 1; 2023 1;
1915 }) { 2024 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 2025 $self->message ("Something went wrong deep within the crossfire server. "
1917 . "I'll try to bring you back to the map you were before. " 2026 . "I'll try to bring you back to the map you were before. "
1918 . "Please report this to the dungeon master!", 2027 . "Please report this to the dungeon master!",
1919 cf::NDI_UNIQUE | cf::NDI_RED); 2028 cf::NDI_UNIQUE | cf::NDI_RED);
1920 2029
1921 warn "ERROR in enter_exit: $@"; 2030 warn "ERROR in enter_exit: $@";
1922 $self->leave_link; 2031 $self->leave_link;
1923 } 2032 }
1924 })->prio (1); 2033 })->prio (1);
1937 2046
1938sub cf::client::send_drawinfo { 2047sub cf::client::send_drawinfo {
1939 my ($self, $text, $flags) = @_; 2048 my ($self, $text, $flags) = @_;
1940 2049
1941 utf8::encode $text; 2050 utf8::encode $text;
1942 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1943} 2052}
1944 2053
2054=item $client->ext_event ($type, %msg)
2055
2056Sends an exti event to the client.
2057
2058=cut
2059
2060sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_;
2062
2063 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg);
2065}
1945 2066
1946=item $success = $client->query ($flags, "text", \&cb) 2067=item $success = $client->query ($flags, "text", \&cb)
1947 2068
1948Queues a query to the client, calling the given callback with 2069Queues a query to the client, calling the given callback with
1949the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1978 # get handled first 2099 # get handled first
1979 my $queue = delete $ns->{query_queue} 2100 my $queue = delete $ns->{query_queue}
1980 or return; # be conservative, not sure how that can happen, but we saw a crash here 2101 or return; # be conservative, not sure how that can happen, but we saw a crash here
1981 2102
1982 (shift @$queue)->[1]->($msg); 2103 (shift @$queue)->[1]->($msg);
2104 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 2105
1984 push @{ $ns->{query_queue} }, @$queue; 2106 push @{ $ns->{query_queue} }, @$queue;
1985 2107
1986 if (@{ $ns->{query_queue} } == @$queue) { 2108 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 2109 if (@$queue) {
2045 2167
2046# here we export the classes and methods available to script code 2168# here we export the classes and methods available to script code
2047 2169
2048=pod 2170=pod
2049 2171
2050The following fucntions and emthods are available within a safe environment: 2172The following functions and methods are available within a safe environment:
2051 2173
2052 cf::object contr pay_amount pay_player map 2174 cf::object contr pay_amount pay_player map
2053 cf::object::player player 2175 cf::object::player player
2054 cf::player peaceful 2176 cf::player peaceful
2055 cf::map trigger 2177 cf::map trigger
2148The parameter C<$family> should best start with the name of the extension 2270The parameter C<$family> should best start with the name of the extension
2149using it, it should be unique. 2271using it, it should be unique.
2150 2272
2151=over 4 2273=over 4
2152 2274
2153=item $hashref = cf::db_get $family
2154
2155Return a hashref for use by the extension C<$family>, which can be
2156modified. After modifications, you have to call C<cf::db_dirty> or
2157C<cf::db_sync>.
2158
2159=item $value = cf::db_get $family => $key 2275=item $value = cf::db_get $family => $key
2160 2276
2161Returns a single value from the database 2277Returns a single value from the database.
2162
2163=item cf::db_put $family => $hashref
2164
2165Stores the given family hashref into the database. Updates are delayed, if
2166you want the data to be synced to disk immediately, use C<cf::db_sync>.
2167 2278
2168=item cf::db_put $family => $key => $value 2279=item cf::db_put $family => $key => $value
2169 2280
2170Stores the given C<$value> in the family hash. Updates are delayed, if you 2281Stores the given C<$value> in the family.
2171want the data to be synced to disk immediately, use C<cf::db_sync>.
2172
2173=item cf::db_dirty
2174
2175Marks the database as dirty, to be updated at a later time.
2176
2177=item cf::db_sync
2178
2179Immediately write the database to disk I<if it is dirty>.
2180 2282
2181=cut 2283=cut
2182 2284
2183our $DB; 2285our $DB;
2184 2286
2185{ 2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2186 my $path = cf::localdir . "/database.pst"; 2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2187 2306
2188 sub db_load() { 2307 cf::db_put (board => data => $pst->{board});
2189 $DB = stat $path ? Storable::retrieve $path : { }; 2308 cf::db_put (guildrules => data => $pst->{guildrules});
2190 } 2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2191 2311
2192 my $pid; 2312 unlink $path;
2193
2194 sub db_save() {
2195 waitpid $pid, 0 if $pid;
2196 if (0 == ($pid = fork)) {
2197 $DB->{_meta}{version} = 1;
2198 Storable::nstore $DB, "$path~";
2199 rename "$path~", $path;
2200 cf::_exit 0 if defined $pid;
2201 } 2313 };
2202 }
2203
2204 my $dirty;
2205
2206 sub db_sync() {
2207 db_save if $dirty;
2208 undef $dirty;
2209 }
2210
2211 my $idle = Event->idle (
2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2218 );
2219
2220 sub db_dirty() {
2221 $dirty = 1;
2222 $idle->start;
2223 }
2224
2225 sub db_get($;$) {
2226 @_ >= 2
2227 ? $DB->{$_[0]}{$_[1]}
2228 : ($DB->{$_[0]} ||= { })
2229 }
2230
2231 sub db_put($$;$) {
2232 if (@_ >= 3) {
2233 $DB->{$_[0]}{$_[1]} = $_[2];
2234 } else {
2235 $DB->{$_[0]} = $_[1];
2236 }
2237 db_dirty;
2238 }
2239
2240 cf::global->attach (
2241 prio => 10000,
2242 on_cleanup => sub {
2243 db_sync;
2244 }, 2314 }
2245 ); 2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2246} 2332}
2247 2333
2248############################################################################# 2334#############################################################################
2249# the server's main() 2335# the server's init and main functions
2336
2337sub load_facedata($) {
2338 my ($path) = @_;
2339
2340 warn "loading facedata from $path\n";
2341
2342 my $facedata;
2343 0 < aio_load $path, $facedata
2344 or die "$path: $!";
2345
2346 $facedata = Coro::Storable::thaw $facedata;
2347
2348 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350
2351 {
2352 my $faces = $facedata->{faceinfo};
2353
2354 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2359 Coro::cede;
2360 }
2361
2362 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth};
2364 my $idx = cf::face::find $face
2365 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) {
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2368 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 }
2371 Coro::cede;
2372 }
2373 }
2374
2375 {
2376 my $anims = $facedata->{animinfo};
2377
2378 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede;
2381 }
2382
2383 cf::anim::invalidate_all; # d'oh
2384 }
2385
2386 1
2387}
2388
2389sub reload_facedata {
2390 load_facedata sprintf "%s/facedata", cf::datadir
2391 or die "unable to load facedata\n";
2392}
2393
2394sub reload_regions {
2395 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2396 or die "unable to load regions file\n";
2397}
2398
2399sub reload_archetypes {
2400 load_resource_file sprintf "%s/archetypes", cf::datadir
2401 or die "unable to load archetypes\n";
2402}
2403
2404sub reload_treasures {
2405 load_resource_file sprintf "%s/treasures", cf::datadir
2406 or die "unable to load treasurelists\n";
2407}
2408
2409sub reload_resources {
2410 warn "reloading resource files...\n";
2411
2412 reload_regions;
2413 reload_facedata;
2414 reload_archetypes;
2415 reload_treasures;
2416
2417 warn "finished reloading resource files\n";
2418}
2419
2420sub init {
2421 reload_resources;
2422}
2250 2423
2251sub cfg_load { 2424sub cfg_load {
2252 open my $fh, "<:utf8", cf::confdir . "/config" 2425 open my $fh, "<:utf8", cf::confdir . "/config"
2253 or return; 2426 or return;
2254 2427
2277 Event::one_event; 2450 Event::one_event;
2278 })->prio (Coro::PRIO_MAX); 2451 })->prio (Coro::PRIO_MAX);
2279 }; 2452 };
2280 2453
2281 cfg_load; 2454 cfg_load;
2282 db_load; 2455 db_init;
2283 load_extensions; 2456 load_extensions;
2284 2457
2285 $TICK_WATCHER->start; 2458 $TICK_WATCHER->start;
2286 Event::loop; 2459 Event::loop;
2287} 2460}
2294 for my $signal (qw(INT HUP TERM)) { 2467 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal ( 2468 Event->signal (
2296 reentrant => 0, 2469 reentrant => 0,
2297 data => WF_AUTOCANCEL, 2470 data => WF_AUTOCANCEL,
2298 signal => $signal, 2471 signal => $signal,
2472 prio => 0,
2299 cb => sub { 2473 cb => sub {
2300 cf::cleanup "SIG$signal"; 2474 cf::cleanup "SIG$signal";
2301 }, 2475 },
2302 ); 2476 );
2303 } 2477 }
2325 my $map = $cf::MAP{$path} or next; 2499 my $map = $cf::MAP{$path} or next;
2326 $map->valid or next; 2500 $map->valid or next;
2327 $map->save; 2501 $map->save;
2328 } 2502 }
2329 warn "end emergency map save\n"; 2503 warn "end emergency map save\n";
2504
2505 warn "begin emergency database checkpoint\n";
2506 BDB::db_env_txn_checkpoint $DB_ENV;
2507 warn "end emergency database checkpoint\n";
2330 }; 2508 };
2331 2509
2332 warn "leave emergency perl save\n"; 2510 warn "leave emergency perl save\n";
2333} 2511}
2334 2512
2513sub post_cleanup {
2514 my ($make_core) = @_;
2515
2516 warn Carp::longmess "post_cleanup backtrace"
2517 if $make_core;
2518}
2519
2335sub reload() { 2520sub do_reload_perl() {
2336 # can/must only be called in main 2521 # can/must only be called in main
2337 if ($Coro::current != $Coro::main) { 2522 if ($Coro::current != $Coro::main) {
2338 warn "can only reload from main coroutine"; 2523 warn "can only reload from main coroutine";
2339 return; 2524 return;
2340 } 2525 }
2341 2526
2342 warn "reloading..."; 2527 warn "reloading...";
2343 2528
2344 warn "cancelling server ticker"; 2529 warn "entering sync_job";
2345 $TICK_WATCHER->cancel;
2346 2530
2531 cf::sync_job {
2532 cf::write_runtime; # external watchdog should not bark
2347 cf::emergency_save; 2533 cf::emergency_save;
2534 cf::write_runtime; # external watchdog should not bark
2348 2535
2349 eval { 2536 warn "syncing database to disk";
2537 BDB::db_env_txn_checkpoint $DB_ENV;
2538
2350 # if anything goes wrong in here, we should simply crash as we already saved 2539 # if anything goes wrong in here, we should simply crash as we already saved
2351
2352 warn "syncing database to disk";
2353 cf::db_sync;
2354 2540
2355 warn "cancelling all WF_AUTOCANCEL watchers"; 2541 warn "cancelling all WF_AUTOCANCEL watchers";
2356 for (Event::all_watchers) { 2542 for (Event::all_watchers) {
2357 $_->cancel if $_->data & WF_AUTOCANCEL; 2543 $_->cancel if $_->data & WF_AUTOCANCEL;
2358 } 2544 }
2359 2545
2360 warn "flushing outstanding aio requests"; 2546 warn "flushing outstanding aio requests";
2361 for (;;) { 2547 for (;;) {
2548 BDB::flush;
2362 IO::AIO::flush; 2549 IO::AIO::flush;
2363 Coro::cede; 2550 Coro::cede;
2364 last unless IO::AIO::nreqs; 2551 last unless IO::AIO::nreqs || BDB::nreqs;
2365 warn "iterate..."; 2552 warn "iterate...";
2366 } 2553 }
2554
2555 ++$RELOAD;
2367 2556
2368 warn "cancelling all extension coros"; 2557 warn "cancelling all extension coros";
2369 $_->cancel for values %EXT_CORO; 2558 $_->cancel for values %EXT_CORO;
2370 %EXT_CORO = (); 2559 %EXT_CORO = ();
2371 2560
2424 require cf; 2613 require cf;
2425 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2614 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2426 2615
2427 warn "loading config and database again"; 2616 warn "loading config and database again";
2428 cf::cfg_load; 2617 cf::cfg_load;
2429 cf::db_load;
2430 2618
2431 warn "loading extensions"; 2619 warn "loading extensions";
2432 cf::load_extensions; 2620 cf::load_extensions;
2433 2621
2434 warn "reattaching attachments to objects/players"; 2622 warn "reattaching attachments to objects/players";
2435 _global_reattach; 2623 _global_reattach; # objects, sockets
2436 warn "reattaching attachments to maps"; 2624 warn "reattaching attachments to maps";
2437 reattach $_ for values %MAP; 2625 reattach $_ for values %MAP;
2626 warn "reattaching attachments to players";
2627 reattach $_ for values %PLAYER;
2438 2628
2439 warn "restarting server ticker"; 2629 warn "leaving sync_job";
2440 2630
2441 $TICK_WATCHER->start; 2631 1
2442 }; 2632 } or do {
2443
2444 if ($@) {
2445 warn $@; 2633 warn $@;
2446 warn "error while reloading, exiting."; 2634 warn "error while reloading, exiting.";
2447 exit 1; 2635 exit 1;
2448 } 2636 };
2449 2637
2450 warn "reloaded"; 2638 warn "reloaded";
2451}; 2639};
2452 2640
2453our $RELOAD_WATCHER; # used only during reload 2641our $RELOAD_WATCHER; # used only during reload
2454 2642
2643sub reload_perl() {
2644 # doing reload synchronously and two reloads happen back-to-back,
2645 # coro crashes during coro_state_free->destroy here.
2646
2647 $RELOAD_WATCHER ||= Event->timer (
2648 reentrant => 0,
2649 after => 0,
2650 data => WF_AUTOCANCEL,
2651 cb => sub {
2652 do_reload_perl;
2653 undef $RELOAD_WATCHER;
2654 },
2655 );
2656}
2657
2455register_command "reload" => sub { 2658register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2659 my ($who, $arg) = @_;
2457 2660
2458 if ($who->flag (FLAG_WIZ)) { 2661 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("reloading server."); 2662 $who->message ("reloading server.");
2460 2663 async { reload_perl };
2461 # doing reload synchronously and two reloads happen back-to-back,
2462 # coro crashes during coro_state_free->destroy here.
2463
2464 $RELOAD_WATCHER ||= Event->timer (
2465 reentrant => 0,
2466 after => 0,
2467 data => WF_AUTOCANCEL,
2468 cb => sub {
2469 reload;
2470 undef $RELOAD_WATCHER;
2471 },
2472 );
2473 } 2664 }
2474}; 2665};
2475 2666
2476unshift @INC, $LIBDIR; 2667unshift @INC, $LIBDIR;
2477 2668
2478my $bug_warning = 0; 2669my $bug_warning = 0;
2670
2671our @WAIT_FOR_TICK;
2672our @WAIT_FOR_TICK_BEGIN;
2673
2674sub wait_for_tick {
2675 return unless $TICK_WATCHER->is_active;
2676 return if $Coro::current == $Coro::main;
2677
2678 my $signal = new Coro::Signal;
2679 push @WAIT_FOR_TICK, $signal;
2680 $signal->wait;
2681}
2682
2683sub wait_for_tick_begin {
2684 return unless $TICK_WATCHER->is_active;
2685 return if $Coro::current == $Coro::main;
2686
2687 my $signal = new Coro::Signal;
2688 push @WAIT_FOR_TICK_BEGIN, $signal;
2689 $signal->wait;
2690}
2479 2691
2480$TICK_WATCHER = Event->timer ( 2692$TICK_WATCHER = Event->timer (
2481 reentrant => 0, 2693 reentrant => 0,
2482 parked => 1, 2694 parked => 1,
2483 prio => 0, 2695 prio => 0,
2491 } 2703 }
2492 2704
2493 $NOW = Event::time; 2705 $NOW = Event::time;
2494 2706
2495 cf::server_tick; # one server iteration 2707 cf::server_tick; # one server iteration
2708
2496 $RUNTIME += $TICK; 2709 $RUNTIME += $TICK;
2497 $NEXT_TICK += $TICK; 2710 $NEXT_TICK += $TICK;
2498 2711
2499 $WAIT_FOR_TICK->broadcast; 2712 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2713 $NEXT_RUNTIME_WRITE = $NOW + 10;
2714 Coro::async_pool {
2715 write_runtime
2716 or warn "ERROR: unable to write runtime file: $!";
2717 };
2718 }
2719
2720# my $AFTER = Event::time;
2721# warn $AFTER - $NOW;#d#
2501 2722
2502 # if we are delayed by four ticks or more, skip them all 2723 # if we are delayed by four ticks or more, skip them all
2503 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2724 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2504 2725
2505 $TICK_WATCHER->at ($NEXT_TICK); 2726 $TICK_WATCHER->at ($NEXT_TICK);
2506 $TICK_WATCHER->start; 2727 $TICK_WATCHER->start;
2728
2729 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2730 $sig->send;
2731 }
2732 while (my $sig = shift @WAIT_FOR_TICK) {
2733 $sig->send;
2734 }
2735
2736 _post_tick;
2507 }, 2737 },
2508); 2738);
2509 2739
2740{
2510IO::AIO::max_poll_time $TICK * 0.2; 2741 BDB::max_poll_time $TICK * 0.1;
2742 $BDB_POLL_WATCHER = Event->io (
2743 reentrant => 0,
2744 fd => BDB::poll_fileno,
2745 poll => 'r',
2746 prio => 0,
2747 data => WF_AUTOCANCEL,
2748 cb => \&BDB::poll_cb,
2749 );
2750 BDB::min_parallel 8;
2511 2751
2752 BDB::set_sync_prepare {
2753 my $status;
2754 my $current = $Coro::current;
2755 (
2756 sub {
2757 $status = $!;
2758 $current->ready; undef $current;
2759 },
2760 sub {
2761 Coro::schedule while defined $current;
2762 $! = $status;
2763 },
2764 )
2765 };
2766
2767 unless ($DB_ENV) {
2768 $DB_ENV = BDB::db_env_create;
2769
2770 cf::sync_job {
2771 eval {
2772 BDB::db_env_open
2773 $DB_ENV,
2774 $BDB_ENV_DIR,
2775 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2776 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2777 0666;
2778
2779 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2780
2781 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2782 $DB_ENV->set_lk_detect;
2783 };
2784
2785 cf::cleanup "db_env_open(db): $@" if $@;
2786 };
2787 }
2788}
2789
2790{
2791 IO::AIO::min_parallel 8;
2792
2512undef $Coro::AIO::WATCHER; 2793 undef $Coro::AIO::WATCHER;
2794 IO::AIO::max_poll_time $TICK * 0.1;
2513$AIO_POLL_WATCHER = Event->io ( 2795 $AIO_POLL_WATCHER = Event->io (
2514 reentrant => 0, 2796 reentrant => 0,
2797 data => WF_AUTOCANCEL,
2515 fd => IO::AIO::poll_fileno, 2798 fd => IO::AIO::poll_fileno,
2516 poll => 'r', 2799 poll => 'r',
2517 prio => 6, 2800 prio => 6,
2518 data => WF_AUTOCANCEL,
2519 cb => \&IO::AIO::poll_cb, 2801 cb => \&IO::AIO::poll_cb,
2520); 2802 );
2521 2803}
2522$WRITE_RUNTIME_WATCHER = Event->timer (
2523 reentrant => 0,
2524 data => WF_AUTOCANCEL,
2525 after => 1,
2526 interval => 10,
2527 prio => 6, # keep it lowest so it acts like a watchdog
2528 cb => Coro::unblock_sub {
2529 write_runtime
2530 or warn "ERROR: unable to write runtime file: $!";
2531 },
2532);
2533 2804
2534END { cf::emergency_save } 2805END { cf::emergency_save }
2535 2806
25361 28071
2537 2808

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines