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.132 by root, Thu Jan 4 01:35:56 2007 UTC vs.
Revision 1.160 by root, Wed Jan 10 22:54:06 2007 UTC

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
106=item %cf::CFG 112=item %cf::CFG
107 113
108Configuration for the server, loaded from C</etc/crossfire/config>, or 114Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 115from wherever your confdir points to.
110 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.
123
111=back 124=back
112 125
113=cut 126=cut
114 127
115BEGIN { 128BEGIN {
118 utf8::encode $msg; 131 utf8::encode $msg;
119 132
120 $msg .= "\n" 133 $msg .= "\n"
121 unless $msg =~ /\n$/; 134 unless $msg =~ /\n$/;
122 135
123 LOG llevError, "cfperl: $msg"; 136 LOG llevError, $msg;
124 }; 137 };
125} 138}
126 139
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 140@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 141@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146 159
147$Event::DIED = sub { 160$Event::DIED = sub {
148 warn "error in event callback: @_"; 161 warn "error in event callback: @_";
149}; 162};
150 163
151my %ext_pkg;
152my @exts;
153my @hook;
154
155=head2 UTILITY FUNCTIONS 164=head2 UTILITY FUNCTIONS
156 165
157=over 4 166=over 4
158 167
168=item dumpval $ref
169
159=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}
160 190
161use JSON::Syck (); # TODO# replace by JSON::PC once working 191use JSON::Syck (); # TODO# replace by JSON::PC once working
162 192
163=item $ref = cf::from_json $json 193=item $ref = cf::from_json $json
164 194
180sub to_json($) { 210sub to_json($) {
181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 211 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182 JSON::Syck::Dump $_[0] 212 JSON::Syck::Dump $_[0]
183} 213}
184 214
185=item my $guard = cf::guard { BLOCK }
186
187Run the given callback when the guard object gets destroyed (useful for
188coroutine cancellations).
189
190You can call C<< ->cancel >> on the guard object to stop the block from
191being executed.
192
193=cut
194
195sub guard(&) {
196 bless \(my $cb = $_[0]), cf::guard::;
197}
198
199sub cf::guard::cancel {
200 ${$_[0]} = sub { };
201}
202
203sub cf::guard::DESTROY {
204 ${$_[0]}->();
205}
206
207=item cf::lock_wait $string 215=item cf::lock_wait $string
208 216
209Wait until the given lock is available. See cf::lock_acquire. 217Wait until the given lock is available. See cf::lock_acquire.
210 218
211=item my $lock = cf::lock_acquire $string 219=item my $lock = cf::lock_acquire $string
212 220
213Wait 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
214a 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,
215for example when the coroutine gets canceled), the lock is automatically 223for example when the coroutine gets canceled), the lock is automatically
216returned. 224returned.
217 225
218Lock names should begin with a unique identifier (for example, find_map 226Lock names should begin with a unique identifier (for example, cf::map::find
219uses map_find and load_map uses map_load). 227uses map_find and cf::map::load uses map_load).
220 228
221=cut 229=cut
222 230
223our %LOCK; 231our %LOCK;
224 232
238 # wait, to be sure we are not locked 246 # wait, to be sure we are not locked
239 lock_wait $key; 247 lock_wait $key;
240 248
241 $LOCK{$key} = []; 249 $LOCK{$key} = [];
242 250
243 cf::guard { 251 Coro::guard {
244 # wake up all waiters, to be on the safe side 252 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} }; 253 $_->ready for @{ delete $LOCK{$key} };
246 } 254 }
247} 255}
248 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
249=item cf::async { BLOCK } 265=item cf::async { BLOCK }
250 266
251Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 267Currently the same as Coro::async_pool, meaning you cannot use
252error instead of exiting the server in case of a problem. 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.
253 270
254=cut 271=cut
255 272
256sub async(&) { 273BEGIN { *async = \&Coro::async_pool }
257 my ($cb) = @_;
258
259 Coro::async {
260 eval { $cb->() };
261 warn $@ if $@;
262 }
263}
264 274
265=item cf::sync_job { BLOCK } 275=item cf::sync_job { BLOCK }
266 276
267The design of crossfire+ requires that the main coro ($Coro::main) is 277The design of crossfire+ requires that the main coro ($Coro::main) is
268always able to handle events or runnable, as crossfire+ is only partly 278always able to handle events or runnable, as crossfire+ is only partly
282 # this is the main coro, too bad, we have to block 292 # this is the main coro, too bad, we have to block
283 # till the operation succeeds, freezing the server :/ 293 # till the operation succeeds, freezing the server :/
284 294
285 # TODO: use suspend/resume instead 295 # TODO: use suspend/resume instead
286 # (but this is cancel-safe) 296 # (but this is cancel-safe)
287 local $FREEZE = 1; 297 my $freeze_guard = freeze_mainloop;
288 298
289 my $busy = 1; 299 my $busy = 1;
290 my @res; 300 my @res;
291 301
292 (Coro::async { 302 (async {
293 @res = eval { $job->() }; 303 @res = eval { $job->() };
294 warn $@ if $@; 304 warn $@ if $@;
295 undef $busy; 305 undef $busy;
296 })->prio (Coro::PRIO_MAX); 306 })->prio (Coro::PRIO_MAX);
297 307
298 while ($busy) { 308 while ($busy) {
299 Coro::cede_notself; 309 Coro::cede or Event::one_event;
300 Event::one_event unless Coro::nready;
301 } 310 }
302 311
303 wantarray ? @res : $res[0] 312 wantarray ? @res : $res[0]
304 } else { 313 } else {
305 # we are in another coroutine, how wonderful, everything just works 314 # we are in another coroutine, how wonderful, everything just works
306 315
307 $job->() 316 $job->()
308 } 317 }
309} 318}
310 319
311=item $coro = cf::coro { BLOCK } 320=item $coro = cf::async_ext { BLOCK }
312 321
313Creates and returns a new coro. This coro is automcatially being canceled 322Like async, but this coro is automatically being canceled when the
314when the extension calling this is being unloaded. 323extension calling this is being unloaded.
315 324
316=cut 325=cut
317 326
318sub coro(&) { 327sub async_ext(&) {
319 my $cb = shift; 328 my $cb = shift;
320 329
321 my $coro = &cf::async ($cb); 330 my $coro = &Coro::async ($cb);
322 331
323 $coro->on_destroy (sub { 332 $coro->on_destroy (sub {
324 delete $EXT_CORO{$coro+0}; 333 delete $EXT_CORO{$coro+0};
325 }); 334 });
326 $EXT_CORO{$coro+0} = $coro; 335 $EXT_CORO{$coro+0} = $coro;
355=cut 364=cut
356 365
357############################################################################# 366#############################################################################
358 367
359package 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
360 375
361sub new { 376sub new {
362 my ($class, $path, $base) = @_; 377 my ($class, $path, $base) = @_;
363 378
364 $path = $path->as_string if ref $path; 379 $path = $path->as_string if ref $path;
370 # ?random/... random maps 385 # ?random/... random maps
371 # /! non-realised random map exit 386 # /! non-realised random map exit
372 # /... normal maps 387 # /... normal maps
373 # ~/... per-player maps without a specific player (DO NOT USE) 388 # ~/... per-player maps without a specific player (DO NOT USE)
374 # ~user/... per-player map of a specific user 389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
375 392
376 if ($path =~ /^{/) { 393 if ($path =~ /^{/) {
377 # fine as it is 394 # fine as it is
378 } elsif ($path =~ s{^\?random/}{}) { 395 } elsif ($path =~ s{^\?random/}{}) {
379 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
428# } 445# }
429} 446}
430 447
431# escape the /'s in the path 448# escape the /'s in the path
432sub _escaped_path { 449sub _escaped_path {
433 # ∕ is U+2215
434 (my $path = $_[0]{path}) =~ s/\///g; 450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
435 $path 451 $path
436} 452}
437 453
438# the original (read-only) location 454# the original (read-only) location
439sub load_path { 455sub load_path {
927=cut 943=cut
928 944
929sub register_extcmd { 945sub register_extcmd {
930 my ($name, $cb) = @_; 946 my ($name, $cb) = @_;
931 947
932 my $caller = caller;
933 #warn "registering extcmd '$name' to '$caller'";
934
935 $EXTCMD{$name} = [$cb, $caller]; 948 $EXTCMD{$name} = $cb;
936} 949}
937 950
938cf::player->attach ( 951cf::player->attach (
939 on_command => sub { 952 on_command => sub {
940 my ($pl, $name, $params) = @_; 953 my ($pl, $name, $params) = @_;
953 966
954 my $msg = eval { from_json $buf }; 967 my $msg = eval { from_json $buf };
955 968
956 if (ref $msg) { 969 if (ref $msg) {
957 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 970 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
958 if (my %reply = $cb->[0]->($pl, $msg)) { 971 if (my %reply = $cb->($pl, $msg)) {
959 $pl->ext_reply ($msg->{msgid}, %reply); 972 $pl->ext_reply ($msg->{msgid}, %reply);
960 } 973 }
961 } 974 }
962 } else { 975 } else {
963 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
965 978
966 cf::override; 979 cf::override;
967 }, 980 },
968); 981);
969 982
970sub register {
971 my ($base, $pkg) = @_;
972
973 #TODO
974}
975
976sub load_extension { 983sub load_extension {
977 my ($path) = @_; 984 my ($path) = @_;
978 985
979 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 986 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
980 my $base = $1; 987 my $base = $1;
981 my $pkg = $1; 988 my $pkg = $1;
982 $pkg =~ s/[^[:word:]]/_/g; 989 $pkg =~ s/[^[:word:]]/_/g;
983 $pkg = "ext::$pkg"; 990 $pkg = "ext::$pkg";
984 991
985 warn "loading '$path' into '$pkg'\n"; 992 warn "... loading '$path' into '$pkg'\n";
986 993
987 open my $fh, "<:utf8", $path 994 open my $fh, "<:utf8", $path
988 or die "$path: $!"; 995 or die "$path: $!";
989 996
990 my $source = 997 my $source =
995 1002
996 eval $source 1003 eval $source
997 or die $@ ? "$path: $@\n" 1004 or die $@ ? "$path: $@\n"
998 : "extension disabled.\n"; 1005 : "extension disabled.\n";
999 1006
1000 push @exts, $pkg; 1007 push @EXTS, $pkg;
1001 $ext_pkg{$base} = $pkg;
1002
1003# no strict 'refs';
1004# @{"$pkg\::ISA"} = ext::;
1005
1006 register $base, $pkg;
1007}
1008
1009sub unload_extension {
1010 my ($pkg) = @_;
1011
1012 warn "removing extension $pkg\n";
1013
1014 # remove hooks
1015 #TODO
1016# for my $idx (0 .. $#PLUGIN_EVENT) {
1017# delete $hook[$idx]{$pkg};
1018# }
1019
1020 # remove commands
1021 for my $name (keys %COMMAND) {
1022 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1023
1024 if (@cb) {
1025 $COMMAND{$name} = \@cb;
1026 } else {
1027 delete $COMMAND{$name};
1028 }
1029 }
1030
1031 # remove extcmds
1032 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1033 delete $EXTCMD{$name};
1034 }
1035
1036 if (my $cb = $pkg->can ("unload")) {
1037 eval {
1038 $cb->($pkg);
1039 1
1040 } or warn "$pkg unloaded, but with errors: $@";
1041 }
1042
1043 Symbol::delete_package $pkg;
1044} 1008}
1045 1009
1046sub load_extensions { 1010sub load_extensions {
1047 for my $ext (<$LIBDIR/*.ext>) { 1011 for my $ext (<$LIBDIR/*.ext>) {
1048 next unless -r $ext; 1012 next unless -r $ext;
1066}; 1030};
1067 1031
1068cf::map->attach (prio => -10000, package => cf::mapsupport::); 1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1069 1033
1070############################################################################# 1034#############################################################################
1071# load/save perl data associated with player->ob objects
1072
1073sub all_objects(@) {
1074 @_, map all_objects ($_->inv), @_
1075}
1076
1077# TODO: compatibility cruft, remove when no longer needed
1078cf::player->attach (
1079 on_load => sub {
1080 my ($pl, $path) = @_;
1081
1082 for my $o (all_objects $pl->ob) {
1083 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1084 $o->set_ob_key_value ("_perl_data");
1085
1086 %$o = %{ Storable::thaw pack "H*", $value };
1087 }
1088 }
1089 },
1090);
1091
1092#############################################################################
1093 1035
1094=head2 CORE EXTENSIONS 1036=head2 CORE EXTENSIONS
1095 1037
1096Functions and methods that extend core crossfire objects. 1038Functions and methods that extend core crossfire objects.
1097 1039
1040=cut
1041
1042package cf::player;
1043
1044use Coro::AIO;
1045
1098=head3 cf::player 1046=head3 cf::player
1099 1047
1100=over 4 1048=over 4
1101 1049
1102=item cf::player::exists $login 1050=item cf::player::find $login
1103 1051
1104Returns true when the given account exists. 1052Returns the given player object, loading it if necessary (might block).
1105 1053
1106=cut 1054=cut
1107 1055
1108sub cf::player::exists($) { 1056sub playerdir($) {
1109 cf::player::find $_[0] 1057 cf::localdir
1110 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
1111} 1202}
1112 1203
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1204=item $player->ext_reply ($msgid, $msgtype, %msg)
1114 1205
1115Sends an ext reply to the player. 1206Sends an ext reply to the player.
1116 1207
1117=cut 1208=cut
1118 1209
1119sub cf::player::ext_reply($$$%) { 1210sub ext_reply($$$%) {
1120 my ($self, $id, %msg) = @_; 1211 my ($self, $id, %msg) = @_;
1121 1212
1122 $msg{msgid} = $id; 1213 $msg{msgid} = $id;
1123 1214
1124 $self->send ("ext " . to_json \%msg); 1215 $self->send ("ext " . cf::to_json \%msg);
1125} 1216}
1217
1218package cf;
1126 1219
1127=back 1220=back
1128 1221
1129 1222
1130=head3 cf::map 1223=head3 cf::map
1136package cf::map; 1229package cf::map;
1137 1230
1138use Fcntl; 1231use Fcntl;
1139use Coro::AIO; 1232use Coro::AIO;
1140 1233
1141our $MAX_RESET = 7200; 1234our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1235our $DEFAULT_RESET = 3000;
1143 1236
1144sub generate_random_map { 1237sub generate_random_map {
1145 my ($path, $rmp) = @_; 1238 my ($path, $rmp) = @_;
1146 1239
1147 # mit "rum" bekleckern, nicht 1240 # mit "rum" bekleckern, nicht
1177 or return; 1270 or return;
1178 1271
1179 my $map = cf::map::new 1272 my $map = cf::map::new
1180 or return; 1273 or return;
1181 1274
1275 # for better error messages only, will be overwritten
1276 $map->path ($path);
1277
1182 $map->load_header ($path) 1278 $map->load_header ($path)
1183 or return; 1279 or return;
1184 1280
1185 $map->{load_path} = $path; 1281 $map->{load_path} = $path;
1186 1282
1187 $map 1283 $map
1188} 1284}
1189 1285
1190sub find_map; 1286sub find;
1191sub find_map { 1287sub find {
1192 my ($path, $origin) = @_; 1288 my ($path, $origin) = @_;
1193 1289
1194 #warn "find_map<$path,$origin>\n";#d# 1290 #warn "find<$path,$origin>\n";#d#
1195 1291
1196 $path = new cf::path $path, $origin && $origin->path; 1292 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1293 my $key = $path->as_string;
1198 1294
1199 cf::lock_wait "map_find:$key"; 1295 cf::lock_wait "map_find:$key";
1201 $cf::MAP{$key} || do { 1297 $cf::MAP{$key} || do {
1202 my $guard = cf::lock_acquire "map_find:$key"; 1298 my $guard = cf::lock_acquire "map_find:$key";
1203 1299
1204 # do it the slow way 1300 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1301 my $map = try_load_header $path->save_path;
1302
1303 Coro::cede;
1206 1304
1207 if ($map) { 1305 if ($map) {
1208 $map->last_access ((delete $map->{last_access}) 1306 $map->last_access ((delete $map->{last_access})
1209 || $cf::RUNTIME); #d# 1307 || $cf::RUNTIME); #d#
1210 # safety 1308 # safety
1230 1328
1231 $map->path ($key); 1329 $map->path ($key);
1232 $map->{path} = $path; 1330 $map->{path} = $path;
1233 $map->{last_save} = $cf::RUNTIME; 1331 $map->{last_save} = $cf::RUNTIME;
1234 1332
1333 Coro::cede;
1334
1235 if ($map->should_reset) { 1335 if ($map->should_reset) {
1236 $map->reset; 1336 $map->reset;
1237 undef $guard; 1337 undef $guard;
1238 $map = find_map $path 1338 $map = find $path
1239 or return; 1339 or return;
1240 } 1340 }
1241 1341
1242 $cf::MAP{$key} = $map 1342 $cf::MAP{$key} = $map
1243 } 1343 }
1265 if (aio_open $uniq, O_RDONLY, 0) { 1365 if (aio_open $uniq, O_RDONLY, 0) {
1266 $self->clear_unique_items; 1366 $self->clear_unique_items;
1267 $self->load_objects ($uniq, 0); 1367 $self->load_objects ($uniq, 0);
1268 } 1368 }
1269 } 1369 }
1370
1371 Coro::cede;
1270 1372
1271 # now do the right thing for maps 1373 # now do the right thing for maps
1272 $self->link_multipart_objects; 1374 $self->link_multipart_objects;
1273 1375
1274 if ($self->{path}->is_style_map) { 1376 if ($self->{path}->is_style_map) {
1282 $self->difficulty ($self->estimate_difficulty) 1384 $self->difficulty ($self->estimate_difficulty)
1283 unless $self->difficulty; 1385 unless $self->difficulty;
1284 $self->activate; 1386 $self->activate;
1285 } 1387 }
1286 1388
1389 Coro::cede;
1390
1287 $self->in_memory (cf::MAP_IN_MEMORY); 1391 $self->in_memory (cf::MAP_IN_MEMORY);
1288} 1392}
1289 1393
1290sub 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 {
1291 my ($path, $origin) = @_; 1419 my ($path, $origin) = @_;
1292 1420
1293 #warn "load_map_sync<$path, $origin>\n";#d# 1421 cf::sync_job { find $path, $origin }
1422}
1294 1423
1295 cf::sync_job { 1424sub do_load_sync {
1296 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
1297 or return; 1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1298 $map->load; 1440 $map->load;
1299 $map 1441 }
1442 Coro::schedule;
1300 } 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 ()
1301} 1460}
1302 1461
1303sub save { 1462sub save {
1304 my ($self) = @_; 1463 my ($self) = @_;
1305 1464
1465 my $lock = cf::lock_acquire "map_data:" . $self->path;
1466
1306 $self->{last_save} = $cf::RUNTIME; 1467 $self->{last_save} = $cf::RUNTIME;
1307 1468
1308 return unless $self->dirty; 1469 return unless $self->dirty;
1309 1470
1310 my $save = $self->{path}->save_path; utf8::encode $save; 1471 my $save = $self->{path}->save_path; utf8::encode $save;
1313 $self->{load_path} = $save; 1474 $self->{load_path} = $save;
1314 1475
1315 return if $self->{deny_save}; 1476 return if $self->{deny_save};
1316 1477
1317 local $self->{last_access} = $self->last_access;#d# 1478 local $self->{last_access} = $self->last_access;#d#
1479
1480 cf::async {
1481 $_->contr->save for $self->players;
1482 };
1318 1483
1319 if ($uniq) { 1484 if ($uniq) {
1320 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1321 $self->save_objects ($uniq, cf::IO_UNIQUES); 1486 $self->save_objects ($uniq, cf::IO_UNIQUES);
1322 } else { 1487 } else {
1328 my ($self) = @_; 1493 my ($self) = @_;
1329 1494
1330 # save first because save cedes 1495 # save first because save cedes
1331 $self->save; 1496 $self->save;
1332 1497
1498 my $lock = cf::lock_acquire "map_data:" . $self->path;
1499
1333 return if $self->players; 1500 return if $self->players;
1334 return if $self->in_memory != cf::MAP_IN_MEMORY; 1501 return if $self->in_memory != cf::MAP_IN_MEMORY;
1335 return if $self->{deny_save}; 1502 return if $self->{deny_save};
1336 1503
1337 $self->clear; 1504 $self->clear;
1379} 1546}
1380 1547
1381sub reset { 1548sub reset {
1382 my ($self) = @_; 1549 my ($self) = @_;
1383 1550
1551 my $lock = cf::lock_acquire "map_data:" . $self->path;
1552
1384 return if $self->players; 1553 return if $self->players;
1385 return if $self->{path}{user_rel};#d# 1554 return if $self->{path}{user_rel};#d#
1386 1555
1387 warn "resetting map ", $self->path;#d# 1556 warn "resetting map ", $self->path;#d#
1388 1557
1407 1576
1408sub customise_for { 1577sub customise_for {
1409 my ($map, $ob) = @_; 1578 my ($map, $ob) = @_;
1410 1579
1411 if ($map->per_player) { 1580 if ($map->per_player) {
1412 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1581 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1413 } 1582 }
1414 1583
1415 $map 1584 $map
1416} 1585}
1417 1586
1418sub emergency_save { 1587=item cf::map::unique_maps
1419 local $cf::FREEZE = 1;
1420 1588
1421 warn "enter emergency map save\n"; 1589Returns an arrayref of cf::path's of all shared maps that have
1590instantiated unique items. May block.
1422 1591
1423 cf::sync_job { 1592=cut
1424 warn "begin emergency map save\n"; 1593
1425 $_->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 $_;
1426 }; 1606 }
1427 1607
1428 warn "end emergency map save\n"; 1608 \@paths
1429} 1609}
1430 1610
1431package cf; 1611package cf;
1432 1612
1433=back 1613=back
1434 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
1435 1641
1436=head3 cf::object::player 1642=head3 cf::object::player
1437 1643
1438=over 4 1644=over 4
1439 1645
1514 my $link_pos = delete $self->{_link_pos}; 1720 my $link_pos = delete $self->{_link_pos};
1515 1721
1516 unless ($map) { 1722 unless ($map) {
1517 # restore original map position 1723 # restore original map position
1518 ($map, $x, $y) = @{ $link_pos || [] }; 1724 ($map, $x, $y) = @{ $link_pos || [] };
1519 $map = cf::map::find_map $map; 1725 $map = cf::map::find $map;
1520 1726
1521 unless ($map) { 1727 unless ($map) {
1522 ($map, $x, $y) = @$EMERGENCY_POSITION; 1728 ($map, $x, $y) = @$EMERGENCY_POSITION;
1523 $map = cf::map::find_map $map 1729 $map = cf::map::find $map
1524 or die "FATAL: cannot load emergency map\n"; 1730 or die "FATAL: cannot load emergency map\n";
1525 } 1731 }
1526 } 1732 }
1527 1733
1528 ($x, $y) = (-1, -1) 1734 ($x, $y) = (-1, -1)
1531 # use -1 or undef as default coordinates, not 0, 0 1737 # use -1 or undef as default coordinates, not 0, 0
1532 ($x, $y) = ($map->enter_x, $map->enter_y) 1738 ($x, $y) = ($map->enter_x, $map->enter_y)
1533 if $x <=0 && $y <= 0; 1739 if $x <=0 && $y <= 0;
1534 1740
1535 $map->load; 1741 $map->load;
1742 $map->load_diag;
1536 1743
1744 return unless $self->contr->active;
1537 $self->activate_recursive; 1745 $self->activate_recursive;
1538 $self->enter_map ($map, $x, $y); 1746 $self->enter_map ($map, $x, $y);
1539} 1747}
1540 1748
1541cf::player->attach ( 1749cf::player->attach (
1554 1762
1555 # try to abort aborted map switching on player login :) 1763 # try to abort aborted map switching on player login :)
1556 # should happen only on crashes 1764 # should happen only on crashes
1557 if ($pl->ob->{_link_pos}) { 1765 if ($pl->ob->{_link_pos}) {
1558 $pl->ob->enter_link; 1766 $pl->ob->enter_link;
1559 cf::async { 1767 (async {
1560 # 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
1561 # 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);
1562 Coro::Timer::sleep 1; 1774 Coro::Timer::sleep 1;
1563 $pl->ob->leave_link; 1775 $pl->ob->leave_link;
1564 }; 1776 })->prio (2);
1565 } 1777 }
1566 }, 1778 },
1567); 1779);
1568 1780
1569=item $player_object->goto_map ($path, $x, $y) 1781=item $player_object->goto ($path, $x, $y)
1570 1782
1571=cut 1783=cut
1572 1784
1573sub cf::object::player::goto_map { 1785sub cf::object::player::goto {
1574 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1575 1787
1788 $path = new cf::path $path;
1789
1576 $self->enter_link; 1790 $self->enter_link;
1577 1791
1578 (cf::async { 1792 (async {
1579 $path = new cf::path $path;
1580
1581 my $map = cf::map::find_map $path->as_string; 1793 my $map = cf::map::find $path->as_string;
1582 $map = $map->customise_for ($self) if $map; 1794 $map = $map->customise_for ($self) if $map;
1583 1795
1584# warn "entering ", $map->path, " at ($x, $y)\n" 1796# warn "entering ", $map->path, " at ($x, $y)\n"
1585# if $map; 1797# if $map;
1586 1798
1587 $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);
1588 1800
1589 $self->leave_link ($map, $x, $y); 1801 $self->leave_link ($map, $x, $y);
1590 })->prio (1); 1802 })->prio (1);
1591} 1803}
1592 1804
1645 1857
1646 return unless $self->type == cf::PLAYER; 1858 return unless $self->type == cf::PLAYER;
1647 1859
1648 $self->enter_link; 1860 $self->enter_link;
1649 1861
1650 (cf::async { 1862 (async {
1863 $self->deactivate_recursive; # just to be sure
1651 unless (eval { 1864 unless (eval {
1652 prepare_random_map $exit 1865 prepare_random_map $exit
1653 if $exit->slaying eq "/!"; 1866 if $exit->slaying eq "/!";
1654 1867
1655 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;
1656 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1657 1870
1658 1; 1871 1;
1659 }) { 1872 }) {
1660 $self->message ("Something went wrong deep within the crossfire server. " 1873 $self->message ("Something went wrong deep within the crossfire server. "
1661 . "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. "
1662 . "Please report this to the dungeon master", 1875 . "Please report this to the dungeon master!",
1663 cf::NDI_UNIQUE | cf::NDI_RED); 1876 cf::NDI_UNIQUE | cf::NDI_RED);
1664 1877
1665 warn "ERROR in enter_exit: $@"; 1878 warn "ERROR in enter_exit: $@";
1666 $self->leave_link; 1879 $self->leave_link;
1667 } 1880 }
1735 } 1948 }
1736 } 1949 }
1737 }, 1950 },
1738); 1951);
1739 1952
1740=item $client->coro (\&cb) 1953=item $client->async (\&cb)
1741 1954
1742Create a new coroutine, running the specified callback. The coroutine will 1955Create a new coroutine, running the specified callback. The coroutine will
1743be automatically cancelled when the client gets destroyed (e.g. on logout, 1956be automatically cancelled when the client gets destroyed (e.g. on logout,
1744or loss of connection). 1957or loss of connection).
1745 1958
1746=cut 1959=cut
1747 1960
1748sub cf::client::coro { 1961sub cf::client::async {
1749 my ($self, $cb) = @_; 1962 my ($self, $cb) = @_;
1750 1963
1751 my $coro = &cf::async ($cb); 1964 my $coro = &Coro::async ($cb);
1752 1965
1753 $coro->on_destroy (sub { 1966 $coro->on_destroy (sub {
1754 delete $self->{_coro}{$coro+0}; 1967 delete $self->{_coro}{$coro+0};
1755 }); 1968 });
1756 1969
1994 local $/; 2207 local $/;
1995 *CFG = YAML::Syck::Load <$fh>; 2208 *CFG = YAML::Syck::Load <$fh>;
1996 2209
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2210 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998 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
1999 if (exists $CFG{mlockall}) { 2215 if (exists $CFG{mlockall}) {
2000 eval { 2216 eval {
2001 $CFG{mlockall} ? &mlockall : &munlockall 2217 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2002 and die "WARNING: m(un)lockall failed: $!\n"; 2218 and die "WARNING: m(un)lockall failed: $!\n";
2003 }; 2219 };
2004 warn $@ if $@; 2220 warn $@ if $@;
2005 } 2221 }
2006} 2222}
2007 2223
2008sub main { 2224sub main {
2009 # we must not ever block the main coroutine 2225 # we must not ever block the main coroutine
2010 local $Coro::idle = sub { 2226 local $Coro::idle = sub {
2011 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#
2012 (Coro::unblock_sub {
2013 Event::one_event; 2228 async { Event::one_event };
2014 })->();
2015 }; 2229 };
2016 2230
2017 cfg_load; 2231 cfg_load;
2018 db_load; 2232 db_load;
2019 load_extensions; 2233 load_extensions;
2020 Event::loop; 2234 Event::loop;
2021} 2235}
2022 2236
2023############################################################################# 2237#############################################################################
2024# 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}
2025 2281
2026sub reload() { 2282sub reload() {
2027 # can/must only be called in main 2283 # can/must only be called in main
2028 if ($Coro::current != $Coro::main) { 2284 if ($Coro::current != $Coro::main) {
2029 warn "can only reload from main coroutine\n"; 2285 warn "can only reload from main coroutine\n";
2030 return; 2286 return;
2031 } 2287 }
2032 2288
2033 warn "reloading..."; 2289 warn "reloading...";
2034 2290
2035 local $FREEZE = 1; 2291 warn "freezing server";
2292 my $guard = freeze_mainloop;
2036 cf::emergency_save; 2293 cf::emergency_save;
2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2037 2298
2038 eval { 2299 eval {
2039 # 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
2040 2301
2041 # cancel all watchers 2302 warn "cancel all watchers";
2042 for (Event::all_watchers) { 2303 for (Event::all_watchers) {
2043 $_->cancel if $_->data & WF_AUTOCANCEL; 2304 $_->cancel if $_->data & WF_AUTOCANCEL;
2044 } 2305 }
2045 2306
2046 # cancel all extension coros 2307 warn "cancel all extension coros";
2047 $_->cancel for values %EXT_CORO; 2308 $_->cancel for values %EXT_CORO;
2048 %EXT_CORO = (); 2309 %EXT_CORO = ();
2049 2310
2311 warn "remove commands";
2312 %COMMAND = ();
2313
2314 warn "remove ext commands";
2315 %EXTCMD = ();
2316
2050 # unload all extensions 2317 warn "unload/nuke all extensions";
2051 for (@exts) { 2318 for my $pkg (@EXTS) {
2052 warn "unloading <$_>"; 2319 warn "... unloading $pkg";
2053 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: $@";
2054 } 2326 }
2055 2327
2328 warn "... nuking $pkg";
2329 Symbol::delete_package $pkg;
2330 }
2331
2056 # unload all modules loaded from $LIBDIR 2332 warn "unload all perl modules loaded from $LIBDIR";
2057 while (my ($k, $v) = each %INC) { 2333 while (my ($k, $v) = each %INC) {
2058 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2334 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2059 2335
2060 warn "removing <$k>"; 2336 warn "removing <$k>";
2061 delete $INC{$k}; 2337 delete $INC{$k};
2068 } 2344 }
2069 2345
2070 Symbol::delete_package $k; 2346 Symbol::delete_package $k;
2071 } 2347 }
2072 2348
2073 # sync database to disk
2074 cf::db_sync;
2075 IO::AIO::flush;
2076
2077 # get rid of safe::, as good as possible 2349 warn "get rid of safe::, as good as possible";
2078 Symbol::delete_package "safe::$_" 2350 Symbol::delete_package "safe::$_"
2079 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2351 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2080 2352
2081 # remove register_script_function callbacks
2082 # TODO
2083
2084 # unload cf.pm "a bit" 2353 warn "unload cf.pm \"a bit\"";
2085 delete $INC{"cf.pm"}; 2354 delete $INC{"cf.pm"};
2086 2355
2087 # don't, removes xs symbols, too, 2356 # don't, removes xs symbols, too,
2088 # and global variables created in xs 2357 # and global variables created in xs
2089 #Symbol::delete_package __PACKAGE__; 2358 #Symbol::delete_package __PACKAGE__;
2090 2359
2091 # reload cf.pm
2092 warn "reloading cf.pm"; 2360 warn "reloading cf.pm";
2093 require cf; 2361 require cf;
2094 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2362 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2095 2363
2096 # load config and database again 2364 warn "load config and database again";
2097 cf::cfg_load; 2365 cf::cfg_load;
2098 cf::db_load; 2366 cf::db_load;
2099 2367
2100 # load extensions
2101 warn "load extensions"; 2368 warn "load extensions";
2102 cf::load_extensions; 2369 cf::load_extensions;
2103 2370
2104 # reattach attachments to objects 2371 warn "reattach attachments to objects/players";
2105 warn "reattach";
2106 _global_reattach; 2372 _global_reattach;
2373 warn "reattach attachments to maps";
2374 reattach $_ for values %MAP;
2107 }; 2375 };
2108 2376
2109 if ($@) { 2377 if ($@) {
2110 warn $@; 2378 warn $@;
2111 warn "error while reloading, exiting."; 2379 warn "error while reloading, exiting.";
2112 exit 1; 2380 exit 1;
2113 } 2381 }
2114 2382
2115 warn "reloaded successfully"; 2383 warn "reloaded";
2116}; 2384};
2117 2385
2118############################################################################# 2386#############################################################################
2119 2387
2120unless ($LINK_MAP) { 2388unless ($LINK_MAP) {
2127 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2395 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2128 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2396 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2129 2397
2130 # dirty hack because... archetypes are not yet loaded 2398 # dirty hack because... archetypes are not yet loaded
2131 Event->timer ( 2399 Event->timer (
2132 after => 2, 2400 after => 10,
2133 cb => sub { 2401 cb => sub {
2134 $_[0]->w->cancel; 2402 $_[0]->w->cancel;
2135 2403
2136 # provide some exits "home" 2404 # provide some exits "home"
2137 my $exit = cf::object::new "exit"; 2405 my $exit = cf::object::new "exit";
2156 $LINK_MAP->{deny_reset} = 1; 2424 $LINK_MAP->{deny_reset} = 1;
2157 2425
2158 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2426 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2159} 2427}
2160 2428
2161register "<global>", __PACKAGE__;
2162
2163register_command "reload" => sub { 2429register_command "reload" => sub {
2164 my ($who, $arg) = @_; 2430 my ($who, $arg) = @_;
2165 2431
2166 if ($who->flag (FLAG_WIZ)) { 2432 if ($who->flag (FLAG_WIZ)) {
2167 $who->message ("start of reload."); 2433 $who->message ("start of reload.");
2176 reentrant => 0, 2442 reentrant => 0,
2177 prio => 0, 2443 prio => 0,
2178 at => $NEXT_TICK || $TICK, 2444 at => $NEXT_TICK || $TICK,
2179 data => WF_AUTOCANCEL, 2445 data => WF_AUTOCANCEL,
2180 cb => sub { 2446 cb => sub {
2181 unless ($FREEZE) {
2182 cf::server_tick; # one server iteration 2447 cf::server_tick; # one server iteration
2183 $RUNTIME += $TICK; 2448 $RUNTIME += $TICK;
2184 }
2185
2186 $NEXT_TICK += $TICK; 2449 $NEXT_TICK += $TICK;
2450
2451 $WAIT_FOR_TICK->broadcast;
2452 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2187 2453
2188 # if we are delayed by four ticks or more, skip them all 2454 # if we are delayed by four ticks or more, skip them all
2189 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2455 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2190 2456
2191 $TICK_WATCHER->at ($NEXT_TICK); 2457 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines