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.125 by root, Tue Jan 2 23:06:39 2007 UTC vs.
Revision 1.159 by root, Wed Jan 10 22:50:12 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
38 42
39our @EVENT; 43our @EVENT;
40our $LIBDIR = datadir . "/ext"; 44our $LIBDIR = datadir . "/ext";
41 45
42our $TICK = MAX_TIME * 1e-6; 46our $TICK = MAX_TIME * 1e-6;
47our %CFG; 51our %CFG;
48 52
49our $UPTIME; $UPTIME ||= time; 53our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 54our $RUNTIME;
51 55
56our %PLAYER; # all users
52our %MAP; # all maps 57our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 58our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 59our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 60
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
57 63
58binmode STDOUT; 64binmode STDOUT;
59binmode STDERR; 65binmode STDERR;
60 66
61# read virtual server time, if available 67# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 77mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 78mkdir $RANDOM_MAPS;
73 79
74# a special map that is always available 80# a special map that is always available
75our $LINK_MAP; 81our $LINK_MAP;
76 82our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 83
79############################################################################# 84#############################################################################
80 85
81=head2 GLOBAL VARIABLES 86=head2 GLOBAL VARIABLES
82 87
106 111
107=item %cf::CFG 112=item %cf::CFG
108 113
109Configuration for the server, loaded from C</etc/crossfire/config>, or 114Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 115from wherever your confdir points to.
116
117=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
118
119These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
120or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
121processing has been done. Call C<< ->wait >> on them to maximise the
122window of cpu time available, or simply to synchronise to the server tick.
111 123
112=back 124=back
113 125
114=cut 126=cut
115 127
119 utf8::encode $msg; 131 utf8::encode $msg;
120 132
121 $msg .= "\n" 133 $msg .= "\n"
122 unless $msg =~ /\n$/; 134 unless $msg =~ /\n$/;
123 135
124 LOG llevError, "cfperl: $msg"; 136 LOG llevError, $msg;
125 }; 137 };
126} 138}
127 139
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 140@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 141@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
147 159
148$Event::DIED = sub { 160$Event::DIED = sub {
149 warn "error in event callback: @_"; 161 warn "error in event callback: @_";
150}; 162};
151 163
152my %ext_pkg;
153my @exts;
154my @hook;
155
156=head2 UTILITY FUNCTIONS 164=head2 UTILITY FUNCTIONS
157 165
158=over 4 166=over 4
159 167
168=item dumpval $ref
169
160=cut 170=cut
171
172sub dumpval {
173 eval {
174 local $SIG{__DIE__};
175 my $d;
176 if (1) {
177 $d = new Data::Dumper([$_[0]], ["*var"]);
178 $d->Terse(1);
179 $d->Indent(2);
180 $d->Quotekeys(0);
181 $d->Useqq(1);
182 #$d->Bless(...);
183 $d->Seen($_[1]) if @_ > 1;
184 $d = $d->Dump();
185 }
186 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
187 $d
188 } || "[unable to dump $_[0]: '$@']";
189}
161 190
162use JSON::Syck (); # TODO# replace by JSON::PC once working 191use JSON::Syck (); # TODO# replace by JSON::PC once working
163 192
164=item $ref = cf::from_json $json 193=item $ref = cf::from_json $json
165 194
181sub to_json($) { 210sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 211 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 212 JSON::Syck::Dump $_[0]
184} 213}
185 214
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 215=item cf::lock_wait $string
209 216
210Wait until the given lock is available. See cf::lock_acquire. 217Wait until the given lock is available. See cf::lock_acquire.
211 218
212=item my $lock = cf::lock_acquire $string 219=item my $lock = cf::lock_acquire $string
213 220
214Wait until the given lock is available and then acquires it and returns 221Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 222a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 223for example when the coroutine gets canceled), the lock is automatically
217returned. 224returned.
218 225
219Lock names should begin with a unique identifier (for example, find_map 226Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 227uses map_find and cf::map::load uses map_load).
221 228
222=cut 229=cut
223 230
224our %LOCK; 231our %LOCK;
225 232
239 # wait, to be sure we are not locked 246 # wait, to be sure we are not locked
240 lock_wait $key; 247 lock_wait $key;
241 248
242 $LOCK{$key} = []; 249 $LOCK{$key} = [];
243 250
244 cf::guard { 251 Coro::guard {
245 # wake up all waiters, to be on the safe side 252 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 253 $_->ready for @{ delete $LOCK{$key} };
247 } 254 }
248} 255}
256
257sub freeze_mainloop {
258 return unless $TICK_WATCHER->is_active;
259
260 my $guard = Coro::guard { $TICK_WATCHER->start };
261 $TICK_WATCHER->stop;
262 $guard
263}
264
265=item cf::async { BLOCK }
266
267Currently the same as Coro::async_pool, meaning you cannot use
268C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
269thing you are allowed to do is call C<prio> on it.
270
271=cut
272
273BEGIN { *async = \&Coro::async_pool }
249 274
250=item cf::sync_job { BLOCK } 275=item cf::sync_job { BLOCK }
251 276
252The design of crossfire+ requires that the main coro ($Coro::main) is 277The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 278always able to handle events or runnable, as crossfire+ is only partly
267 # this is the main coro, too bad, we have to block 292 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 293 # till the operation succeeds, freezing the server :/
269 294
270 # TODO: use suspend/resume instead 295 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 296 # (but this is cancel-safe)
272 local $FREEZE = 1; 297 my $freeze_guard = freeze_mainloop;
273 298
274 my $busy = 1; 299 my $busy = 1;
275 my @res; 300 my @res;
276 301
277 (Coro::async { 302 (async {
278 @res = eval { $job->() }; 303 @res = eval { $job->() };
279 warn $@ if $@; 304 warn $@ if $@;
280 undef $busy; 305 undef $busy;
281 })->prio (Coro::PRIO_MAX); 306 })->prio (Coro::PRIO_MAX);
282 307
283 while ($busy) { 308 while ($busy) {
284 Coro::cede_notself; 309 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 310 }
287 311
288 wantarray ? @res : $res[0] 312 wantarray ? @res : $res[0]
289 } else { 313 } else {
290 # we are in another coroutine, how wonderful, everything just works 314 # we are in another coroutine, how wonderful, everything just works
291 315
292 $job->() 316 $job->()
293 } 317 }
294} 318}
295 319
296=item $coro = cf::coro { BLOCK } 320=item $coro = cf::async_ext { BLOCK }
297 321
298Creates and returns a new coro. This coro is automcatially being canceled 322Like async, but this coro is automatically being canceled when the
299when the extension calling this is being unloaded. 323extension calling this is being unloaded.
300 324
301=cut 325=cut
302 326
303sub coro(&) { 327sub async_ext(&) {
304 my $cb = shift; 328 my $cb = shift;
305 329
306 my $coro; $coro = async { 330 my $coro = &Coro::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 331
313 $coro->on_destroy (sub { 332 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 333 delete $EXT_CORO{$coro+0};
315 }); 334 });
316 $EXT_CORO{$coro+0} = $coro; 335 $EXT_CORO{$coro+0} = $coro;
345=cut 364=cut
346 365
347############################################################################# 366#############################################################################
348 367
349package cf::path; 368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
350 375
351sub new { 376sub new {
352 my ($class, $path, $base) = @_; 377 my ($class, $path, $base) = @_;
353 378
354 $path = $path->as_string if ref $path; 379 $path = $path->as_string if ref $path;
360 # ?random/... random maps 385 # ?random/... random maps
361 # /! non-realised random map exit 386 # /! non-realised random map exit
362 # /... normal maps 387 # /... normal maps
363 # ~/... per-player maps without a specific player (DO NOT USE) 388 # ~/... per-player maps without a specific player (DO NOT USE)
364 # ~user/... per-player map of a specific user 389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
365 392
366 if ($path =~ /^{/) { 393 if ($path =~ /^{/) {
367 # fine as it is 394 # fine as it is
368 } elsif ($path =~ s{^\?random/}{}) { 395 } elsif ($path =~ s{^\?random/}{}) {
369 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
418# } 445# }
419} 446}
420 447
421# escape the /'s in the path 448# escape the /'s in the path
422sub _escaped_path { 449sub _escaped_path {
423 # ∕ is U+2215
424 (my $path = $_[0]{path}) =~ s/\///g; 450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
425 $path 451 $path
426} 452}
427 453
428# the original (read-only) location 454# the original (read-only) location
429sub load_path { 455sub load_path {
917=cut 943=cut
918 944
919sub register_extcmd { 945sub register_extcmd {
920 my ($name, $cb) = @_; 946 my ($name, $cb) = @_;
921 947
922 my $caller = caller;
923 #warn "registering extcmd '$name' to '$caller'";
924
925 $EXTCMD{$name} = [$cb, $caller]; 948 $EXTCMD{$name} = $cb;
926} 949}
927 950
928cf::player->attach ( 951cf::player->attach (
929 on_command => sub { 952 on_command => sub {
930 my ($pl, $name, $params) = @_; 953 my ($pl, $name, $params) = @_;
943 966
944 my $msg = eval { from_json $buf }; 967 my $msg = eval { from_json $buf };
945 968
946 if (ref $msg) { 969 if (ref $msg) {
947 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 970 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
948 if (my %reply = $cb->[0]->($pl, $msg)) { 971 if (my %reply = $cb->($pl, $msg)) {
949 $pl->ext_reply ($msg->{msgid}, %reply); 972 $pl->ext_reply ($msg->{msgid}, %reply);
950 } 973 }
951 } 974 }
952 } else { 975 } else {
953 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
955 978
956 cf::override; 979 cf::override;
957 }, 980 },
958); 981);
959 982
960sub register {
961 my ($base, $pkg) = @_;
962
963 #TODO
964}
965
966sub load_extension { 983sub load_extension {
967 my ($path) = @_; 984 my ($path) = @_;
968 985
969 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 986 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
970 my $base = $1; 987 my $base = $1;
985 1002
986 eval $source 1003 eval $source
987 or die $@ ? "$path: $@\n" 1004 or die $@ ? "$path: $@\n"
988 : "extension disabled.\n"; 1005 : "extension disabled.\n";
989 1006
990 push @exts, $pkg; 1007 push @EXTS, $pkg;
991 $ext_pkg{$base} = $pkg;
992
993# no strict 'refs';
994# @{"$pkg\::ISA"} = ext::;
995
996 register $base, $pkg;
997}
998
999sub unload_extension {
1000 my ($pkg) = @_;
1001
1002 warn "removing extension $pkg\n";
1003
1004 # remove hooks
1005 #TODO
1006# for my $idx (0 .. $#PLUGIN_EVENT) {
1007# delete $hook[$idx]{$pkg};
1008# }
1009
1010 # remove commands
1011 for my $name (keys %COMMAND) {
1012 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1013
1014 if (@cb) {
1015 $COMMAND{$name} = \@cb;
1016 } else {
1017 delete $COMMAND{$name};
1018 }
1019 }
1020
1021 # remove extcmds
1022 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1023 delete $EXTCMD{$name};
1024 }
1025
1026 if (my $cb = $pkg->can ("unload")) {
1027 eval {
1028 $cb->($pkg);
1029 1
1030 } or warn "$pkg unloaded, but with errors: $@";
1031 }
1032
1033 Symbol::delete_package $pkg;
1034} 1008}
1035 1009
1036sub load_extensions { 1010sub load_extensions {
1037 for my $ext (<$LIBDIR/*.ext>) { 1011 for my $ext (<$LIBDIR/*.ext>) {
1038 next unless -r $ext; 1012 next unless -r $ext;
1056}; 1030};
1057 1031
1058cf::map->attach (prio => -10000, package => cf::mapsupport::); 1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1059 1033
1060############################################################################# 1034#############################################################################
1061# load/save perl data associated with player->ob objects
1062
1063sub all_objects(@) {
1064 @_, map all_objects ($_->inv), @_
1065}
1066
1067# TODO: compatibility cruft, remove when no longer needed
1068cf::player->attach (
1069 on_load => sub {
1070 my ($pl, $path) = @_;
1071
1072 for my $o (all_objects $pl->ob) {
1073 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1074 $o->set_ob_key_value ("_perl_data");
1075
1076 %$o = %{ Storable::thaw pack "H*", $value };
1077 }
1078 }
1079 },
1080);
1081
1082#############################################################################
1083 1035
1084=head2 CORE EXTENSIONS 1036=head2 CORE EXTENSIONS
1085 1037
1086Functions and methods that extend core crossfire objects. 1038Functions and methods that extend core crossfire objects.
1087 1039
1040=cut
1041
1042package cf::player;
1043
1044use Coro::AIO;
1045
1088=head3 cf::player 1046=head3 cf::player
1089 1047
1090=over 4 1048=over 4
1091 1049
1092=item cf::player::exists $login 1050=item cf::player::find $login
1093 1051
1094Returns true when the given account exists. 1052Returns the given player object, loading it if necessary (might block).
1095 1053
1096=cut 1054=cut
1097 1055
1098sub cf::player::exists($) { 1056sub playerdir($) {
1099 cf::player::find $_[0] 1057 cf::localdir
1100 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1058 . "/"
1059 . cf::playerdir
1060 . "/"
1061 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1062}
1063
1064sub path($) {
1065 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1066
1067 (playerdir $login) . "/$login.pl"
1068}
1069
1070sub find_active($) {
1071 $cf::PLAYER{$_[0]}
1072 and $cf::PLAYER{$_[0]}->active
1073 and $cf::PLAYER{$_[0]}
1074}
1075
1076sub exists($) {
1077 my ($login) = @_;
1078
1079 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login }
1081}
1082
1083sub find($) {
1084 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0];
1086
1087 my $guard = cf::lock_acquire "user_find:$login";
1088
1089 $cf::PLAYER{$_[0]} || do {
1090 my $pl = load_pl path $login
1091 or return;
1092 $cf::PLAYER{$login} = $pl
1093 }
1094 }
1095}
1096
1097sub save($) {
1098 my ($pl) = @_;
1099
1100 return if $pl->{deny_save};
1101
1102 my $path = path $pl;
1103 my $guard = cf::lock_acquire "user_save:$path";
1104
1105 return if $pl->{deny_save};
1106
1107 aio_mkdir playerdir $pl, 0770;
1108 $pl->{last_save} = $cf::RUNTIME;
1109
1110 $pl->save_pl ($path);
1111 Coro::cede;
1112}
1113
1114sub new($) {
1115 my ($login) = @_;
1116
1117 my $self = create;
1118
1119 $self->ob->name ($login);
1120 $self->{deny_save} = 1;
1121
1122 $cf::PLAYER{$login} = $self;
1123
1124 $self
1125}
1126
1127=item $pl->quit_character
1128
1129Nukes the player without looking back. If logged in, the connection will
1130be destroyed. May block for a long time.
1131
1132=cut
1133
1134sub quit_character {
1135 my ($pl) = @_;
1136
1137 $pl->{deny_save} = 1;
1138 $pl->password ("*"); # this should lock out the player until we nuked the dir
1139
1140 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1141 $pl->deactivate;
1142 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1143 $pl->ns->destroy if $pl->ns;
1144
1145 my $path = playerdir $pl;
1146 my $temp = "$path~$cf::RUNTIME~deleting~";
1147 aio_rename $path, $temp;
1148 delete $cf::PLAYER{$pl->ob->name};
1149 $pl->destroy;
1150 IO::AIO::aio_rmtree $temp;
1151}
1152
1153=item cf::player::list_logins
1154
1155Returns am arrayref of all valid playernames in the system, can take a
1156while and may block, so not sync_job-capable, ever.
1157
1158=cut
1159
1160sub list_logins {
1161 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1162 or return [];
1163
1164 my @logins;
1165
1166 for my $login (@$dirs) {
1167 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1168 aio_read $fh, 0, 512, my $buf, 0 or next;
1169 $buf !~ /^password -------------$/m or next; # official not-valid tag
1170
1171 utf8::decode $login;
1172 push @logins, $login;
1173 }
1174
1175 \@logins
1176}
1177
1178=item $player->maps
1179
1180Returns an arrayref of cf::path's of all maps that are private for this
1181player. May block.
1182
1183=cut
1184
1185sub maps($) {
1186 my ($pl) = @_;
1187
1188 my $files = aio_readdir playerdir $pl
1189 or return;
1190
1191 my @paths;
1192
1193 for (@$files) {
1194 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o;
1197
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1199 }
1200
1201 \@paths
1101} 1202}
1102 1203
1103=item $player->ext_reply ($msgid, $msgtype, %msg) 1204=item $player->ext_reply ($msgid, $msgtype, %msg)
1104 1205
1105Sends an ext reply to the player. 1206Sends an ext reply to the player.
1106 1207
1107=cut 1208=cut
1108 1209
1109sub cf::player::ext_reply($$$%) { 1210sub ext_reply($$$%) {
1110 my ($self, $id, %msg) = @_; 1211 my ($self, $id, %msg) = @_;
1111 1212
1112 $msg{msgid} = $id; 1213 $msg{msgid} = $id;
1113 1214
1114 $self->send ("ext " . to_json \%msg); 1215 $self->send ("ext " . cf::to_json \%msg);
1115} 1216}
1217
1218package cf;
1116 1219
1117=back 1220=back
1118 1221
1119 1222
1120=head3 cf::map 1223=head3 cf::map
1126package cf::map; 1229package cf::map;
1127 1230
1128use Fcntl; 1231use Fcntl;
1129use Coro::AIO; 1232use Coro::AIO;
1130 1233
1131our $MAX_RESET = 7200; 1234our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1235our $DEFAULT_RESET = 3000;
1133 1236
1134sub generate_random_map { 1237sub generate_random_map {
1135 my ($path, $rmp) = @_; 1238 my ($path, $rmp) = @_;
1136 1239
1137 # mit "rum" bekleckern, nicht 1240 # mit "rum" bekleckern, nicht
1167 or return; 1270 or return;
1168 1271
1169 my $map = cf::map::new 1272 my $map = cf::map::new
1170 or return; 1273 or return;
1171 1274
1275 # for better error messages only, will be overwritten
1276 $map->path ($path);
1277
1172 $map->load_header ($path) 1278 $map->load_header ($path)
1173 or return; 1279 or return;
1174 1280
1175 $map->{load_path} = $path; 1281 $map->{load_path} = $path;
1176 1282
1177 $map 1283 $map
1178} 1284}
1179 1285
1286sub find;
1180sub find_map { 1287sub find {
1181 my ($path, $origin) = @_; 1288 my ($path, $origin) = @_;
1182 1289
1183 #warn "find_map<$path,$origin>\n";#d# 1290 #warn "find<$path,$origin>\n";#d#
1184 1291
1185 $path = new cf::path $path, $origin && $origin->path; 1292 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1293 my $key = $path->as_string;
1187 1294
1188 cf::lock_wait "map_find:$key"; 1295 cf::lock_wait "map_find:$key";
1191 my $guard = cf::lock_acquire "map_find:$key"; 1298 my $guard = cf::lock_acquire "map_find:$key";
1192 1299
1193 # do it the slow way 1300 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1301 my $map = try_load_header $path->save_path;
1195 1302
1303 Coro::cede;
1304
1196 if ($map) { 1305 if ($map) {
1306 $map->last_access ((delete $map->{last_access})
1307 || $cf::RUNTIME); #d#
1197 # safety 1308 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1309 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1310 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1311 } else {
1201 if (my $rmp = $path->random_map_params) { 1312 if (my $rmp = $path->random_map_params) {
1206 1317
1207 $map or return; 1318 $map or return;
1208 1319
1209 $map->{load_original} = 1; 1320 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1321 $map->{instantiate_time} = $cf::RUNTIME;
1322 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1323 $map->instantiate;
1212 1324
1213 # per-player maps become, after loading, normal maps 1325 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1326 $map->per_player (0) if $path->{user_rel};
1215 } 1327 }
1216 1328
1217 $map->path ($key); 1329 $map->path ($key);
1218 $map->{path} = $path; 1330 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1331 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1332
1333 Coro::cede;
1221 1334
1222 if ($map->should_reset) { 1335 if ($map->should_reset) {
1223 $map->reset; 1336 $map->reset;
1224 undef $guard; 1337 undef $guard;
1225 $map = cf::map::find_map ($path) 1338 $map = find $path
1226 or return; 1339 or return;
1227 } 1340 }
1228 1341
1229 $cf::MAP{$key} = $map 1342 $cf::MAP{$key} = $map
1230 } 1343 }
1252 if (aio_open $uniq, O_RDONLY, 0) { 1365 if (aio_open $uniq, O_RDONLY, 0) {
1253 $self->clear_unique_items; 1366 $self->clear_unique_items;
1254 $self->load_objects ($uniq, 0); 1367 $self->load_objects ($uniq, 0);
1255 } 1368 }
1256 } 1369 }
1370
1371 Coro::cede;
1257 1372
1258 # now do the right thing for maps 1373 # now do the right thing for maps
1259 $self->link_multipart_objects; 1374 $self->link_multipart_objects;
1260 1375
1261 if ($self->{path}->is_style_map) { 1376 if ($self->{path}->is_style_map) {
1269 $self->difficulty ($self->estimate_difficulty) 1384 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1385 unless $self->difficulty;
1271 $self->activate; 1386 $self->activate;
1272 } 1387 }
1273 1388
1389 Coro::cede;
1390
1274 $self->in_memory (cf::MAP_IN_MEMORY); 1391 $self->in_memory (cf::MAP_IN_MEMORY);
1275} 1392}
1276 1393
1277sub load_map_sync { 1394# find and load all maps in the 3x3 area around a map
1395sub load_diag {
1396 my ($map) = @_;
1397
1398 my @diag; # diagonal neighbours
1399
1400 for (0 .. 3) {
1401 my $neigh = $map->tile_path ($_)
1402 or next;
1403 $neigh = find $neigh, $map
1404 or next;
1405 $neigh->load;
1406
1407 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1408 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1409 }
1410
1411 for (@diag) {
1412 my $neigh = find @$_
1413 or next;
1414 $neigh->load;
1415 }
1416}
1417
1418sub find_sync {
1278 my ($path, $origin) = @_; 1419 my ($path, $origin) = @_;
1279 1420
1280 #warn "load_map_sync<$path, $origin>\n";#d# 1421 cf::sync_job { find $path, $origin }
1422}
1281 1423
1282 cf::sync_job { 1424sub do_load_sync {
1283 my $map = cf::map::find_map $path, $origin 1425 my ($map) = @_;
1426
1427 cf::sync_job { $map->load };
1428}
1429
1430our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async {
1432 while () {
1433 while (%MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1284 or return; 1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1285 $map->load; 1440 $map->load;
1286 $map 1441 }
1442 Coro::schedule;
1287 } 1443 }
1444};
1445
1446sub find_async {
1447 my ($path, $origin) = @_;
1448
1449 $path = new cf::path $path, $origin && $origin->path;
1450 my $key = $path->as_string;
1451
1452 if (my $map = $cf::MAP{$key}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 }
1455
1456 $MAP_PREFETCH{$key} = $path;
1457 $MAP_PREFETCHER->ready;
1458
1459 ()
1288} 1460}
1289 1461
1290sub save { 1462sub save {
1291 my ($self) = @_; 1463 my ($self) = @_;
1292 1464
1465 my $lock = cf::lock_acquire "map_data:" . $self->path;
1466
1293 $self->{last_save} = $cf::RUNTIME; 1467 $self->{last_save} = $cf::RUNTIME;
1294 1468
1295 return unless $self->dirty; 1469 return unless $self->dirty;
1296 1470
1297 my $save = $self->{path}->save_path; utf8::encode $save; 1471 my $save = $self->{path}->save_path; utf8::encode $save;
1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1299 1473
1300 $self->{load_path} = $save; 1474 $self->{load_path} = $save;
1301 1475
1302 return if $self->{deny_save}; 1476 return if $self->{deny_save};
1477
1478 local $self->{last_access} = $self->last_access;#d#
1479
1480 cf::async {
1481 $_->contr->save for $self->players;
1482 };
1303 1483
1304 if ($uniq) { 1484 if ($uniq) {
1305 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1306 $self->save_objects ($uniq, cf::IO_UNIQUES); 1486 $self->save_objects ($uniq, cf::IO_UNIQUES);
1307 } else { 1487 } else {
1310} 1490}
1311 1491
1312sub swap_out { 1492sub swap_out {
1313 my ($self) = @_; 1493 my ($self) = @_;
1314 1494
1495 # save first because save cedes
1496 $self->save;
1497
1498 my $lock = cf::lock_acquire "map_data:" . $self->path;
1499
1315 return if $self->players; 1500 return if $self->players;
1316 return if $self->in_memory != cf::MAP_IN_MEMORY; 1501 return if $self->in_memory != cf::MAP_IN_MEMORY;
1317 return if $self->{deny_save}; 1502 return if $self->{deny_save};
1318 1503
1319 $self->save;
1320 $self->clear; 1504 $self->clear;
1321 $self->in_memory (cf::MAP_SWAPPED); 1505 $self->in_memory (cf::MAP_SWAPPED);
1322} 1506}
1323 1507
1324sub reset_at { 1508sub reset_at {
1362} 1546}
1363 1547
1364sub reset { 1548sub reset {
1365 my ($self) = @_; 1549 my ($self) = @_;
1366 1550
1551 my $lock = cf::lock_acquire "map_data:" . $self->path;
1552
1367 return if $self->players; 1553 return if $self->players;
1368 return if $self->{path}{user_rel};#d# 1554 return if $self->{path}{user_rel};#d#
1369 1555
1370 warn "resetting map ", $self->path;#d# 1556 warn "resetting map ", $self->path;#d#
1371 1557
1390 1576
1391sub customise_for { 1577sub customise_for {
1392 my ($map, $ob) = @_; 1578 my ($map, $ob) = @_;
1393 1579
1394 if ($map->per_player) { 1580 if ($map->per_player) {
1395 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1581 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1396 } 1582 }
1397 1583
1398 $map 1584 $map
1399} 1585}
1400 1586
1401sub emergency_save { 1587=item cf::map::unique_maps
1402 local $cf::FREEZE = 1;
1403 1588
1404 warn "enter emergency map save\n"; 1589Returns an arrayref of cf::path's of all shared maps that have
1590instantiated unique items. May block.
1405 1591
1406 cf::sync_job { 1592=cut
1407 warn "begin emergency map save\n"; 1593
1408 $_->save for values %cf::MAP; 1594sub unique_maps() {
1595 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1596 or return;
1597
1598 my @paths;
1599
1600 for (@$files) {
1601 utf8::decode $_;
1602 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o;
1604
1605 push @paths, new cf::path $_;
1409 }; 1606 }
1410 1607
1411 warn "end emergency map save\n"; 1608 \@paths
1412} 1609}
1413 1610
1414package cf; 1611package cf;
1415 1612
1416=back 1613=back
1417 1614
1615=head3 cf::object
1616
1617=cut
1618
1619package cf::object;
1620
1621=over 4
1622
1623=item $ob->inv_recursive
1624
1625Returns the inventory of the object _and_ their inventories, recursively.
1626
1627=cut
1628
1629sub inv_recursive_;
1630sub inv_recursive_ {
1631 map { $_, inv_recursive_ $_->inv } @_
1632}
1633
1634sub inv_recursive {
1635 inv_recursive_ inv $_[0]
1636}
1637
1638package cf;
1639
1640=back
1418 1641
1419=head3 cf::object::player 1642=head3 cf::object::player
1420 1643
1421=over 4 1644=over 4
1422 1645
1497 my $link_pos = delete $self->{_link_pos}; 1720 my $link_pos = delete $self->{_link_pos};
1498 1721
1499 unless ($map) { 1722 unless ($map) {
1500 # restore original map position 1723 # restore original map position
1501 ($map, $x, $y) = @{ $link_pos || [] }; 1724 ($map, $x, $y) = @{ $link_pos || [] };
1502 $map = cf::map::find_map $map; 1725 $map = cf::map::find $map;
1503 1726
1504 unless ($map) { 1727 unless ($map) {
1505 ($map, $x, $y) = @$EMERGENCY_POSITION; 1728 ($map, $x, $y) = @$EMERGENCY_POSITION;
1506 $map = cf::map::find_map $map 1729 $map = cf::map::find $map
1507 or die "FATAL: cannot load emergency map\n"; 1730 or die "FATAL: cannot load emergency map\n";
1508 } 1731 }
1509 } 1732 }
1510 1733
1511 ($x, $y) = (-1, -1) 1734 ($x, $y) = (-1, -1)
1514 # use -1 or undef as default coordinates, not 0, 0 1737 # use -1 or undef as default coordinates, not 0, 0
1515 ($x, $y) = ($map->enter_x, $map->enter_y) 1738 ($x, $y) = ($map->enter_x, $map->enter_y)
1516 if $x <=0 && $y <= 0; 1739 if $x <=0 && $y <= 0;
1517 1740
1518 $map->load; 1741 $map->load;
1742 $map->load_diag;
1519 1743
1744 return unless $self->contr->active;
1520 $self->activate_recursive; 1745 $self->activate_recursive;
1521 $self->enter_map ($map, $x, $y); 1746 $self->enter_map ($map, $x, $y);
1522} 1747}
1523 1748
1524cf::player->attach ( 1749cf::player->attach (
1537 1762
1538 # try to abort aborted map switching on player login :) 1763 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes 1764 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) { 1765 if ($pl->ob->{_link_pos}) {
1541 $pl->ob->enter_link; 1766 $pl->ob->enter_link;
1542 Coro::async { 1767 (async {
1543 # we need this sleep as the login has a concurrent enter_exit running 1768 # we need this sleep as the login has a concurrent enter_exit running
1544 # and this sleep increases chances of the player not ending up in scorn 1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED);
1545 Coro::Timer::sleep 1; 1774 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link; 1775 $pl->ob->leave_link;
1547 }; 1776 })->prio (2);
1548 } 1777 }
1549 }, 1778 },
1550); 1779);
1551 1780
1552=item $player_object->goto_map ($path, $x, $y) 1781=item $player_object->goto ($path, $x, $y)
1553 1782
1554=cut 1783=cut
1555 1784
1556sub cf::object::player::goto_map { 1785sub cf::object::player::goto {
1557 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1558 1787
1788 $path = new cf::path $path;
1789
1559 $self->enter_link; 1790 $self->enter_link;
1560 1791
1561 (Coro::async { 1792 (async {
1562 $path = new cf::path $path;
1563
1564 my $map = cf::map::find_map $path->as_string; 1793 my $map = cf::map::find $path->as_string;
1565 $map = $map->customise_for ($self) if $map; 1794 $map = $map->customise_for ($self) if $map;
1566 1795
1567# warn "entering ", $map->path, " at ($x, $y)\n" 1796# warn "entering ", $map->path, " at ($x, $y)\n"
1568# if $map; 1797# if $map;
1569 1798
1570 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1799 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1571 1800
1572 $self->leave_link ($map, $x, $y); 1801 $self->leave_link ($map, $x, $y);
1573 })->prio (1); 1802 })->prio (1);
1574} 1803}
1575 1804
1628 1857
1629 return unless $self->type == cf::PLAYER; 1858 return unless $self->type == cf::PLAYER;
1630 1859
1631 $self->enter_link; 1860 $self->enter_link;
1632 1861
1633 (Coro::async { 1862 (async {
1863 $self->deactivate_recursive; # just to be sure
1634 unless (eval { 1864 unless (eval {
1635
1636 prepare_random_map $exit 1865 prepare_random_map $exit
1637 if $exit->slaying eq "/!"; 1866 if $exit->slaying eq "/!";
1638 1867
1639 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1640 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1641 1870
1642 1; 1871 1;
1643 }) { 1872 }) {
1644 $self->message ("Something went wrong deep within the crossfire server. " 1873 $self->message ("Something went wrong deep within the crossfire server. "
1645 . "I'll try to bring you back to the map you were before. " 1874 . "I'll try to bring you back to the map you were before. "
1646 . "Please report this to the dungeon master", 1875 . "Please report this to the dungeon master!",
1647 cf::NDI_UNIQUE | cf::NDI_RED); 1876 cf::NDI_UNIQUE | cf::NDI_RED);
1648 1877
1649 warn "ERROR in enter_exit: $@"; 1878 warn "ERROR in enter_exit: $@";
1650 $self->leave_link; 1879 $self->leave_link;
1651 } 1880 }
1702 on_reply => sub { 1931 on_reply => sub {
1703 my ($ns, $msg) = @_; 1932 my ($ns, $msg) = @_;
1704 1933
1705 # this weird shuffling is so that direct followup queries 1934 # this weird shuffling is so that direct followup queries
1706 # get handled first 1935 # get handled first
1707 my $queue = delete $ns->{query_queue}; 1936 my $queue = delete $ns->{query_queue}
1937 or return; # be conservative, not sure how that can happen, but we saw a crash here
1708 1938
1709 (shift @$queue)->[1]->($msg); 1939 (shift @$queue)->[1]->($msg);
1710 1940
1711 push @{ $ns->{query_queue} }, @$queue; 1941 push @{ $ns->{query_queue} }, @$queue;
1712 1942
1718 } 1948 }
1719 } 1949 }
1720 }, 1950 },
1721); 1951);
1722 1952
1723=item $client->coro (\&cb) 1953=item $client->async (\&cb)
1724 1954
1725Create a new coroutine, running the specified callback. The coroutine will 1955Create a new coroutine, running the specified callback. The coroutine will
1726be automatically cancelled when the client gets destroyed (e.g. on logout, 1956be automatically cancelled when the client gets destroyed (e.g. on logout,
1727or loss of connection). 1957or loss of connection).
1728 1958
1729=cut 1959=cut
1730 1960
1731sub cf::client::coro { 1961sub cf::client::async {
1732 my ($self, $cb) = @_; 1962 my ($self, $cb) = @_;
1733 1963
1734 my $coro; $coro = async { 1964 my $coro = &Coro::async ($cb);
1735 eval {
1736 $cb->();
1737 };
1738 warn $@ if $@;
1739 };
1740 1965
1741 $coro->on_destroy (sub { 1966 $coro->on_destroy (sub {
1742 delete $self->{_coro}{$coro+0}; 1967 delete $self->{_coro}{$coro+0};
1743 }); 1968 });
1744 1969
1979 open my $fh, "<:utf8", cf::confdir . "/config" 2204 open my $fh, "<:utf8", cf::confdir . "/config"
1980 or return; 2205 or return;
1981 2206
1982 local $/; 2207 local $/;
1983 *CFG = YAML::Syck::Load <$fh>; 2208 *CFG = YAML::Syck::Load <$fh>;
2209
2210 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2211
2212 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2213 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2214
2215 if (exists $CFG{mlockall}) {
2216 eval {
2217 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2218 and die "WARNING: m(un)lockall failed: $!\n";
2219 };
2220 warn $@ if $@;
2221 }
1984} 2222}
1985 2223
1986sub main { 2224sub main {
1987 # we must not ever block the main coroutine 2225 # we must not ever block the main coroutine
1988 local $Coro::idle = sub { 2226 local $Coro::idle = sub {
1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1990 (Coro::unblock_sub {
1991 Event::one_event; 2228 async { Event::one_event };
1992 })->();
1993 }; 2229 };
1994 2230
1995 cfg_load; 2231 cfg_load;
1996 db_load; 2232 db_load;
1997 load_extensions; 2233 load_extensions;
1998 Event::loop; 2234 Event::loop;
1999} 2235}
2000 2236
2001############################################################################# 2237#############################################################################
2002# initialisation 2238# initialisation and cleanup
2239
2240# install some emergency cleanup handlers
2241BEGIN {
2242 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal (
2244 data => WF_AUTOCANCEL,
2245 signal => $signal,
2246 cb => sub {
2247 cf::cleanup "SIG$signal";
2248 },
2249 );
2250 }
2251}
2252
2253sub emergency_save() {
2254 my $freeze_guard = cf::freeze_mainloop;
2255
2256 warn "enter emergency perl save\n";
2257
2258 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously.
2262 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next;
2266 $pl->save;
2267 }
2268 warn "end emergency player save\n";
2269
2270 warn "begin emergency map save\n";
2271 for my $path (keys %cf::MAP) {
2272 my $map = $cf::MAP{$path} or next;
2273 $map->valid or next;
2274 $map->save;
2275 }
2276 warn "end emergency map save\n";
2277 };
2278
2279 warn "leave emergency perl save\n";
2280}
2003 2281
2004sub reload() { 2282sub reload() {
2005 # can/must only be called in main 2283 # can/must only be called in main
2006 if ($Coro::current != $Coro::main) { 2284 if ($Coro::current != $Coro::main) {
2007 warn "can only reload from main coroutine\n"; 2285 warn "can only reload from main coroutine\n";
2008 return; 2286 return;
2009 } 2287 }
2010 2288
2011 warn "reloading..."; 2289 warn "reloading...";
2012 2290
2013 local $FREEZE = 1; 2291 warn "freezing server";
2292 my $guard = freeze_mainloop;
2014 cf::emergency_save; 2293 cf::emergency_save;
2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2015 2298
2016 eval { 2299 eval {
2017 # if anything goes wrong in here, we should simply crash as we already saved 2300 # if anything goes wrong in here, we should simply crash as we already saved
2018 2301
2019 # cancel all watchers 2302 warn "cancel all watchers";
2020 for (Event::all_watchers) { 2303 for (Event::all_watchers) {
2021 $_->cancel if $_->data & WF_AUTOCANCEL; 2304 $_->cancel if $_->data & WF_AUTOCANCEL;
2022 } 2305 }
2023 2306
2024 # cancel all extension coros 2307 warn "cancel all extension coros";
2025 $_->cancel for values %EXT_CORO; 2308 $_->cancel for values %EXT_CORO;
2026 %EXT_CORO = (); 2309 %EXT_CORO = ();
2027 2310
2311 warn "remove commands";
2312 %COMMAND = ();
2313
2314 warn "remove ext commands";
2315 %EXTCMD = ();
2316
2028 # unload all extensions 2317 warn "unload/nuke all extensions";
2029 for (@exts) { 2318 for my $pkg (@EXTS) {
2030 warn "unloading <$_>"; 2319 warn "unloading <$pkg>";
2031 unload_extension $_; 2320
2321 if (my $cb = $pkg->can ("unload")) {
2322 eval {
2323 $cb->($pkg);
2324 1
2325 } or warn "$pkg unloaded, but with errors: $@";
2032 } 2326 }
2033 2327
2328 Symbol::delete_package $pkg;
2329 }
2330
2034 # unload all modules loaded from $LIBDIR 2331 warn "unload all perl modules loaded from $LIBDIR";
2035 while (my ($k, $v) = each %INC) { 2332 while (my ($k, $v) = each %INC) {
2036 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2037 2334
2038 warn "removing <$k>"; 2335 warn "removing <$k>";
2039 delete $INC{$k}; 2336 delete $INC{$k};
2046 } 2343 }
2047 2344
2048 Symbol::delete_package $k; 2345 Symbol::delete_package $k;
2049 } 2346 }
2050 2347
2051 # sync database to disk
2052 cf::db_sync;
2053 IO::AIO::flush;
2054
2055 # get rid of safe::, as good as possible 2348 warn "get rid of safe::, as good as possible";
2056 Symbol::delete_package "safe::$_" 2349 Symbol::delete_package "safe::$_"
2057 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2350 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2058 2351
2059 # remove register_script_function callbacks
2060 # TODO
2061
2062 # unload cf.pm "a bit" 2352 warn "unload cf.pm \"a bit\"";
2063 delete $INC{"cf.pm"}; 2353 delete $INC{"cf.pm"};
2064 2354
2065 # don't, removes xs symbols, too, 2355 # don't, removes xs symbols, too,
2066 # and global variables created in xs 2356 # and global variables created in xs
2067 #Symbol::delete_package __PACKAGE__; 2357 #Symbol::delete_package __PACKAGE__;
2068 2358
2069 # reload cf.pm
2070 warn "reloading cf.pm"; 2359 warn "reloading cf.pm";
2071 require cf; 2360 require cf;
2072 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2073 2362
2074 # load config and database again 2363 warn "load config and database again";
2075 cf::cfg_load; 2364 cf::cfg_load;
2076 cf::db_load; 2365 cf::db_load;
2077 2366
2078 # load extensions
2079 warn "load extensions"; 2367 warn "load extensions";
2080 cf::load_extensions; 2368 cf::load_extensions;
2081 2369
2082 # reattach attachments to objects 2370 warn "reattach attachments to objects/players";
2083 warn "reattach";
2084 _global_reattach; 2371 _global_reattach;
2372 warn "reattach attachments to maps";
2373 reattach $_ for values %MAP;
2085 }; 2374 };
2086 2375
2087 if ($@) { 2376 if ($@) {
2088 warn $@; 2377 warn $@;
2089 warn "error while reloading, exiting."; 2378 warn "error while reloading, exiting.";
2090 exit 1; 2379 exit 1;
2091 } 2380 }
2092 2381
2093 warn "reloaded successfully"; 2382 warn "reloaded";
2094}; 2383};
2095 2384
2096############################################################################# 2385#############################################################################
2097 2386
2098unless ($LINK_MAP) { 2387unless ($LINK_MAP) {
2105 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2106 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2107 2396
2108 # dirty hack because... archetypes are not yet loaded 2397 # dirty hack because... archetypes are not yet loaded
2109 Event->timer ( 2398 Event->timer (
2110 after => 2, 2399 after => 10,
2111 cb => sub { 2400 cb => sub {
2112 $_[0]->w->cancel; 2401 $_[0]->w->cancel;
2113 2402
2114 # provide some exits "home" 2403 # provide some exits "home"
2115 my $exit = cf::object::new "exit"; 2404 my $exit = cf::object::new "exit";
2134 $LINK_MAP->{deny_reset} = 1; 2423 $LINK_MAP->{deny_reset} = 1;
2135 2424
2136 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2137} 2426}
2138 2427
2139register "<global>", __PACKAGE__;
2140
2141register_command "reload" => sub { 2428register_command "reload" => sub {
2142 my ($who, $arg) = @_; 2429 my ($who, $arg) = @_;
2143 2430
2144 if ($who->flag (FLAG_WIZ)) { 2431 if ($who->flag (FLAG_WIZ)) {
2145 $who->message ("start of reload."); 2432 $who->message ("start of reload.");
2154 reentrant => 0, 2441 reentrant => 0,
2155 prio => 0, 2442 prio => 0,
2156 at => $NEXT_TICK || $TICK, 2443 at => $NEXT_TICK || $TICK,
2157 data => WF_AUTOCANCEL, 2444 data => WF_AUTOCANCEL,
2158 cb => sub { 2445 cb => sub {
2159 unless ($FREEZE) {
2160 cf::server_tick; # one server iteration 2446 cf::server_tick; # one server iteration
2161 $RUNTIME += $TICK; 2447 $RUNTIME += $TICK;
2162 }
2163
2164 $NEXT_TICK += $TICK; 2448 $NEXT_TICK += $TICK;
2449
2450 $WAIT_FOR_TICK->broadcast;
2451 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2165 2452
2166 # if we are delayed by four ticks or more, skip them all 2453 # if we are delayed by four ticks or more, skip them all
2167 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2454 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2168 2455
2169 $TICK_WATCHER->at ($NEXT_TICK); 2456 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines