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.130 by root, Thu Jan 4 00:08:08 2007 UTC vs.
Revision 1.159 by root, Wed Jan 10 22:50:12 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
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}
249 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
250=item cf::async { BLOCK } 265=item cf::async { BLOCK }
251 266
252Like 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
253error 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.
254 270
255=cut 271=cut
256 272
257sub async(&) { 273BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 274
266=item cf::sync_job { BLOCK } 275=item cf::sync_job { BLOCK }
267 276
268The design of crossfire+ requires that the main coro ($Coro::main) is 277The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 278always able to handle events or runnable, as crossfire+ is only partly
283 # this is the main coro, too bad, we have to block 292 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 293 # till the operation succeeds, freezing the server :/
285 294
286 # TODO: use suspend/resume instead 295 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 296 # (but this is cancel-safe)
288 local $FREEZE = 1; 297 my $freeze_guard = freeze_mainloop;
289 298
290 my $busy = 1; 299 my $busy = 1;
291 my @res; 300 my @res;
292 301
293 (Coro::async { 302 (async {
294 @res = eval { $job->() }; 303 @res = eval { $job->() };
295 warn $@ if $@; 304 warn $@ if $@;
296 undef $busy; 305 undef $busy;
297 })->prio (Coro::PRIO_MAX); 306 })->prio (Coro::PRIO_MAX);
298 307
299 while ($busy) { 308 while ($busy) {
300 Coro::cede_notself; 309 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 310 }
303 311
304 wantarray ? @res : $res[0] 312 wantarray ? @res : $res[0]
305 } else { 313 } else {
306 # we are in another coroutine, how wonderful, everything just works 314 # we are in another coroutine, how wonderful, everything just works
307 315
308 $job->() 316 $job->()
309 } 317 }
310} 318}
311 319
312=item $coro = cf::coro { BLOCK } 320=item $coro = cf::async_ext { BLOCK }
313 321
314Creates and returns a new coro. This coro is automcatially being canceled 322Like async, but this coro is automatically being canceled when the
315when the extension calling this is being unloaded. 323extension calling this is being unloaded.
316 324
317=cut 325=cut
318 326
319sub coro(&) { 327sub async_ext(&) {
320 my $cb = shift; 328 my $cb = shift;
321 329
322 my $coro = &cf::async ($cb); 330 my $coro = &Coro::async ($cb);
323 331
324 $coro->on_destroy (sub { 332 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 333 delete $EXT_CORO{$coro+0};
326 }); 334 });
327 $EXT_CORO{$coro+0} = $coro; 335 $EXT_CORO{$coro+0} = $coro;
356=cut 364=cut
357 365
358############################################################################# 366#############################################################################
359 367
360package 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
361 375
362sub new { 376sub new {
363 my ($class, $path, $base) = @_; 377 my ($class, $path, $base) = @_;
364 378
365 $path = $path->as_string if ref $path; 379 $path = $path->as_string if ref $path;
371 # ?random/... random maps 385 # ?random/... random maps
372 # /! non-realised random map exit 386 # /! non-realised random map exit
373 # /... normal maps 387 # /... normal maps
374 # ~/... per-player maps without a specific player (DO NOT USE) 388 # ~/... per-player maps without a specific player (DO NOT USE)
375 # ~user/... per-player map of a specific user 389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
376 392
377 if ($path =~ /^{/) { 393 if ($path =~ /^{/) {
378 # fine as it is 394 # fine as it is
379 } elsif ($path =~ s{^\?random/}{}) { 395 } elsif ($path =~ s{^\?random/}{}) {
380 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
429# } 445# }
430} 446}
431 447
432# escape the /'s in the path 448# escape the /'s in the path
433sub _escaped_path { 449sub _escaped_path {
434 # ∕ is U+2215
435 (my $path = $_[0]{path}) =~ s/\///g; 450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
436 $path 451 $path
437} 452}
438 453
439# the original (read-only) location 454# the original (read-only) location
440sub load_path { 455sub load_path {
928=cut 943=cut
929 944
930sub register_extcmd { 945sub register_extcmd {
931 my ($name, $cb) = @_; 946 my ($name, $cb) = @_;
932 947
933 my $caller = caller;
934 #warn "registering extcmd '$name' to '$caller'";
935
936 $EXTCMD{$name} = [$cb, $caller]; 948 $EXTCMD{$name} = $cb;
937} 949}
938 950
939cf::player->attach ( 951cf::player->attach (
940 on_command => sub { 952 on_command => sub {
941 my ($pl, $name, $params) = @_; 953 my ($pl, $name, $params) = @_;
954 966
955 my $msg = eval { from_json $buf }; 967 my $msg = eval { from_json $buf };
956 968
957 if (ref $msg) { 969 if (ref $msg) {
958 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 970 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
959 if (my %reply = $cb->[0]->($pl, $msg)) { 971 if (my %reply = $cb->($pl, $msg)) {
960 $pl->ext_reply ($msg->{msgid}, %reply); 972 $pl->ext_reply ($msg->{msgid}, %reply);
961 } 973 }
962 } 974 }
963 } else { 975 } else {
964 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
966 978
967 cf::override; 979 cf::override;
968 }, 980 },
969); 981);
970 982
971sub register {
972 my ($base, $pkg) = @_;
973
974 #TODO
975}
976
977sub load_extension { 983sub load_extension {
978 my ($path) = @_; 984 my ($path) = @_;
979 985
980 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 986 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
981 my $base = $1; 987 my $base = $1;
996 1002
997 eval $source 1003 eval $source
998 or die $@ ? "$path: $@\n" 1004 or die $@ ? "$path: $@\n"
999 : "extension disabled.\n"; 1005 : "extension disabled.\n";
1000 1006
1001 push @exts, $pkg; 1007 push @EXTS, $pkg;
1002 $ext_pkg{$base} = $pkg;
1003
1004# no strict 'refs';
1005# @{"$pkg\::ISA"} = ext::;
1006
1007 register $base, $pkg;
1008}
1009
1010sub unload_extension {
1011 my ($pkg) = @_;
1012
1013 warn "removing extension $pkg\n";
1014
1015 # remove hooks
1016 #TODO
1017# for my $idx (0 .. $#PLUGIN_EVENT) {
1018# delete $hook[$idx]{$pkg};
1019# }
1020
1021 # remove commands
1022 for my $name (keys %COMMAND) {
1023 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1024
1025 if (@cb) {
1026 $COMMAND{$name} = \@cb;
1027 } else {
1028 delete $COMMAND{$name};
1029 }
1030 }
1031
1032 # remove extcmds
1033 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1034 delete $EXTCMD{$name};
1035 }
1036
1037 if (my $cb = $pkg->can ("unload")) {
1038 eval {
1039 $cb->($pkg);
1040 1
1041 } or warn "$pkg unloaded, but with errors: $@";
1042 }
1043
1044 Symbol::delete_package $pkg;
1045} 1008}
1046 1009
1047sub load_extensions { 1010sub load_extensions {
1048 for my $ext (<$LIBDIR/*.ext>) { 1011 for my $ext (<$LIBDIR/*.ext>) {
1049 next unless -r $ext; 1012 next unless -r $ext;
1067}; 1030};
1068 1031
1069cf::map->attach (prio => -10000, package => cf::mapsupport::); 1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1070 1033
1071############################################################################# 1034#############################################################################
1072# load/save perl data associated with player->ob objects
1073
1074sub all_objects(@) {
1075 @_, map all_objects ($_->inv), @_
1076}
1077
1078# TODO: compatibility cruft, remove when no longer needed
1079cf::player->attach (
1080 on_load => sub {
1081 my ($pl, $path) = @_;
1082
1083 for my $o (all_objects $pl->ob) {
1084 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1085 $o->set_ob_key_value ("_perl_data");
1086
1087 %$o = %{ Storable::thaw pack "H*", $value };
1088 }
1089 }
1090 },
1091);
1092
1093#############################################################################
1094 1035
1095=head2 CORE EXTENSIONS 1036=head2 CORE EXTENSIONS
1096 1037
1097Functions and methods that extend core crossfire objects. 1038Functions and methods that extend core crossfire objects.
1098 1039
1040=cut
1041
1042package cf::player;
1043
1044use Coro::AIO;
1045
1099=head3 cf::player 1046=head3 cf::player
1100 1047
1101=over 4 1048=over 4
1102 1049
1103=item cf::player::exists $login 1050=item cf::player::find $login
1104 1051
1105Returns true when the given account exists. 1052Returns the given player object, loading it if necessary (might block).
1106 1053
1107=cut 1054=cut
1108 1055
1109sub cf::player::exists($) { 1056sub playerdir($) {
1110 cf::player::find $_[0] 1057 cf::localdir
1111 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
1112} 1202}
1113 1203
1114=item $player->ext_reply ($msgid, $msgtype, %msg) 1204=item $player->ext_reply ($msgid, $msgtype, %msg)
1115 1205
1116Sends an ext reply to the player. 1206Sends an ext reply to the player.
1117 1207
1118=cut 1208=cut
1119 1209
1120sub cf::player::ext_reply($$$%) { 1210sub ext_reply($$$%) {
1121 my ($self, $id, %msg) = @_; 1211 my ($self, $id, %msg) = @_;
1122 1212
1123 $msg{msgid} = $id; 1213 $msg{msgid} = $id;
1124 1214
1125 $self->send ("ext " . to_json \%msg); 1215 $self->send ("ext " . cf::to_json \%msg);
1126} 1216}
1217
1218package cf;
1127 1219
1128=back 1220=back
1129 1221
1130 1222
1131=head3 cf::map 1223=head3 cf::map
1137package cf::map; 1229package cf::map;
1138 1230
1139use Fcntl; 1231use Fcntl;
1140use Coro::AIO; 1232use Coro::AIO;
1141 1233
1142our $MAX_RESET = 7200; 1234our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1235our $DEFAULT_RESET = 3000;
1144 1236
1145sub generate_random_map { 1237sub generate_random_map {
1146 my ($path, $rmp) = @_; 1238 my ($path, $rmp) = @_;
1147 1239
1148 # mit "rum" bekleckern, nicht 1240 # mit "rum" bekleckern, nicht
1178 or return; 1270 or return;
1179 1271
1180 my $map = cf::map::new 1272 my $map = cf::map::new
1181 or return; 1273 or return;
1182 1274
1275 # for better error messages only, will be overwritten
1276 $map->path ($path);
1277
1183 $map->load_header ($path) 1278 $map->load_header ($path)
1184 or return; 1279 or return;
1185 1280
1186 $map->{load_path} = $path; 1281 $map->{load_path} = $path;
1187 1282
1188 $map 1283 $map
1189} 1284}
1190 1285
1191sub find_map; 1286sub find;
1192sub find_map { 1287sub find {
1193 my ($path, $origin) = @_; 1288 my ($path, $origin) = @_;
1194 1289
1195 #warn "find_map<$path,$origin>\n";#d# 1290 #warn "find<$path,$origin>\n";#d#
1196 1291
1197 $path = new cf::path $path, $origin && $origin->path; 1292 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1293 my $key = $path->as_string;
1199 1294
1200 cf::lock_wait "map_find:$key"; 1295 cf::lock_wait "map_find:$key";
1203 my $guard = cf::lock_acquire "map_find:$key"; 1298 my $guard = cf::lock_acquire "map_find:$key";
1204 1299
1205 # do it the slow way 1300 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1301 my $map = try_load_header $path->save_path;
1207 1302
1303 Coro::cede;
1304
1208 if ($map) { 1305 if ($map) {
1306 $map->last_access ((delete $map->{last_access})
1307 || $cf::RUNTIME); #d#
1209 # safety 1308 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1309 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1310 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1311 } else {
1213 if (my $rmp = $path->random_map_params) { 1312 if (my $rmp = $path->random_map_params) {
1218 1317
1219 $map or return; 1318 $map or return;
1220 1319
1221 $map->{load_original} = 1; 1320 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1321 $map->{instantiate_time} = $cf::RUNTIME;
1322 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1323 $map->instantiate;
1224 1324
1225 # per-player maps become, after loading, normal maps 1325 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1326 $map->per_player (0) if $path->{user_rel};
1227 } 1327 }
1228 1328
1229 $map->path ($key); 1329 $map->path ($key);
1230 $map->{path} = $path; 1330 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1331 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1332
1333 Coro::cede;
1233 1334
1234 if ($map->should_reset) { 1335 if ($map->should_reset) {
1235 $map->reset; 1336 $map->reset;
1236 undef $guard; 1337 undef $guard;
1237 $map = find_map $path 1338 $map = find $path
1238 or return; 1339 or return;
1239 } 1340 }
1240 1341
1241 $cf::MAP{$key} = $map 1342 $cf::MAP{$key} = $map
1242 } 1343 }
1264 if (aio_open $uniq, O_RDONLY, 0) { 1365 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1366 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1367 $self->load_objects ($uniq, 0);
1267 } 1368 }
1268 } 1369 }
1370
1371 Coro::cede;
1269 1372
1270 # now do the right thing for maps 1373 # now do the right thing for maps
1271 $self->link_multipart_objects; 1374 $self->link_multipart_objects;
1272 1375
1273 if ($self->{path}->is_style_map) { 1376 if ($self->{path}->is_style_map) {
1281 $self->difficulty ($self->estimate_difficulty) 1384 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1385 unless $self->difficulty;
1283 $self->activate; 1386 $self->activate;
1284 } 1387 }
1285 1388
1389 Coro::cede;
1390
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1391 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1392}
1288 1393
1289sub 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 {
1290 my ($path, $origin) = @_; 1419 my ($path, $origin) = @_;
1291 1420
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1421 cf::sync_job { find $path, $origin }
1422}
1293 1423
1294 cf::sync_job { 1424sub do_load_sync {
1295 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
1296 or return; 1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1297 $map->load; 1440 $map->load;
1298 $map 1441 }
1442 Coro::schedule;
1299 } 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 ()
1300} 1460}
1301 1461
1302sub save { 1462sub save {
1303 my ($self) = @_; 1463 my ($self) = @_;
1304 1464
1465 my $lock = cf::lock_acquire "map_data:" . $self->path;
1466
1305 $self->{last_save} = $cf::RUNTIME; 1467 $self->{last_save} = $cf::RUNTIME;
1306 1468
1307 return unless $self->dirty; 1469 return unless $self->dirty;
1308 1470
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1471 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1473
1312 $self->{load_path} = $save; 1474 $self->{load_path} = $save;
1313 1475
1314 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 };
1315 1483
1316 if ($uniq) { 1484 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1486 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1487 } else {
1325 my ($self) = @_; 1493 my ($self) = @_;
1326 1494
1327 # save first because save cedes 1495 # save first because save cedes
1328 $self->save; 1496 $self->save;
1329 1497
1498 my $lock = cf::lock_acquire "map_data:" . $self->path;
1499
1330 return if $self->players; 1500 return if $self->players;
1331 return if $self->in_memory != cf::MAP_IN_MEMORY; 1501 return if $self->in_memory != cf::MAP_IN_MEMORY;
1332 return if $self->{deny_save}; 1502 return if $self->{deny_save};
1333 1503
1334 $self->clear; 1504 $self->clear;
1376} 1546}
1377 1547
1378sub reset { 1548sub reset {
1379 my ($self) = @_; 1549 my ($self) = @_;
1380 1550
1551 my $lock = cf::lock_acquire "map_data:" . $self->path;
1552
1381 return if $self->players; 1553 return if $self->players;
1382 return if $self->{path}{user_rel};#d# 1554 return if $self->{path}{user_rel};#d#
1383 1555
1384 warn "resetting map ", $self->path;#d# 1556 warn "resetting map ", $self->path;#d#
1385 1557
1404 1576
1405sub customise_for { 1577sub customise_for {
1406 my ($map, $ob) = @_; 1578 my ($map, $ob) = @_;
1407 1579
1408 if ($map->per_player) { 1580 if ($map->per_player) {
1409 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1581 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1410 } 1582 }
1411 1583
1412 $map 1584 $map
1413} 1585}
1414 1586
1415sub emergency_save { 1587=item cf::map::unique_maps
1416 local $cf::FREEZE = 1;
1417 1588
1418 warn "enter emergency map save\n"; 1589Returns an arrayref of cf::path's of all shared maps that have
1590instantiated unique items. May block.
1419 1591
1420 cf::sync_job { 1592=cut
1421 warn "begin emergency map save\n"; 1593
1422 $_->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 $_;
1423 }; 1606 }
1424 1607
1425 warn "end emergency map save\n"; 1608 \@paths
1426} 1609}
1427 1610
1428package cf; 1611package cf;
1429 1612
1430=back 1613=back
1431 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
1432 1641
1433=head3 cf::object::player 1642=head3 cf::object::player
1434 1643
1435=over 4 1644=over 4
1436 1645
1511 my $link_pos = delete $self->{_link_pos}; 1720 my $link_pos = delete $self->{_link_pos};
1512 1721
1513 unless ($map) { 1722 unless ($map) {
1514 # restore original map position 1723 # restore original map position
1515 ($map, $x, $y) = @{ $link_pos || [] }; 1724 ($map, $x, $y) = @{ $link_pos || [] };
1516 $map = cf::map::find_map $map; 1725 $map = cf::map::find $map;
1517 1726
1518 unless ($map) { 1727 unless ($map) {
1519 ($map, $x, $y) = @$EMERGENCY_POSITION; 1728 ($map, $x, $y) = @$EMERGENCY_POSITION;
1520 $map = cf::map::find_map $map 1729 $map = cf::map::find $map
1521 or die "FATAL: cannot load emergency map\n"; 1730 or die "FATAL: cannot load emergency map\n";
1522 } 1731 }
1523 } 1732 }
1524 1733
1525 ($x, $y) = (-1, -1) 1734 ($x, $y) = (-1, -1)
1528 # use -1 or undef as default coordinates, not 0, 0 1737 # use -1 or undef as default coordinates, not 0, 0
1529 ($x, $y) = ($map->enter_x, $map->enter_y) 1738 ($x, $y) = ($map->enter_x, $map->enter_y)
1530 if $x <=0 && $y <= 0; 1739 if $x <=0 && $y <= 0;
1531 1740
1532 $map->load; 1741 $map->load;
1742 $map->load_diag;
1533 1743
1744 return unless $self->contr->active;
1534 $self->activate_recursive; 1745 $self->activate_recursive;
1535 $self->enter_map ($map, $x, $y); 1746 $self->enter_map ($map, $x, $y);
1536} 1747}
1537 1748
1538cf::player->attach ( 1749cf::player->attach (
1551 1762
1552 # try to abort aborted map switching on player login :) 1763 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes 1764 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) { 1765 if ($pl->ob->{_link_pos}) {
1555 $pl->ob->enter_link; 1766 $pl->ob->enter_link;
1556 cf::async { 1767 (async {
1557 # 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
1558 # 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);
1559 Coro::Timer::sleep 1; 1774 Coro::Timer::sleep 1;
1560 $pl->ob->leave_link; 1775 $pl->ob->leave_link;
1561 }; 1776 })->prio (2);
1562 } 1777 }
1563 }, 1778 },
1564); 1779);
1565 1780
1566=item $player_object->goto_map ($path, $x, $y) 1781=item $player_object->goto ($path, $x, $y)
1567 1782
1568=cut 1783=cut
1569 1784
1570sub cf::object::player::goto_map { 1785sub cf::object::player::goto {
1571 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1572 1787
1788 $path = new cf::path $path;
1789
1573 $self->enter_link; 1790 $self->enter_link;
1574 1791
1575 (cf::async { 1792 (async {
1576 $path = new cf::path $path;
1577
1578 my $map = cf::map::find_map $path->as_string; 1793 my $map = cf::map::find $path->as_string;
1579 $map = $map->customise_for ($self) if $map; 1794 $map = $map->customise_for ($self) if $map;
1580 1795
1581# warn "entering ", $map->path, " at ($x, $y)\n" 1796# warn "entering ", $map->path, " at ($x, $y)\n"
1582# if $map; 1797# if $map;
1583 1798
1584 $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);
1585 1800
1586 $self->leave_link ($map, $x, $y); 1801 $self->leave_link ($map, $x, $y);
1587 })->prio (1); 1802 })->prio (1);
1588} 1803}
1589 1804
1642 1857
1643 return unless $self->type == cf::PLAYER; 1858 return unless $self->type == cf::PLAYER;
1644 1859
1645 $self->enter_link; 1860 $self->enter_link;
1646 1861
1647 (cf::async { 1862 (async {
1863 $self->deactivate_recursive; # just to be sure
1648 unless (eval { 1864 unless (eval {
1649 prepare_random_map $exit 1865 prepare_random_map $exit
1650 if $exit->slaying eq "/!"; 1866 if $exit->slaying eq "/!";
1651 1867
1652 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;
1653 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1654 1870
1655 1; 1871 1;
1656 }) { 1872 }) {
1657 $self->message ("Something went wrong deep within the crossfire server. " 1873 $self->message ("Something went wrong deep within the crossfire server. "
1658 . "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. "
1659 . "Please report this to the dungeon master", 1875 . "Please report this to the dungeon master!",
1660 cf::NDI_UNIQUE | cf::NDI_RED); 1876 cf::NDI_UNIQUE | cf::NDI_RED);
1661 1877
1662 warn "ERROR in enter_exit: $@"; 1878 warn "ERROR in enter_exit: $@";
1663 $self->leave_link; 1879 $self->leave_link;
1664 } 1880 }
1732 } 1948 }
1733 } 1949 }
1734 }, 1950 },
1735); 1951);
1736 1952
1737=item $client->coro (\&cb) 1953=item $client->async (\&cb)
1738 1954
1739Create a new coroutine, running the specified callback. The coroutine will 1955Create a new coroutine, running the specified callback. The coroutine will
1740be automatically cancelled when the client gets destroyed (e.g. on logout, 1956be automatically cancelled when the client gets destroyed (e.g. on logout,
1741or loss of connection). 1957or loss of connection).
1742 1958
1743=cut 1959=cut
1744 1960
1745sub cf::client::coro { 1961sub cf::client::async {
1746 my ($self, $cb) = @_; 1962 my ($self, $cb) = @_;
1747 1963
1748 my $coro = &cf::async ($cb); 1964 my $coro = &Coro::async ($cb);
1749 1965
1750 $coro->on_destroy (sub { 1966 $coro->on_destroy (sub {
1751 delete $self->{_coro}{$coro+0}; 1967 delete $self->{_coro}{$coro+0};
1752 }); 1968 });
1753 1969
1988 open my $fh, "<:utf8", cf::confdir . "/config" 2204 open my $fh, "<:utf8", cf::confdir . "/config"
1989 or return; 2205 or return;
1990 2206
1991 local $/; 2207 local $/;
1992 *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 }
1993} 2222}
1994 2223
1995sub main { 2224sub main {
1996 # we must not ever block the main coroutine 2225 # we must not ever block the main coroutine
1997 local $Coro::idle = sub { 2226 local $Coro::idle = sub {
1998 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#
1999 (Coro::unblock_sub {
2000 Event::one_event; 2228 async { Event::one_event };
2001 })->();
2002 }; 2229 };
2003 2230
2004 cfg_load; 2231 cfg_load;
2005 db_load; 2232 db_load;
2006 load_extensions; 2233 load_extensions;
2007 Event::loop; 2234 Event::loop;
2008} 2235}
2009 2236
2010############################################################################# 2237#############################################################################
2011# 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}
2012 2281
2013sub reload() { 2282sub reload() {
2014 # can/must only be called in main 2283 # can/must only be called in main
2015 if ($Coro::current != $Coro::main) { 2284 if ($Coro::current != $Coro::main) {
2016 warn "can only reload from main coroutine\n"; 2285 warn "can only reload from main coroutine\n";
2017 return; 2286 return;
2018 } 2287 }
2019 2288
2020 warn "reloading..."; 2289 warn "reloading...";
2021 2290
2022 local $FREEZE = 1; 2291 warn "freezing server";
2292 my $guard = freeze_mainloop;
2023 cf::emergency_save; 2293 cf::emergency_save;
2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2024 2298
2025 eval { 2299 eval {
2026 # 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
2027 2301
2028 # cancel all watchers 2302 warn "cancel all watchers";
2029 for (Event::all_watchers) { 2303 for (Event::all_watchers) {
2030 $_->cancel if $_->data & WF_AUTOCANCEL; 2304 $_->cancel if $_->data & WF_AUTOCANCEL;
2031 } 2305 }
2032 2306
2033 # cancel all extension coros 2307 warn "cancel all extension coros";
2034 $_->cancel for values %EXT_CORO; 2308 $_->cancel for values %EXT_CORO;
2035 %EXT_CORO = (); 2309 %EXT_CORO = ();
2036 2310
2311 warn "remove commands";
2312 %COMMAND = ();
2313
2314 warn "remove ext commands";
2315 %EXTCMD = ();
2316
2037 # unload all extensions 2317 warn "unload/nuke all extensions";
2038 for (@exts) { 2318 for my $pkg (@EXTS) {
2039 warn "unloading <$_>"; 2319 warn "unloading <$pkg>";
2040 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: $@";
2041 } 2326 }
2042 2327
2328 Symbol::delete_package $pkg;
2329 }
2330
2043 # unload all modules loaded from $LIBDIR 2331 warn "unload all perl modules loaded from $LIBDIR";
2044 while (my ($k, $v) = each %INC) { 2332 while (my ($k, $v) = each %INC) {
2045 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2046 2334
2047 warn "removing <$k>"; 2335 warn "removing <$k>";
2048 delete $INC{$k}; 2336 delete $INC{$k};
2055 } 2343 }
2056 2344
2057 Symbol::delete_package $k; 2345 Symbol::delete_package $k;
2058 } 2346 }
2059 2347
2060 # sync database to disk
2061 cf::db_sync;
2062 IO::AIO::flush;
2063
2064 # get rid of safe::, as good as possible 2348 warn "get rid of safe::, as good as possible";
2065 Symbol::delete_package "safe::$_" 2349 Symbol::delete_package "safe::$_"
2066 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);
2067 2351
2068 # remove register_script_function callbacks
2069 # TODO
2070
2071 # unload cf.pm "a bit" 2352 warn "unload cf.pm \"a bit\"";
2072 delete $INC{"cf.pm"}; 2353 delete $INC{"cf.pm"};
2073 2354
2074 # don't, removes xs symbols, too, 2355 # don't, removes xs symbols, too,
2075 # and global variables created in xs 2356 # and global variables created in xs
2076 #Symbol::delete_package __PACKAGE__; 2357 #Symbol::delete_package __PACKAGE__;
2077 2358
2078 # reload cf.pm
2079 warn "reloading cf.pm"; 2359 warn "reloading cf.pm";
2080 require cf; 2360 require cf;
2081 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2082 2362
2083 # load config and database again 2363 warn "load config and database again";
2084 cf::cfg_load; 2364 cf::cfg_load;
2085 cf::db_load; 2365 cf::db_load;
2086 2366
2087 # load extensions
2088 warn "load extensions"; 2367 warn "load extensions";
2089 cf::load_extensions; 2368 cf::load_extensions;
2090 2369
2091 # reattach attachments to objects 2370 warn "reattach attachments to objects/players";
2092 warn "reattach";
2093 _global_reattach; 2371 _global_reattach;
2372 warn "reattach attachments to maps";
2373 reattach $_ for values %MAP;
2094 }; 2374 };
2095 2375
2096 if ($@) { 2376 if ($@) {
2097 warn $@; 2377 warn $@;
2098 warn "error while reloading, exiting."; 2378 warn "error while reloading, exiting.";
2099 exit 1; 2379 exit 1;
2100 } 2380 }
2101 2381
2102 warn "reloaded successfully"; 2382 warn "reloaded";
2103}; 2383};
2104 2384
2105############################################################################# 2385#############################################################################
2106 2386
2107unless ($LINK_MAP) { 2387unless ($LINK_MAP) {
2114 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2115 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2116 2396
2117 # dirty hack because... archetypes are not yet loaded 2397 # dirty hack because... archetypes are not yet loaded
2118 Event->timer ( 2398 Event->timer (
2119 after => 2, 2399 after => 10,
2120 cb => sub { 2400 cb => sub {
2121 $_[0]->w->cancel; 2401 $_[0]->w->cancel;
2122 2402
2123 # provide some exits "home" 2403 # provide some exits "home"
2124 my $exit = cf::object::new "exit"; 2404 my $exit = cf::object::new "exit";
2143 $LINK_MAP->{deny_reset} = 1; 2423 $LINK_MAP->{deny_reset} = 1;
2144 2424
2145 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2146} 2426}
2147 2427
2148register "<global>", __PACKAGE__;
2149
2150register_command "reload" => sub { 2428register_command "reload" => sub {
2151 my ($who, $arg) = @_; 2429 my ($who, $arg) = @_;
2152 2430
2153 if ($who->flag (FLAG_WIZ)) { 2431 if ($who->flag (FLAG_WIZ)) {
2154 $who->message ("start of reload."); 2432 $who->message ("start of reload.");
2163 reentrant => 0, 2441 reentrant => 0,
2164 prio => 0, 2442 prio => 0,
2165 at => $NEXT_TICK || $TICK, 2443 at => $NEXT_TICK || $TICK,
2166 data => WF_AUTOCANCEL, 2444 data => WF_AUTOCANCEL,
2167 cb => sub { 2445 cb => sub {
2168 unless ($FREEZE) {
2169 cf::server_tick; # one server iteration 2446 cf::server_tick; # one server iteration
2170 $RUNTIME += $TICK; 2447 $RUNTIME += $TICK;
2171 }
2172
2173 $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;
2174 2452
2175 # 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
2176 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2454 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2177 2455
2178 $TICK_WATCHER->at ($NEXT_TICK); 2456 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines