ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.256 by root, Sat Apr 21 16:56:32 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.3 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 76our $NEXT_TICK;
50our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
51 82
52our %CFG; 83our %CFG;
53 84
54our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 86our $RUNTIME;
56 87
57our %PLAYER; # all users 88our %PLAYER; # all users
58our %MAP; # all maps 89our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random";
61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 91
65# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
67 94
68binmode STDOUT; 95binmode STDOUT;
69binmode STDERR; 96binmode STDERR;
70 97
71# read virtual server time, if available 98# read virtual server time, if available
72unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
73 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
74 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
75 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
76} 103}
77 104
78mkdir cf::localdir; 105mkdir $_
79mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
80mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS;
83 107
84our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
109
110sub cf::map::normalise;
85 111
86############################################################################# 112#############################################################################
87 113
88=head2 GLOBAL VARIABLES 114=head2 GLOBAL VARIABLES
89 115
96=item $cf::RUNTIME 122=item $cf::RUNTIME
97 123
98The time this server has run, starts at 0 and is increased by $cf::TICK on 124The time this server has run, starts at 0 and is increased by $cf::TICK on
99every server tick. 125every server tick.
100 126
101=item $cf::LIBDIR 127=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
128$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
129$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
102 130
103The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
104be found. It will be added to C<@INC> automatically. 132directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
133unique-items directory, player file directory, random maps directory and
134database environment.
105 135
106=item $cf::NOW 136=item $cf::NOW
107 137
108The time of the last (current) server tick. 138The time of the last (current) server tick.
109 139
114=item %cf::CFG 144=item %cf::CFG
115 145
116Configuration for the server, loaded from C</etc/crossfire/config>, or 146Configuration for the server, loaded from C</etc/crossfire/config>, or
117from wherever your confdir points to. 147from wherever your confdir points to.
118 148
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 149=item cf::wait_for_tick, cf::wait_for_tick_begin
120 150
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 152returns directly I<after> the tick processing (and consequently, can only wake one process
123processing has been done. Call C<< ->wait >> on them to maximise the 153per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
124window of cpu time available, or simply to synchronise to the server tick.
125 154
126=back 155=back
127 156
128=cut 157=cut
129 158
130BEGIN { 159BEGIN {
131 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
132 my $msg = join "", @_; 161 my $msg = join "", @_;
133 utf8::encode $msg;
134 162
135 $msg .= "\n" 163 $msg .= "\n"
136 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
137 165
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
138 LOG llevError, $msg; 169 LOG llevError, $msg;
139 }; 170 };
140} 171}
141 172
142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d 220 $d
190 } || "[unable to dump $_[0]: '$@']"; 221 } || "[unable to dump $_[0]: '$@']";
191} 222}
192 223
193use JSON::Syck (); # TODO# replace by JSON::PC once working 224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
194 225
195=item $ref = cf::from_json $json 226=item $ref = cf::from_json $json
196 227
197Converts a JSON string into the corresponding perl data structure. 228Converts a JSON string into the corresponding perl data structure.
198 229
199=cut
200
201sub from_json($) {
202 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203 JSON::Syck::Load $_[0]
204}
205
206=item $json = cf::to_json $ref 230=item $json = cf::to_json $ref
207 231
208Converts a perl data structure into its JSON representation. 232Converts a perl data structure into its JSON representation.
209
210=cut
211
212sub to_json($) {
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
214 JSON::Syck::Dump $_[0]
215}
216 233
217=item cf::lock_wait $string 234=item cf::lock_wait $string
218 235
219Wait until the given lock is available. See cf::lock_acquire. 236Wait until the given lock is available. See cf::lock_acquire.
220 237
226returned. 243returned.
227 244
228Lock names should begin with a unique identifier (for example, cf::map::find 245Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
230 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
231=cut 252=cut
232 253
233our %LOCK; 254our %LOCK;
234 255
235sub lock_wait($) { 256sub lock_wait($) {
254 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
256 } 277 }
257} 278}
258 279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
284}
285
259sub freeze_mainloop { 286sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
261 288
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 289 my $guard = Coro::guard {
290 $TICK_WATCHER->start;
291 };
263 $TICK_WATCHER->stop; 292 $TICK_WATCHER->stop;
264 $guard 293 $guard
265} 294}
266 295
267=item cf::async { BLOCK } 296=item cf::async { BLOCK }
338 367
339 $coro 368 $coro
340} 369}
341 370
342sub write_runtime { 371sub write_runtime {
343 return unless $TICK_WATCHER->is_active; 372 my $guard = cf::lock_acquire "write_runtime";
344 373
345 my $runtime = cf::localdir . "/runtime"; 374 my $runtime = "$LOCALDIR/runtime";
346 375
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 377 or return;
349 378
379 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 380 # 10 is the runtime save interval, for a monotonic clock
381 # 60 allows for the watchdog to kill the server.
382
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 383 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 384 and return;
353 385
386 # always fsync - this file is important
354 aio_fsync $fh 387 aio_fsync $fh
355 and return; 388 and return;
356 389
357 close $fh 390 close $fh
358 or return; 391 or return;
359 392
360 aio_rename "$runtime~", $runtime 393 aio_rename "$runtime~", $runtime
361 and return; 394 and return;
362 395
363 1 396 1
397}
398
399=item cf::datalog type => key => value, ...
400
401Log a datalog packet of the given type with the given key-value pairs.
402
403=cut
404
405sub datalog($@) {
406 my ($type, %kv) = @_;
407 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
364} 408}
365 409
366=back 410=back
367 411
368=cut 412=cut
499our @CB_TYPE = (); # registry for type (cf-object class) based events 543our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 544our @CB_MAP = ();
501 545
502my %attachment; 546my %attachment;
503 547
548sub cf::attachable::thawer_merge {
549 # simply override everything except _meta
550 local $_[0]{_meta};
551 %{$_[0]} = %{$_[1]};
552}
553
504sub _attach_cb($$$$) { 554sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 555 my ($registry, $event, $prio, $cb) = @_;
506 556
507 use sort 'stable'; 557 use sort 'stable';
508 558
679# object support 729# object support
680 730
681sub reattach { 731sub reattach {
682 # basically do the same as instantiate, without calling instantiate 732 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 733 my ($obj) = @_;
734
735 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 736
685 my $registry = $obj->registry; 737 my $registry = $obj->registry;
686 738
687 @$registry = (); 739 @$registry = ();
688 740
735 $filename, length $$rdata, scalar @$objs; 787 $filename, length $$rdata, scalar @$objs;
736 788
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 789 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 790 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 791 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 792 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 793 close $fh;
742 794
743 if (@$objs) { 795 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 796 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 797 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 798 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 799 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 800 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 801 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 802 aio_rename "$filename.pst~", "$filename.pst";
751 } 803 }
752 } else { 804 } else {
753 aio_unlink "$filename.pst"; 805 aio_unlink "$filename.pst";
922Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
923 975
924=cut 976=cut
925 977
926sub playerdir($) { 978sub playerdir($) {
927 cf::localdir 979 "$PLAYERDIR/"
928 . "/"
929 . cf::playerdir
930 . "/"
931 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
932} 981}
933 982
934sub path($) { 983sub path($) {
935 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
936 985
937 (playerdir $login) . "/$login.pl" 986 (playerdir $login) . "/playerdata"
938} 987}
939 988
940sub find_active($) { 989sub find_active($) {
941 $cf::PLAYER{$_[0]} 990 $cf::PLAYER{$_[0]}
942 and $cf::PLAYER{$_[0]}->active 991 and $cf::PLAYER{$_[0]}->active
945 994
946sub exists($) { 995sub exists($) {
947 my ($login) = @_; 996 my ($login) = @_;
948 997
949 $cf::PLAYER{$login} 998 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 999 or cf::sync_job { !aio_stat path $login }
951} 1000}
952 1001
953sub find($) { 1002sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 1003 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 1004 my $login = $_[0];
956 1005
957 my $guard = cf::lock_acquire "user_find:$login"; 1006 my $guard = cf::lock_acquire "user_find:$login";
958 1007
959 $cf::PLAYER{$_[0]} || do { 1008 $cf::PLAYER{$_[0]} || do {
1009 # rename old playerfiles to new ones
1010 #TODO: remove when no longer required
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl";
1015
960 my $pl = load_pl path $login 1016 my $pl = load_pl path $login
961 or return; 1017 or return;
962 $cf::PLAYER{$login} = $pl 1018 $cf::PLAYER{$login} = $pl
963 } 1019 }
964 } 1020 }
1001 1057
1002=cut 1058=cut
1003 1059
1004sub quit_character { 1060sub quit_character {
1005 my ($pl) = @_; 1061 my ($pl) = @_;
1062
1063 my $name = $pl->ob->name;
1006 1064
1007 $pl->{deny_save} = 1; 1065 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir 1066 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009 1067
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1068 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1015 my $path = playerdir $pl; 1073 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~"; 1074 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp; 1075 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name}; 1076 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy; 1077 $pl->destroy;
1078
1079 my $prefix = qr<^~\Q$name\E/>;
1080
1081 # nuke player maps
1082 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1083
1020 IO::AIO::aio_rmtree $temp; 1084 IO::AIO::aio_rmtree $temp;
1085}
1086
1087=item $pl->kick
1088
1089Kicks a player out of the game. This destroys the connection.
1090
1091=cut
1092
1093sub kick {
1094 my ($pl, $kicker) = @_;
1095
1096 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1097 $pl->killer ("kicked");
1098 $pl->ns->destroy;
1021} 1099}
1022 1100
1023=item cf::player::list_logins 1101=item cf::player::list_logins
1024 1102
1025Returns am arrayref of all valid playernames in the system, can take a 1103Returns am arrayref of all valid playernames in the system, can take a
1026while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1027 1105
1028=cut 1106=cut
1029 1107
1030sub list_logins { 1108sub list_logins {
1031 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1032 or return []; 1110 or return [];
1033 1111
1034 my @logins; 1112 my @logins;
1035 1113
1036 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
1053=cut 1131=cut
1054 1132
1055sub maps($) { 1133sub maps($) {
1056 my ($pl) = @_; 1134 my ($pl) = @_;
1057 1135
1136 $pl = ref $pl ? $pl->ob->name : $pl;
1137
1058 my $files = aio_readdir playerdir $pl 1138 my $files = aio_readdir playerdir $pl
1059 or return; 1139 or return;
1060 1140
1061 my @paths; 1141 my @paths;
1062 1142
1063 for (@$files) { 1143 for (@$files) {
1064 utf8::decode $_; 1144 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1145 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1146 next unless /^$PATH_SEP/o;
1067 1147
1068 s/\.map$//; 1148 push @paths, cf::map::normalise "~$pl/$_";
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 } 1149 }
1071 1150
1072 \@paths 1151 \@paths
1073} 1152}
1074 1153
1075=item $player->ext_reply ($msgid, $msgtype, %msg) 1154=item $player->ext_reply ($msgid, %msg)
1076 1155
1077Sends an ext reply to the player. 1156Sends an ext reply to the player.
1078 1157
1079=cut 1158=cut
1080 1159
1081sub ext_reply($$$%) { 1160sub ext_reply($$%) {
1082 my ($self, $id, %msg) = @_; 1161 my ($self, $id, %msg) = @_;
1083 1162
1084 $msg{msgid} = $id; 1163 $msg{msgid} = $id;
1085 1164
1086 $self->send ("ext " . cf::to_json \%msg); 1165 $self->send ("ext " . cf::to_json \%msg);
1087} 1166}
1088 1167
1089package cf; 1168=item $player->ext_event ($type, %msg)
1169
1170Sends an ext event to the client.
1171
1172=cut
1173
1174sub ext_event($$%) {
1175 my ($self, $type, %msg) = @_;
1176
1177 $self->ns->ext_event ($type, %msg);
1178}
1179
1180=head3 cf::region
1181
1182=over 4
1183
1184=cut
1185
1186package cf::region;
1187
1188=item cf::region::find_by_path $path
1189
1190Tries to decuce the probable region for a map knowing only its path.
1191
1192=cut
1193
1194sub find_by_path($) {
1195 my ($path) = @_;
1196
1197 my ($match, $specificity);
1198
1199 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) {
1201 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity;
1203 }
1204 }
1205
1206 $match
1207}
1090 1208
1091=back 1209=back
1092
1093 1210
1094=head3 cf::map 1211=head3 cf::map
1095 1212
1096=over 4 1213=over 4
1097 1214
1101 1218
1102use Fcntl; 1219use Fcntl;
1103use Coro::AIO; 1220use Coro::AIO;
1104 1221
1105use overload 1222use overload
1106 '""' => \&as_string; 1223 '""' => \&as_string,
1224 fallback => 1;
1107 1225
1108our $MAX_RESET = 3600; 1226our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1227our $DEFAULT_RESET = 3000;
1110 1228
1111sub generate_random_map { 1229sub generate_random_map {
1112 my ($self, $rmp) = @_; 1230 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1231 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1232 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1233 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1234 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1235 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1242 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1243 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1244 )
1128} 1245}
1129 1246
1247=item cf::map->register ($regex, $prio)
1248
1249Register a handler for the map path matching the given regex at the
1250givne priority (higher is better, built-in handlers have priority 0, the
1251default).
1252
1253=cut
1254
1130sub register { 1255sub register {
1131 my (undef, $regex) = @_; 1256 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1257 my $pkg = caller;
1133 1258
1134 no strict; 1259 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1260 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1261
1137 $EXT_MAP{$pkg} = qr<$regex>; 1262 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1263}
1139 1264
1140# also paths starting with '/' 1265# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1266$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1267
1268sub thawer_merge {
1269 my ($self, $merge) = @_;
1270
1271 # we have to keep some variables in memory intact
1272 local $self->{path};
1273 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276
1277 $self->SUPER::thawer_merge ($merge);
1278}
1142 1279
1143sub normalise { 1280sub normalise {
1144 my ($path, $base) = @_; 1281 my ($path, $base) = @_;
1282
1283 $path = "$path"; # make sure its a string
1284
1285 $path =~ s/\.map$//;
1145 1286
1146 # map plan: 1287 # map plan:
1147 # 1288 #
1148 # /! non-realised random map exit (special hack!) 1289 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1290 # {... are special paths that are not being touched
1177 1318
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1319 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179 1320
1180 $path = normalise $path, $base; 1321 $path = normalise $path, $base;
1181 1322
1182 for my $pkg (keys %EXT_MAP) { 1323 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1324 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1325 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1326 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1327 $self->init; # pass $1 etc.
1187 return $self; 1328 return $self;
1188 } 1329 }
1189 } 1330 }
1190 1331
1191 Carp::carp "unable to resolve path '$path'."; 1332 Carp::carp "unable to resolve path '$path' (base '$base').";
1192 () 1333 ()
1193} 1334}
1194 1335
1195sub init { 1336sub init {
1196 my ($self) = @_; 1337 my ($self) = @_;
1211 1352
1212# the original (read-only) location 1353# the original (read-only) location
1213sub load_path { 1354sub load_path {
1214 my ($self) = @_; 1355 my ($self) = @_;
1215 1356
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1217} 1358}
1218 1359
1219# the temporary/swap location 1360# the temporary/swap location
1220sub save_path { 1361sub save_path {
1221 my ($self) = @_; 1362 my ($self) = @_;
1222 1363
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path.map"
1225} 1366}
1226 1367
1227# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1228sub uniq_path { 1369sub uniq_path {
1229 my ($self) = @_; 1370 my ($self) = @_;
1230 1371
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1233} 1374}
1234 1375
1235# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1236# all maps in C++... 1377# all maps in C++...
1237sub change_all_map_light { 1378sub change_all_map_light {
1243 1384
1244sub unlink_save { 1385sub unlink_save {
1245 my ($self) = @_; 1386 my ($self) = @_;
1246 1387
1247 utf8::encode (my $save = $self->save_path); 1388 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1390 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1391}
1251 1392
1252sub load_header_from($) { 1393sub load_header_from($) {
1253 my ($self, $path) = @_; 1394 my ($self, $path) = @_;
1254 1395
1255 utf8::encode $path; 1396 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1397 #aio_open $path, O_RDONLY, 0
1257 or return; 1398 # or return;
1258 1399
1259 $self->_load_header ($path) 1400 $self->_load_header ($path)
1260 or return; 1401 or return;
1261 1402
1262 $self->{load_path} = $path; 1403 $self->{load_path} = $path;
1263 1404
1264 1 1405 1
1265} 1406}
1266 1407
1267sub load_orig { 1408sub load_header_orig {
1268 my ($self) = @_; 1409 my ($self) = @_;
1269 1410
1270 $self->load_header_from ($self->load_path) 1411 $self->load_header_from ($self->load_path)
1271} 1412}
1272 1413
1273sub load_temp { 1414sub load_header_temp {
1274 my ($self) = @_; 1415 my ($self) = @_;
1275 1416
1276 $self->load_header_from ($self->save_path) 1417 $self->load_header_from ($self->save_path)
1418}
1419
1420sub prepare_temp {
1421 my ($self) = @_;
1422
1423 $self->last_access ((delete $self->{last_access})
1424 || $cf::RUNTIME); #d#
1425 # safety
1426 $self->{instantiate_time} = $cf::RUNTIME
1427 if $self->{instantiate_time} > $cf::RUNTIME;
1428}
1429
1430sub prepare_orig {
1431 my ($self) = @_;
1432
1433 $self->{load_original} = 1;
1434 $self->{instantiate_time} = $cf::RUNTIME;
1435 $self->last_access ($cf::RUNTIME);
1436 $self->instantiate;
1277} 1437}
1278 1438
1279sub load_header { 1439sub load_header {
1280 my ($self) = @_; 1440 my ($self) = @_;
1281 1441
1282 if ($self->load_temp) { 1442 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1443 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1444 } else {
1289 $self->load_orig 1445 $self->load_header_orig
1290 or return; 1446 or return;
1291 1447 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1448 }
1449
1450 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region;
1297 1452
1298 1 1453 1
1299} 1454}
1300 1455
1301sub find; 1456sub find;
1314 $map->{last_save} = $cf::RUNTIME; 1469 $map->{last_save} = $cf::RUNTIME;
1315 1470
1316 $map->load_header 1471 $map->load_header
1317 or return; 1472 or return;
1318 1473
1319 if ($map->should_reset) { 1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1477 $map->reset;
1321 undef $guard; 1478 undef $guard;
1322 $map = find $path 1479 return find $path;
1323 or return;
1324 } 1480 }
1325 1481
1326 $cf::MAP{$path} = $map 1482 $cf::MAP{$path} = $map
1327 } 1483 }
1328} 1484}
1485
1486sub pre_load { }
1487sub post_load { }
1329 1488
1330sub load { 1489sub load {
1331 my ($self) = @_; 1490 my ($self) = @_;
1332 1491
1492 local $self->{deny_reset} = 1; # loading can take a long time
1493
1333 my $path = $self->{path}; 1494 my $path = $self->{path};
1495
1496 {
1334 my $guard = cf::lock_acquire "map_load:$path"; 1497 my $guard = cf::lock_acquire "map_load:$path";
1335 1498
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1499 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1500
1338 $self->in_memory (cf::MAP_LOADING); 1501 $self->in_memory (cf::MAP_LOADING);
1339 1502
1340 $self->alloc; 1503 $self->alloc;
1341 $self->_load_objects ($self->{load_path}, 1)
1342 or return;
1343 1504
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1505 $self->pre_load;
1345 if delete $self->{load_original};
1346
1347 if (my $uniq = $self->uniq_path) {
1348 utf8::encode $uniq;
1349 if (aio_open $uniq, O_RDONLY, 0) {
1350 $self->clear_unique_items;
1351 $self->_load_objects ($uniq, 0);
1352 }
1353 }
1354
1355 Coro::cede;
1356
1357 # now do the right thing for maps
1358 $self->link_multipart_objects;
1359
1360 unless ($self->{deny_activate}) {
1361 $self->decay_objects;
1362 $self->fix_auto_apply;
1363 $self->update_buttons;
1364 Coro::cede; 1506 Coro::cede;
1365 $self->set_darkness_map; 1507
1508 $self->_load_objects ($self->{load_path}, 1)
1509 or return;
1510
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original};
1513
1514 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) {
1517 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0);
1519 }
1520 }
1521
1522 Coro::cede;
1523 # now do the right thing for maps
1524 $self->link_multipart_objects;
1366 $self->difficulty ($self->estimate_difficulty) 1525 $self->difficulty ($self->estimate_difficulty)
1367 unless $self->difficulty; 1526 unless $self->difficulty;
1368 Coro::cede; 1527 Coro::cede;
1528
1529 unless ($self->{deny_activate}) {
1530 $self->decay_objects;
1531 $self->fix_auto_apply;
1532 $self->update_buttons;
1533 Coro::cede;
1534 $self->set_darkness_map;
1535 Coro::cede;
1369 $self->activate; 1536 $self->activate;
1370 } 1537 }
1371 1538
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1539 $self->in_memory (cf::MAP_IN_MEMORY);
1540
1541 undef $guard;
1542 }
1543
1544 $self->post_load;
1373} 1545}
1374 1546
1375sub customise_for { 1547sub customise_for {
1376 my ($self, $ob) = @_; 1548 my ($self, $ob) = @_;
1377 1549
1416 1588
1417 cf::sync_job { $map->load }; 1589 cf::sync_job { $map->load };
1418} 1590}
1419 1591
1420our %MAP_PREFETCH; 1592our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1593our $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 1594
1434sub find_async { 1595sub find_async {
1435 my ($path, $origin) = @_; 1596 my ($path, $origin) = @_;
1436 1597
1437 $path = normalise $path, $origin && $origin->{path}; 1598 $path = normalise $path, $origin && $origin->{path};
1438 1599
1439 if (my $map = $cf::MAP{$path}) { 1600 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1601 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1602 }
1442 1603
1443 $MAP_PREFETCH{$path} = 0; 1604 undef $MAP_PREFETCH{$path};
1605 $MAP_PREFETCHER ||= cf::async {
1606 while (%MAP_PREFETCH) {
1607 for my $path (keys %MAP_PREFETCH) {
1608 my $map = find $path
1609 or next;
1610 $map->load;
1611
1612 delete $MAP_PREFETCH{$path};
1613 }
1614 }
1615 undef $MAP_PREFETCHER;
1616 };
1444 $MAP_PREFETCHER->ready; 1617 $MAP_PREFETCHER->prio (6);
1445 1618
1446 () 1619 ()
1447} 1620}
1448 1621
1449sub save { 1622sub save {
1494 1667
1495sub reset_at { 1668sub reset_at {
1496 my ($self) = @_; 1669 my ($self) = @_;
1497 1670
1498 # TODO: safety, remove and allow resettable per-player maps 1671 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1672 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1673 return 1e99 if $self->{deny_reset};
1501 1674
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1675 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1676 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 1677
1509 my ($self) = @_; 1682 my ($self) = @_;
1510 1683
1511 $self->reset_at <= $cf::RUNTIME 1684 $self->reset_at <= $cf::RUNTIME
1512} 1685}
1513 1686
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 { 1687sub reset {
1529 my ($self) = @_; 1688 my ($self) = @_;
1530 1689
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1690 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1691
1533 return if $self->players; 1692 return if $self->players;
1534 return if $self->isa ("ext::map_per_player");#d# 1693 return if $self->isa ("ext::map_per_player");#d#
1535 1694
1536 warn "resetting map ", $self->path;#d# 1695 warn "resetting map ", $self->path;#d#
1537 1696
1697 $self->in_memory (cf::MAP_SWAPPED);
1698
1699 # need to save uniques path
1700 unless ($self->{deny_save}) {
1701 my $uniq = $self->uniq_path; utf8::encode $uniq;
1702
1703 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1704 if $uniq;
1705 }
1706
1538 delete $cf::MAP{$self->path}; 1707 delete $cf::MAP{$self->path};
1539 1708
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear; 1709 $self->clear;
1542 1710
1543 $_->clear_links_to ($self) for values %cf::MAP; 1711 $_->clear_links_to ($self) for values %cf::MAP;
1544 1712
1545 $self->unlink_save; 1713 $self->unlink_save;
1549my $nuke_counter = "aaaa"; 1717my $nuke_counter = "aaaa";
1550 1718
1551sub nuke { 1719sub nuke {
1552 my ($self) = @_; 1720 my ($self) = @_;
1553 1721
1722 delete $cf::MAP{$self->path};
1723
1724 $self->unlink_save;
1725
1726 bless $self, "cf::map";
1727 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1728 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1729 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1730 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1731
1732 $cf::MAP{$self->path} = $self;
1733
1557 $self->reset; # polite request, might not happen 1734 $self->reset; # polite request, might not happen
1558} 1735}
1559 1736
1560=item cf::map::unique_maps 1737=item cf::map::unique_maps
1561 1738
1563instantiated unique items. May block. 1740instantiated unique items. May block.
1564 1741
1565=cut 1742=cut
1566 1743
1567sub unique_maps() { 1744sub unique_maps() {
1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1745 my $files = aio_readdir $UNIQUEDIR
1569 or return; 1746 or return;
1570 1747
1571 my @paths; 1748 my @paths;
1572 1749
1573 for (@$files) { 1750 for (@$files) {
1574 utf8::decode $_; 1751 utf8::decode $_;
1575 next if /\.pst$/; 1752 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o; 1753 next unless /^$PATH_SEP/o;
1577 1754
1578 s/\.map$//; 1755 push @paths, cf::map::normalise $_;
1579 push @paths, $_;
1580 } 1756 }
1581 1757
1582 \@paths 1758 \@paths
1583} 1759}
1584 1760
1678=cut 1854=cut
1679 1855
1680sub link_map { 1856sub link_map {
1681 unless ($LINK_MAP) { 1857 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 1858 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1859 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 1860 $LINK_MAP->load;
1685 } 1861 }
1686 1862
1687 $LINK_MAP 1863 $LINK_MAP
1688} 1864}
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1871 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 1872
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1873 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 1874 if $self->map;
1699 1875
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1876 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 1877}
1702 1878
1703sub cf::object::player::leave_link { 1879sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 1880 my ($self, $map, $x, $y) = @_;
1705 1881
1727 $map->load; 1903 $map->load;
1728 $map->load_diag; 1904 $map->load_diag;
1729 1905
1730 return unless $self->contr->active; 1906 return unless $self->contr->active;
1731 $self->activate_recursive; 1907 $self->activate_recursive;
1908
1909 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1732 $self->enter_map ($map, $x, $y); 1910 $self->enter_map ($map, $x, $y);
1733} 1911}
1734 1912
1735cf::player->attach ( 1913cf::player->attach (
1736 on_logout => sub { 1914 on_logout => sub {
1749 # try to abort aborted map switching on player login :) 1927 # try to abort aborted map switching on player login :)
1750 # should happen only on crashes 1928 # should happen only on crashes
1751 if ($pl->ob->{_link_pos}) { 1929 if ($pl->ob->{_link_pos}) {
1752 $pl->ob->enter_link; 1930 $pl->ob->enter_link;
1753 (async { 1931 (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, 1932 $pl->ob->reply (undef,
1757 "There was an internal problem at your last logout, " 1933 "There was an internal problem at your last logout, "
1758 . "the server will try to bring you to your intended destination in a second.", 1934 . "the server will try to bring you to your intended destination in a second.",
1759 cf::NDI_RED); 1935 cf::NDI_RED);
1936 # we need this sleep as the login has a concurrent enter_exit running
1937 # and this sleep increases chances of the player not ending up in scorn
1760 Coro::Timer::sleep 1; 1938 Coro::Timer::sleep 1;
1761 $pl->ob->leave_link; 1939 $pl->ob->leave_link;
1762 })->prio (2); 1940 })->prio (2);
1763 } 1941 }
1764 }, 1942 },
1772 my ($self, $path, $x, $y) = @_; 1950 my ($self, $path, $x, $y) = @_;
1773 1951
1774 $self->enter_link; 1952 $self->enter_link;
1775 1953
1776 (async { 1954 (async {
1955 my $map = eval {
1777 my $map = cf::map::find $path; 1956 my $map = cf::map::find $path;
1778 $map = $map->customise_for ($self) if $map; 1957 $map = $map->customise_for ($self) if $map;
1779 1958 $map
1780# warn "entering ", $map->path, " at ($x, $y)\n" 1959 } or
1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1960 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1784 1961
1785 $self->leave_link ($map, $x, $y); 1962 $self->leave_link ($map, $x, $y);
1786 })->prio (1); 1963 })->prio (1);
1787} 1964}
1788 1965
1792 1969
1793sub parse_random_map_params { 1970sub parse_random_map_params {
1794 my ($spec) = @_; 1971 my ($spec) = @_;
1795 1972
1796 my $rmp = { # defaults 1973 my $rmp = { # defaults
1797 xsize => 10, 1974 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 1975 ysize => (cf::rndm 15, 40),
1976 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1977 #layout => string,
1799 }; 1978 };
1800 1979
1801 for (split /\n/, $spec) { 1980 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 1981 my ($k, $v) = split /\s+/, $_, 2;
1803 1982
1807 $rmp 1986 $rmp
1808} 1987}
1809 1988
1810sub prepare_random_map { 1989sub prepare_random_map {
1811 my ($exit) = @_; 1990 my ($exit) = @_;
1991
1992 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 1993
1813 # all this does is basically replace the /! path by 1994 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 1995 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 1996 # that depends on the exit object
1816 1997
1817 my $rmp = parse_random_map_params $exit->msg; 1998 my $rmp = parse_random_map_params $exit->msg;
1818 1999
1819 if ($exit->map) { 2000 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 2001 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 2002 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 2003 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 2004 $rmp->{origin_y} = $exit->y;
1824 } 2005 }
1825 2006
1826 $rmp->{random_seed} ||= $exit->random_seed; 2007 $rmp->{random_seed} ||= $exit->random_seed;
1827 2008
1828 my $data = cf::to_json $rmp; 2009 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 2010 my $md5 = Digest::MD5::md5_hex $data;
2011 my $meta = "$RANDOMDIR/$md5.meta";
1830 2012
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2013 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 2014 aio_write $fh, 0, (length $data), $data, 0;
2015 undef $fh;
2016 aio_rename "$meta~", $meta;
1833 2017
1834 $exit->slaying ("?random/$md5"); 2018 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 2019 $exit->msg (undef);
1836 } 2020 }
1837} 2021}
1838 2022
1839sub cf::object::player::enter_exit { 2023sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 2024 my ($self, $exit) = @_;
1841 2025
1842 return unless $self->type == cf::PLAYER; 2026 return unless $self->type == cf::PLAYER;
2027
2028 if ($exit->slaying eq "/!") {
2029 #TODO: this should de-fi-ni-te-ly not be a sync-job
2030 # the problem is that $exit might not survive long enough
2031 # so it needs to be done right now, right here
2032 cf::sync_job { prepare_random_map $exit };
2033 }
2034
2035 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2036 my $hp = $exit->stats->hp;
2037 my $sp = $exit->stats->sp;
1843 2038
1844 $self->enter_link; 2039 $self->enter_link;
1845 2040
1846 (async { 2041 (async {
1847 $self->deactivate_recursive; # just to be sure 2042 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 2043 unless (eval {
1849 prepare_random_map $exit 2044 $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 2045
1855 1; 2046 1;
1856 }) { 2047 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 2048 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "I'll try to bring you back to the map you were before. " 2049 . "I'll try to bring you back to the map you were before. "
1859 . "Please report this to the dungeon master!", 2050 . "Please report this to the dungeon master!",
1860 cf::NDI_UNIQUE | cf::NDI_RED); 2051 cf::NDI_UNIQUE | cf::NDI_RED);
1861 2052
1862 warn "ERROR in enter_exit: $@"; 2053 warn "ERROR in enter_exit: $@";
1863 $self->leave_link; 2054 $self->leave_link;
1864 } 2055 }
1865 })->prio (1); 2056 })->prio (1);
1878 2069
1879sub cf::client::send_drawinfo { 2070sub cf::client::send_drawinfo {
1880 my ($self, $text, $flags) = @_; 2071 my ($self, $text, $flags) = @_;
1881 2072
1882 utf8::encode $text; 2073 utf8::encode $text;
1883 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2074 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1884} 2075}
1885 2076
2077=item $client->ext_event ($type, %msg)
2078
2079Sends an exti event to the client.
2080
2081=cut
2082
2083sub cf::client::ext_event($$%) {
2084 my ($self, $type, %msg) = @_;
2085
2086 $msg{msgtype} = "event_$type";
2087 $self->send_packet ("ext " . cf::to_json \%msg);
2088}
1886 2089
1887=item $success = $client->query ($flags, "text", \&cb) 2090=item $success = $client->query ($flags, "text", \&cb)
1888 2091
1889Queues a query to the client, calling the given callback with 2092Queues a query to the client, calling the given callback with
1890the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2093the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1919 # get handled first 2122 # get handled first
1920 my $queue = delete $ns->{query_queue} 2123 my $queue = delete $ns->{query_queue}
1921 or return; # be conservative, not sure how that can happen, but we saw a crash here 2124 or return; # be conservative, not sure how that can happen, but we saw a crash here
1922 2125
1923 (shift @$queue)->[1]->($msg); 2126 (shift @$queue)->[1]->($msg);
2127 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1924 2128
1925 push @{ $ns->{query_queue} }, @$queue; 2129 push @{ $ns->{query_queue} }, @$queue;
1926 2130
1927 if (@{ $ns->{query_queue} } == @$queue) { 2131 if (@{ $ns->{query_queue} } == @$queue) {
1928 if (@$queue) { 2132 if (@$queue) {
1986 2190
1987# here we export the classes and methods available to script code 2191# here we export the classes and methods available to script code
1988 2192
1989=pod 2193=pod
1990 2194
1991The following fucntions and emthods are available within a safe environment: 2195The following functions and methods are available within a safe environment:
1992 2196
1993 cf::object contr pay_amount pay_player map 2197 cf::object contr pay_amount pay_player map
1994 cf::object::player player 2198 cf::object::player player
1995 cf::player peaceful 2199 cf::player peaceful
1996 cf::map trigger 2200 cf::map trigger
2081############################################################################# 2285#############################################################################
2082 2286
2083=head2 EXTENSION DATABASE SUPPORT 2287=head2 EXTENSION DATABASE SUPPORT
2084 2288
2085Crossfire maintains a very simple database for extension use. It can 2289Crossfire maintains a very simple database for extension use. It can
2086currently store anything that can be serialised using Storable, which 2290currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2087excludes objects. 2291convert to/from binary).
2088 2292
2089The parameter C<$family> should best start with the name of the extension 2293The parameter C<$family> should best start with the name of the extension
2090using it, it should be unique. 2294using it, it should be unique.
2091 2295
2092=over 4 2296=over 4
2093 2297
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 2298=item $value = cf::db_get $family => $key
2101 2299
2102Returns a single value from the database 2300Returns 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 2301
2109=item cf::db_put $family => $key => $value 2302=item cf::db_put $family => $key => $value
2110 2303
2111Stores the given C<$value> in the family hash. Updates are delayed, if you 2304Stores 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 2305
2122=cut 2306=cut
2123 2307
2124our $DB; 2308our $DB;
2125 2309
2126{ 2310sub db_init {
2127 my $path = cf::localdir . "/database.pst"; 2311 unless ($DB) {
2312 $DB = BDB::db_create $DB_ENV;
2128 2313
2129 sub db_load() { 2314 cf::sync_job {
2130 $DB = stat $path ? Storable::retrieve $path : { }; 2315 eval {
2131 } 2316 $DB->set_flags (BDB::CHKSUM);
2132 2317
2133 my $pid; 2318 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2134 2319 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2135 sub db_save() { 2320 cf::cleanup "db_open(db): $!" if $!;
2136 waitpid $pid, 0 if $pid; 2321 };
2137 if (0 == ($pid = fork)) { 2322 cf::cleanup "db_open(db): $@" if $@;
2138 $DB->{_meta}{version} = 1;
2139 Storable::nstore $DB, "$path~";
2140 rename "$path~", $path;
2141 cf::_exit 0 if defined $pid;
2142 } 2323 };
2143 }
2144
2145 my $dirty;
2146
2147 sub db_sync() {
2148 db_save if $dirty;
2149 undef $dirty;
2150 }
2151
2152 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2153 db_sync;
2154 }); 2324 }
2325}
2155 2326
2156 sub db_dirty() {
2157 $dirty = 1;
2158 $idle->start;
2159 }
2160
2161 sub db_get($;$) { 2327sub db_get($$) {
2162 @_ >= 2 2328 my $key = "$_[0]/$_[1]";
2163 ? $DB->{$_[0]}{$_[1]}
2164 : ($DB->{$_[0]} ||= { })
2165 }
2166 2329
2330 cf::sync_job {
2331 BDB::db_get $DB, undef, $key, my $data;
2332
2333 $! ? ()
2334 : $data
2335 }
2336}
2337
2167 sub db_put($$;$) { 2338sub db_put($$$) {
2168 if (@_ >= 3) { 2339 BDB::dbreq_pri 4;
2169 $DB->{$_[0]}{$_[1]} = $_[2]; 2340 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2170 } else { 2341}
2171 $DB->{$_[0]} = $_[1];
2172 }
2173 db_dirty;
2174 }
2175 2342
2176 cf::global->attach ( 2343=item cf::cache $id => [$paths...], $processversion => $process
2177 prio => 10000, 2344
2178 on_cleanup => sub { 2345Generic caching function that returns the value of the resource $id,
2179 db_sync; 2346caching and regenerating as required.
2347
2348This function can block.
2349
2350=cut
2351
2352sub cache {
2353 my ($id, $src, $processversion, $process) = @_;
2354
2355 my $meta =
2356 join "\x00",
2357 $processversion,
2358 map {
2359 aio_stat $_
2360 and Carp::croak "$_: $!";
2361
2362 ($_, (stat _)[7,9])
2363 } @$src;
2364
2365 my $dbmeta = db_get cache => "$id/meta";
2366 if ($dbmeta ne $meta) {
2367 # changed, we may need to process
2368
2369 my @data;
2370 my $md5;
2371
2372 for (0 .. $#$src) {
2373 0 <= aio_load $src->[$_], $data[$_]
2374 or Carp::croak "$src->[$_]: $!";
2180 }, 2375 }
2181 ); 2376
2377 # if processing is expensive, check
2378 # checksum first
2379 if (1) {
2380 $md5 =
2381 join "\x00",
2382 $processversion,
2383 map {
2384 Coro::cede;
2385 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2386 } 0.. $#$src;
2387
2388
2389 my $dbmd5 = db_get cache => "$id/md5";
2390 if ($dbmd5 eq $md5) {
2391 db_put cache => "$id/meta", $meta;
2392
2393 return db_get cache => "$id/data";
2394 }
2395 }
2396
2397 my $t1 = Time::HiRes::time;
2398 my $data = $process->(\@data);
2399 my $t2 = Time::HiRes::time;
2400
2401 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2402
2403 db_put cache => "$id/data", $data;
2404 db_put cache => "$id/md5" , $md5;
2405 db_put cache => "$id/meta", $meta;
2406
2407 return $data;
2408 }
2409
2410 db_get cache => "$id/data"
2182} 2411}
2412
2413=item fork_call { }, $args
2414
2415Executes the given code block with the given arguments in a seperate
2416process, returning the results. Everything must be serialisable with
2417Coro::Storable. May, of course, block. Note that the executed sub may
2418never block itself or use any form of Event handling.
2419
2420=cut
2421
2422sub fork_call(&@) {
2423 my ($cb, @args) = @_;
2424
2425# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2426# or die "socketpair: $!";
2427 pipe my $fh1, my $fh2
2428 or die "pipe: $!";
2429
2430 if (my $pid = fork) {
2431 close $fh2;
2432
2433 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2434 $res = Coro::Storable::thaw $res;
2435
2436 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2437
2438 die $$res unless "ARRAY" eq ref $res;
2439
2440 return wantarray ? @$res : $res->[-1];
2441 } else {
2442 local $SIG{__WARN__};
2443 eval {
2444 local $SIG{__DIE__};
2445 close $fh1;
2446
2447 my @res = eval { $cb->(@args) };
2448 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2449 };
2450
2451 warn $@ if $@;
2452 _exit 0;
2453 }
2454}
2455
2456
2183 2457
2184############################################################################# 2458#############################################################################
2185# the server's main() 2459# the server's init and main functions
2460
2461sub load_facedata($) {
2462 my ($path) = @_;
2463
2464 warn "loading facedata from $path\n";
2465
2466 my $facedata;
2467 0 < aio_load $path, $facedata
2468 or die "$path: $!";
2469
2470 $facedata = Coro::Storable::thaw $facedata;
2471
2472 $facedata->{version} == 2
2473 or cf::cleanup "$path: version mismatch, cannot proceed.";
2474
2475 {
2476 my $faces = $facedata->{faceinfo};
2477
2478 while (my ($face, $info) = each %$faces) {
2479 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2480 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2481 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2482 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2483 Coro::cede;
2484 }
2485
2486 while (my ($face, $info) = each %$faces) {
2487 next unless $info->{smooth};
2488 my $idx = cf::face::find $face
2489 or next;
2490 if (my $smooth = cf::face::find $info->{smooth}) {
2491 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2492 } else {
2493 warn "smooth face '$info->{smooth}' not found for face '$face'";
2494 }
2495 Coro::cede;
2496 }
2497 }
2498
2499 {
2500 my $anims = $facedata->{animinfo};
2501
2502 while (my ($anim, $info) = each %$anims) {
2503 cf::anim::set $anim, $info->{frames}, $info->{facings};
2504 Coro::cede;
2505 }
2506
2507 cf::anim::invalidate_all; # d'oh
2508 }
2509
2510 1
2511}
2512
2513sub reload_regions {
2514 load_resource_file "$MAPDIR/regions"
2515 or die "unable to load regions file\n";
2516}
2517
2518sub reload_facedata {
2519 load_facedata "$DATADIR/facedata"
2520 or die "unable to load facedata\n";
2521}
2522
2523sub reload_archetypes {
2524 load_resource_file "$DATADIR/archetypes"
2525 or die "unable to load archetypes\n";
2526}
2527
2528sub reload_treasures {
2529 load_resource_file "$DATADIR/treasures"
2530 or die "unable to load treasurelists\n";
2531}
2532
2533sub reload_resources {
2534 warn "reloading resource files...\n";
2535
2536 reload_regions;
2537 reload_facedata;
2538 reload_archetypes;
2539 reload_treasures;
2540
2541 warn "finished reloading resource files\n";
2542}
2543
2544sub init {
2545 reload_resources;
2546}
2186 2547
2187sub cfg_load { 2548sub cfg_load {
2188 open my $fh, "<:utf8", cf::confdir . "/config" 2549 open my $fh, "<:utf8", "$CONFDIR/config"
2189 or return; 2550 or return;
2190 2551
2191 local $/; 2552 local $/;
2192 *CFG = YAML::Syck::Load <$fh>; 2553 *CFG = YAML::Syck::Load <$fh>;
2193 2554
2207 2568
2208sub main { 2569sub main {
2209 # we must not ever block the main coroutine 2570 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2571 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2573 (async {
2212 async { Event::one_event }; 2574 Event::one_event;
2575 })->prio (Coro::PRIO_MAX);
2213 }; 2576 };
2214 2577
2215 cfg_load; 2578 cfg_load;
2216 db_load; 2579 db_init;
2217 load_extensions; 2580 load_extensions;
2581
2582 $TICK_WATCHER->start;
2218 Event::loop; 2583 Event::loop;
2219} 2584}
2220 2585
2221############################################################################# 2586#############################################################################
2222# initialisation and cleanup 2587# initialisation and cleanup
2223 2588
2224# install some emergency cleanup handlers 2589# install some emergency cleanup handlers
2225BEGIN { 2590BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 2591 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 2592 Event->signal (
2593 reentrant => 0,
2228 data => WF_AUTOCANCEL, 2594 data => WF_AUTOCANCEL,
2229 signal => $signal, 2595 signal => $signal,
2596 prio => 0,
2230 cb => sub { 2597 cb => sub {
2231 cf::cleanup "SIG$signal"; 2598 cf::cleanup "SIG$signal";
2232 }, 2599 },
2233 ); 2600 );
2234 } 2601 }
2235} 2602}
2256 my $map = $cf::MAP{$path} or next; 2623 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next; 2624 $map->valid or next;
2258 $map->save; 2625 $map->save;
2259 } 2626 }
2260 warn "end emergency map save\n"; 2627 warn "end emergency map save\n";
2628
2629 warn "begin emergency database checkpoint\n";
2630 BDB::db_env_txn_checkpoint $DB_ENV;
2631 warn "end emergency database checkpoint\n";
2261 }; 2632 };
2262 2633
2263 warn "leave emergency perl save\n"; 2634 warn "leave emergency perl save\n";
2264} 2635}
2265 2636
2637sub post_cleanup {
2638 my ($make_core) = @_;
2639
2640 warn Carp::longmess "post_cleanup backtrace"
2641 if $make_core;
2642}
2643
2266sub reload() { 2644sub do_reload_perl() {
2267 # can/must only be called in main 2645 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 2646 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 2647 warn "can only reload from main coroutine";
2270 return; 2648 return;
2271 } 2649 }
2272 2650
2273 warn "reloading..."; 2651 warn "reloading...";
2274 2652
2275 warn "freezing server"; 2653 warn "entering sync_job";
2276 my $guard = freeze_mainloop; 2654
2655 cf::sync_job {
2656 cf::write_runtime; # external watchdog should not bark
2277 cf::emergency_save; 2657 cf::emergency_save;
2658 cf::write_runtime; # external watchdog should not bark
2278 2659
2279 warn "sync database to disk"; 2660 warn "syncing database to disk";
2280 cf::db_sync; 2661 BDB::db_env_txn_checkpoint $DB_ENV;
2281 IO::AIO::flush;
2282 2662
2283 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 2663 # if anything goes wrong in here, we should simply crash as we already saved
2285 2664
2286 warn "cancel all watchers"; 2665 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 2666 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 2667 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 2668 }
2290 2669
2670 warn "flushing outstanding aio requests";
2671 for (;;) {
2672 BDB::flush;
2673 IO::AIO::flush;
2674 Coro::cede;
2675 last unless IO::AIO::nreqs || BDB::nreqs;
2676 warn "iterate...";
2677 }
2678
2679 ++$RELOAD;
2680
2291 warn "cancel all extension coros"; 2681 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 2682 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 2683 %EXT_CORO = ();
2294 2684
2295 warn "remove commands"; 2685 warn "removing commands";
2296 %COMMAND = (); 2686 %COMMAND = ();
2297 2687
2298 warn "remove ext commands"; 2688 warn "removing ext commands";
2299 %EXTCMD = (); 2689 %EXTCMD = ();
2300 2690
2301 warn "unload/nuke all extensions"; 2691 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 2692 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 2693 warn "... unloading $pkg";
2304 2694
2305 if (my $cb = $pkg->can ("unload")) { 2695 if (my $cb = $pkg->can ("unload")) {
2306 eval { 2696 eval {
2311 2701
2312 warn "... nuking $pkg"; 2702 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 2703 Symbol::delete_package $pkg;
2314 } 2704 }
2315 2705
2316 warn "unload all perl modules loaded from $LIBDIR"; 2706 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 2707 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2708 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 2709
2320 warn "removing <$k>"; 2710 warn "... unloading $k";
2321 delete $INC{$k}; 2711 delete $INC{$k};
2322 2712
2323 $k =~ s/\.pm$//; 2713 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 2714 $k =~ s/\//::/g;
2325 2715
2328 } 2718 }
2329 2719
2330 Symbol::delete_package $k; 2720 Symbol::delete_package $k;
2331 } 2721 }
2332 2722
2333 warn "get rid of safe::, as good as possible"; 2723 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 2724 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2725 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 2726
2337 warn "unload cf.pm \"a bit\""; 2727 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 2728 delete $INC{"cf.pm"};
2729 delete $INC{"cf/pod.pm"};
2339 2730
2340 # don't, removes xs symbols, too, 2731 # don't, removes xs symbols, too,
2341 # and global variables created in xs 2732 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 2733 #Symbol::delete_package __PACKAGE__;
2343 2734
2735 warn "unload completed, starting to reload now";
2736
2344 warn "reloading cf.pm"; 2737 warn "reloading cf.pm";
2345 require cf; 2738 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2739 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 2740
2348 warn "load config and database again"; 2741 warn "loading config and database again";
2349 cf::cfg_load; 2742 cf::cfg_load;
2350 cf::db_load;
2351 2743
2352 warn "load extensions"; 2744 warn "loading extensions";
2353 cf::load_extensions; 2745 cf::load_extensions;
2354 2746
2355 warn "reattach attachments to objects/players"; 2747 warn "reattaching attachments to objects/players";
2356 _global_reattach; 2748 _global_reattach; # objects, sockets
2357 warn "reattach attachments to maps"; 2749 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 2750 reattach $_ for values %MAP;
2359 }; 2751 warn "reattaching attachments to players";
2752 reattach $_ for values %PLAYER;
2360 2753
2361 if ($@) { 2754 warn "leaving sync_job";
2755
2756 1
2757 } or do {
2362 warn $@; 2758 warn $@;
2363 warn "error while reloading, exiting."; 2759 warn "error while reloading, exiting.";
2364 exit 1; 2760 exit 1;
2365 } 2761 };
2366 2762
2367 warn "reloaded"; 2763 warn "reloaded";
2368}; 2764};
2369 2765
2766our $RELOAD_WATCHER; # used only during reload
2767
2768sub reload_perl() {
2769 # doing reload synchronously and two reloads happen back-to-back,
2770 # coro crashes during coro_state_free->destroy here.
2771
2772 $RELOAD_WATCHER ||= Event->timer (
2773 reentrant => 0,
2774 after => 0,
2775 data => WF_AUTOCANCEL,
2776 cb => sub {
2777 do_reload_perl;
2778 undef $RELOAD_WATCHER;
2779 },
2780 );
2781}
2782
2370register_command "reload" => sub { 2783register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2784 my ($who, $arg) = @_;
2372 2785
2373 if ($who->flag (FLAG_WIZ)) { 2786 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload.");
2375 reload;
2376 $who->message ("end of reload."); 2787 $who->message ("reloading server.");
2788 async { reload_perl };
2377 } 2789 }
2378}; 2790};
2379 2791
2380unshift @INC, $LIBDIR; 2792unshift @INC, $LIBDIR;
2793
2794my $bug_warning = 0;
2795
2796our @WAIT_FOR_TICK;
2797our @WAIT_FOR_TICK_BEGIN;
2798
2799sub wait_for_tick {
2800 return unless $TICK_WATCHER->is_active;
2801 return if $Coro::current == $Coro::main;
2802
2803 my $signal = new Coro::Signal;
2804 push @WAIT_FOR_TICK, $signal;
2805 $signal->wait;
2806}
2807
2808sub wait_for_tick_begin {
2809 return unless $TICK_WATCHER->is_active;
2810 return if $Coro::current == $Coro::main;
2811
2812 my $signal = new Coro::Signal;
2813 push @WAIT_FOR_TICK_BEGIN, $signal;
2814 $signal->wait;
2815}
2381 2816
2382$TICK_WATCHER = Event->timer ( 2817$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 2818 reentrant => 0,
2819 parked => 1,
2384 prio => 0, 2820 prio => 0,
2385 at => $NEXT_TICK || $TICK, 2821 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 2822 data => WF_AUTOCANCEL,
2387 cb => sub { 2823 cb => sub {
2824 if ($Coro::current != $Coro::main) {
2825 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2826 unless ++$bug_warning > 10;
2827 return;
2828 }
2829
2388 $NOW = Event::time; 2830 $NOW = Event::time;
2389 2831
2390 cf::server_tick; # one server iteration 2832 cf::server_tick; # one server iteration
2833
2391 $RUNTIME += $TICK; 2834 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 2835 $NEXT_TICK += $TICK;
2393 2836
2394 $WAIT_FOR_TICK->broadcast; 2837 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2838 $NEXT_RUNTIME_WRITE = $NOW + 10;
2839 Coro::async_pool {
2840 write_runtime
2841 or warn "ERROR: unable to write runtime file: $!";
2842 };
2843 }
2844
2845# my $AFTER = Event::time;
2846# warn $AFTER - $NOW;#d#
2396 2847
2397 # if we are delayed by four ticks or more, skip them all 2848 # if we are delayed by four ticks or more, skip them all
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2849 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2399 2850
2400 $TICK_WATCHER->at ($NEXT_TICK); 2851 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 2852 $TICK_WATCHER->start;
2853
2854 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2855 $sig->send;
2856 }
2857 while (my $sig = shift @WAIT_FOR_TICK) {
2858 $sig->send;
2859 }
2860
2861 _post_tick;
2402 }, 2862 },
2403); 2863);
2404 2864
2865{
2405IO::AIO::max_poll_time $TICK * 0.2; 2866 BDB::max_poll_time $TICK * 0.1;
2406 2867 $BDB_POLL_WATCHER = Event->io (
2407Event->io ( 2868 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 2869 fd => BDB::poll_fileno,
2409 poll => 'r', 2870 poll => 'r',
2410 prio => 5, 2871 prio => 0,
2411 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb,
2413);
2414
2415Event->timer (
2416 data => WF_AUTOCANCEL, 2872 data => WF_AUTOCANCEL,
2417 after => 0, 2873 cb => \&BDB::poll_cb,
2418 interval => 10, 2874 );
2419 cb => sub { 2875 BDB::min_parallel 8;
2420 (Coro::unblock_sub { 2876
2421 write_runtime 2877 BDB::set_sync_prepare {
2422 or warn "ERROR: unable to write runtime file: $!"; 2878 my $status;
2879 my $current = $Coro::current;
2880 (
2881 sub {
2882 $status = $!;
2883 $current->ready; undef $current;
2884 },
2885 sub {
2886 Coro::schedule while defined $current;
2887 $! = $status;
2888 },
2889 )
2890 };
2891
2892 unless ($DB_ENV) {
2893 $DB_ENV = BDB::db_env_create;
2894
2895 cf::sync_job {
2896 eval {
2897 BDB::db_env_open
2898 $DB_ENV,
2899 $BDBDIR,
2900 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2901 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2902 0666;
2903
2904 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2905
2906 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2907 $DB_ENV->set_lk_detect;
2908 };
2909
2910 cf::cleanup "db_env_open(db): $@" if $@;
2423 })->(); 2911 };
2424 }, 2912 }
2425); 2913}
2914
2915{
2916 IO::AIO::min_parallel 8;
2917
2918 undef $Coro::AIO::WATCHER;
2919 IO::AIO::max_poll_time $TICK * 0.1;
2920 $AIO_POLL_WATCHER = Event->io (
2921 reentrant => 0,
2922 data => WF_AUTOCANCEL,
2923 fd => IO::AIO::poll_fileno,
2924 poll => 'r',
2925 prio => 6,
2926 cb => \&IO::AIO::poll_cb,
2927 );
2928}
2929
2930# load additional modules
2931use cf::pod;
2426 2932
2427END { cf::emergency_save } 2933END { cf::emergency_save }
2428 2934
24291 29351
2430 2936

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines