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.131 by root, Thu Jan 4 00:53:54 2007 UTC vs.
Revision 1.158 by root, Wed Jan 10 19:52:43 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 = ();
37our %EXTCMD = (); 38our %EXTCMD = ();
38 39
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
57 61
58binmode STDOUT; 62binmode STDOUT;
59binmode STDERR; 63binmode STDERR;
60 64
61# read virtual server time, if available 65# read virtual server time, if available
106=item %cf::CFG 110=item %cf::CFG
107 111
108Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 113from wherever your confdir points to.
110 114
115=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
116
117These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
118or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
119processing has been done. Call C<< ->wait >> on them to maximise the
120window of cpu time available, or simply to synchronise to the server tick.
121
111=back 122=back
112 123
113=cut 124=cut
114 125
115BEGIN { 126BEGIN {
118 utf8::encode $msg; 129 utf8::encode $msg;
119 130
120 $msg .= "\n" 131 $msg .= "\n"
121 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
122 133
123 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
124 }; 135 };
125} 136}
126 137
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
154 165
155=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
156 167
157=over 4 168=over 4
158 169
170=item dumpval $ref
171
159=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
160 192
161use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
162 194
163=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
164 196
180sub to_json($) { 212sub to_json($) {
181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
183} 215}
184 216
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 217=item cf::lock_wait $string
208 218
209Wait until the given lock is available. See cf::lock_acquire. 219Wait until the given lock is available. See cf::lock_acquire.
210 220
211=item my $lock = cf::lock_acquire $string 221=item my $lock = cf::lock_acquire $string
212 222
213Wait until the given lock is available and then acquires it and returns 223Wait 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, 224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
215for example when the coroutine gets canceled), the lock is automatically 225for example when the coroutine gets canceled), the lock is automatically
216returned. 226returned.
217 227
218Lock names should begin with a unique identifier (for example, find_map 228Lock names should begin with a unique identifier (for example, cf::map::find
219uses map_find and load_map uses map_load). 229uses map_find and cf::map::load uses map_load).
220 230
221=cut 231=cut
222 232
223our %LOCK; 233our %LOCK;
224 234
238 # wait, to be sure we are not locked 248 # wait, to be sure we are not locked
239 lock_wait $key; 249 lock_wait $key;
240 250
241 $LOCK{$key} = []; 251 $LOCK{$key} = [];
242 252
243 cf::guard { 253 Coro::guard {
244 # wake up all waiters, to be on the safe side 254 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} }; 255 $_->ready for @{ delete $LOCK{$key} };
246 } 256 }
247} 257}
248 258
259sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active;
261
262 my $guard = Coro::guard { $TICK_WATCHER->start };
263 $TICK_WATCHER->stop;
264 $guard
265}
266
249=item cf::async { BLOCK } 267=item cf::async { BLOCK }
250 268
251Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 269Currently the same as Coro::async_pool, meaning you cannot use
252error instead of exiting the server in case of a problem. 270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
253 272
254=cut 273=cut
255 274
256sub async(&) { 275BEGIN { *async = \&Coro::async_pool }
257 my ($cb) = @_;
258
259 Coro::async {
260 eval { $cb->() };
261 warn $@ if $@;
262 }
263}
264 276
265=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
266 278
267The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
268always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
282 # this is the main coro, too bad, we have to block 294 # this is the main coro, too bad, we have to block
283 # till the operation succeeds, freezing the server :/ 295 # till the operation succeeds, freezing the server :/
284 296
285 # TODO: use suspend/resume instead 297 # TODO: use suspend/resume instead
286 # (but this is cancel-safe) 298 # (but this is cancel-safe)
287 local $FREEZE = 1; 299 my $freeze_guard = freeze_mainloop;
288 300
289 my $busy = 1; 301 my $busy = 1;
290 my @res; 302 my @res;
291 303
292 (Coro::async { 304 (async {
293 @res = eval { $job->() }; 305 @res = eval { $job->() };
294 warn $@ if $@; 306 warn $@ if $@;
295 undef $busy; 307 undef $busy;
296 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
297 309
298 while ($busy) { 310 while ($busy) {
299 Coro::cede_notself; 311 Coro::cede or Event::one_event;
300 Event::one_event unless Coro::nready;
301 } 312 }
302 313
303 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
304 } else { 315 } else {
305 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
306 317
307 $job->() 318 $job->()
308 } 319 }
309} 320}
310 321
311=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
312 323
313Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
314when the extension calling this is being unloaded. 325extension calling this is being unloaded.
315 326
316=cut 327=cut
317 328
318sub coro(&) { 329sub async_ext(&) {
319 my $cb = shift; 330 my $cb = shift;
320 331
321 my $coro = &cf::async ($cb); 332 my $coro = &Coro::async ($cb);
322 333
323 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
324 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
325 }); 336 });
326 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
355=cut 366=cut
356 367
357############################################################################# 368#############################################################################
358 369
359package cf::path; 370package cf::path;
371
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
360 377
361sub new { 378sub new {
362 my ($class, $path, $base) = @_; 379 my ($class, $path, $base) = @_;
363 380
364 $path = $path->as_string if ref $path; 381 $path = $path->as_string if ref $path;
370 # ?random/... random maps 387 # ?random/... random maps
371 # /! non-realised random map exit 388 # /! non-realised random map exit
372 # /... normal maps 389 # /... normal maps
373 # ~/... per-player maps without a specific player (DO NOT USE) 390 # ~/... per-player maps without a specific player (DO NOT USE)
374 # ~user/... per-player map of a specific user 391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
375 394
376 if ($path =~ /^{/) { 395 if ($path =~ /^{/) {
377 # fine as it is 396 # fine as it is
378 } elsif ($path =~ s{^\?random/}{}) { 397 } elsif ($path =~ s{^\?random/}{}) {
379 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
428# } 447# }
429} 448}
430 449
431# escape the /'s in the path 450# escape the /'s in the path
432sub _escaped_path { 451sub _escaped_path {
433 # ∕ is U+2215
434 (my $path = $_[0]{path}) =~ s/\///g; 452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
435 $path 453 $path
436} 454}
437 455
438# the original (read-only) location 456# the original (read-only) location
439sub load_path { 457sub load_path {
1066}; 1084};
1067 1085
1068cf::map->attach (prio => -10000, package => cf::mapsupport::); 1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1069 1087
1070############################################################################# 1088#############################################################################
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 1089
1094=head2 CORE EXTENSIONS 1090=head2 CORE EXTENSIONS
1095 1091
1096Functions and methods that extend core crossfire objects. 1092Functions and methods that extend core crossfire objects.
1097 1093
1094=cut
1095
1096package cf::player;
1097
1098use Coro::AIO;
1099
1098=head3 cf::player 1100=head3 cf::player
1099 1101
1100=over 4 1102=over 4
1101 1103
1102=item cf::player::exists $login 1104=item cf::player::find $login
1103 1105
1104Returns true when the given account exists. 1106Returns the given player object, loading it if necessary (might block).
1105 1107
1106=cut 1108=cut
1107 1109
1108sub cf::player::exists($) { 1110sub playerdir($) {
1109 cf::player::find $_[0] 1111 cf::localdir
1110 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1112 . "/"
1113 . cf::playerdir
1114 . "/"
1115 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1116}
1117
1118sub path($) {
1119 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1120
1121 (playerdir $login) . "/$login.pl"
1122}
1123
1124sub find_active($) {
1125 $cf::PLAYER{$_[0]}
1126 and $cf::PLAYER{$_[0]}->active
1127 and $cf::PLAYER{$_[0]}
1128}
1129
1130sub exists($) {
1131 my ($login) = @_;
1132
1133 $cf::PLAYER{$login}
1134 or cf::sync_job { !aio_stat $login }
1135}
1136
1137sub find($) {
1138 return $cf::PLAYER{$_[0]} || do {
1139 my $login = $_[0];
1140
1141 my $guard = cf::lock_acquire "user_find:$login";
1142
1143 $cf::PLAYER{$_[0]} || do {
1144 my $pl = load_pl path $login
1145 or return;
1146 $cf::PLAYER{$login} = $pl
1147 }
1148 }
1149}
1150
1151sub save($) {
1152 my ($pl) = @_;
1153
1154 return if $pl->{deny_save};
1155
1156 my $path = path $pl;
1157 my $guard = cf::lock_acquire "user_save:$path";
1158
1159 return if $pl->{deny_save};
1160
1161 aio_mkdir playerdir $pl, 0770;
1162 $pl->{last_save} = $cf::RUNTIME;
1163
1164 $pl->save_pl ($path);
1165 Coro::cede;
1166}
1167
1168sub new($) {
1169 my ($login) = @_;
1170
1171 my $self = create;
1172
1173 $self->ob->name ($login);
1174 $self->{deny_save} = 1;
1175
1176 $cf::PLAYER{$login} = $self;
1177
1178 $self
1179}
1180
1181=item $pl->quit_character
1182
1183Nukes the player without looking back. If logged in, the connection will
1184be destroyed. May block for a long time.
1185
1186=cut
1187
1188sub quit_character {
1189 my ($pl) = @_;
1190
1191 $pl->{deny_save} = 1;
1192 $pl->password ("*"); # this should lock out the player until we nuked the dir
1193
1194 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1195 $pl->deactivate;
1196 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1197 $pl->ns->destroy if $pl->ns;
1198
1199 my $path = playerdir $pl;
1200 my $temp = "$path~$cf::RUNTIME~deleting~";
1201 aio_rename $path, $temp;
1202 delete $cf::PLAYER{$pl->ob->name};
1203 $pl->destroy;
1204 IO::AIO::aio_rmtree $temp;
1205}
1206
1207=item cf::player::list_logins
1208
1209Returns am arrayref of all valid playernames in the system, can take a
1210while and may block, so not sync_job-capable, ever.
1211
1212=cut
1213
1214sub list_logins {
1215 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1216 or return [];
1217
1218 my @logins;
1219
1220 for my $login (@$dirs) {
1221 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1222 aio_read $fh, 0, 512, my $buf, 0 or next;
1223 $buf !~ /^password -------------$/m or next; # official not-valid tag
1224
1225 utf8::decode $login;
1226 push @logins, $login;
1227 }
1228
1229 \@logins
1230}
1231
1232=item $player->maps
1233
1234Returns an arrayref of cf::path's of all maps that are private for this
1235player. May block.
1236
1237=cut
1238
1239sub maps($) {
1240 my ($pl) = @_;
1241
1242 my $files = aio_readdir playerdir $pl
1243 or return;
1244
1245 my @paths;
1246
1247 for (@$files) {
1248 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o;
1251
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1253 }
1254
1255 \@paths
1111} 1256}
1112 1257
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1258=item $player->ext_reply ($msgid, $msgtype, %msg)
1114 1259
1115Sends an ext reply to the player. 1260Sends an ext reply to the player.
1116 1261
1117=cut 1262=cut
1118 1263
1119sub cf::player::ext_reply($$$%) { 1264sub ext_reply($$$%) {
1120 my ($self, $id, %msg) = @_; 1265 my ($self, $id, %msg) = @_;
1121 1266
1122 $msg{msgid} = $id; 1267 $msg{msgid} = $id;
1123 1268
1124 $self->send ("ext " . to_json \%msg); 1269 $self->send ("ext " . cf::to_json \%msg);
1125} 1270}
1271
1272package cf;
1126 1273
1127=back 1274=back
1128 1275
1129 1276
1130=head3 cf::map 1277=head3 cf::map
1136package cf::map; 1283package cf::map;
1137 1284
1138use Fcntl; 1285use Fcntl;
1139use Coro::AIO; 1286use Coro::AIO;
1140 1287
1141our $MAX_RESET = 7200; 1288our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1289our $DEFAULT_RESET = 3000;
1143 1290
1144sub generate_random_map { 1291sub generate_random_map {
1145 my ($path, $rmp) = @_; 1292 my ($path, $rmp) = @_;
1146 1293
1147 # mit "rum" bekleckern, nicht 1294 # mit "rum" bekleckern, nicht
1177 or return; 1324 or return;
1178 1325
1179 my $map = cf::map::new 1326 my $map = cf::map::new
1180 or return; 1327 or return;
1181 1328
1329 # for better error messages only, will be overwritten
1330 $map->path ($path);
1331
1182 $map->load_header ($path) 1332 $map->load_header ($path)
1183 or return; 1333 or return;
1184 1334
1185 $map->{load_path} = $path; 1335 $map->{load_path} = $path;
1186 1336
1187 $map 1337 $map
1188} 1338}
1189 1339
1190sub find_map; 1340sub find;
1191sub find_map { 1341sub find {
1192 my ($path, $origin) = @_; 1342 my ($path, $origin) = @_;
1193 1343
1194 #warn "find_map<$path,$origin>\n";#d# 1344 #warn "find<$path,$origin>\n";#d#
1195 1345
1196 $path = new cf::path $path, $origin && $origin->path; 1346 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1347 my $key = $path->as_string;
1198 1348
1199 cf::lock_wait "map_find:$key"; 1349 cf::lock_wait "map_find:$key";
1202 my $guard = cf::lock_acquire "map_find:$key"; 1352 my $guard = cf::lock_acquire "map_find:$key";
1203 1353
1204 # do it the slow way 1354 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1355 my $map = try_load_header $path->save_path;
1206 1356
1357 Coro::cede;
1358
1207 if ($map) { 1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1208 # safety 1362 # safety
1209 $map->{instantiate_time} = $cf::RUNTIME 1363 $map->{instantiate_time} = $cf::RUNTIME
1210 if $map->{instantiate_time} > $cf::RUNTIME; 1364 if $map->{instantiate_time} > $cf::RUNTIME;
1211 } else { 1365 } else {
1212 if (my $rmp = $path->random_map_params) { 1366 if (my $rmp = $path->random_map_params) {
1217 1371
1218 $map or return; 1372 $map or return;
1219 1373
1220 $map->{load_original} = 1; 1374 $map->{load_original} = 1;
1221 $map->{instantiate_time} = $cf::RUNTIME; 1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1222 $map->instantiate; 1377 $map->instantiate;
1223 1378
1224 # per-player maps become, after loading, normal maps 1379 # per-player maps become, after loading, normal maps
1225 $map->per_player (0) if $path->{user_rel}; 1380 $map->per_player (0) if $path->{user_rel};
1226 } 1381 }
1227 1382
1228 $map->path ($key); 1383 $map->path ($key);
1229 $map->{path} = $path; 1384 $map->{path} = $path;
1230 $map->{last_save} = $cf::RUNTIME; 1385 $map->{last_save} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME); 1386
1387 Coro::cede;
1232 1388
1233 if ($map->should_reset) { 1389 if ($map->should_reset) {
1234 $map->reset; 1390 $map->reset;
1235 undef $guard; 1391 undef $guard;
1236 $map = find_map $path 1392 $map = find $path
1237 or return; 1393 or return;
1238 } 1394 }
1239 1395
1240 $cf::MAP{$key} = $map 1396 $cf::MAP{$key} = $map
1241 } 1397 }
1263 if (aio_open $uniq, O_RDONLY, 0) { 1419 if (aio_open $uniq, O_RDONLY, 0) {
1264 $self->clear_unique_items; 1420 $self->clear_unique_items;
1265 $self->load_objects ($uniq, 0); 1421 $self->load_objects ($uniq, 0);
1266 } 1422 }
1267 } 1423 }
1424
1425 Coro::cede;
1268 1426
1269 # now do the right thing for maps 1427 # now do the right thing for maps
1270 $self->link_multipart_objects; 1428 $self->link_multipart_objects;
1271 1429
1272 if ($self->{path}->is_style_map) { 1430 if ($self->{path}->is_style_map) {
1280 $self->difficulty ($self->estimate_difficulty) 1438 $self->difficulty ($self->estimate_difficulty)
1281 unless $self->difficulty; 1439 unless $self->difficulty;
1282 $self->activate; 1440 $self->activate;
1283 } 1441 }
1284 1442
1443 Coro::cede;
1444
1285 $self->in_memory (cf::MAP_IN_MEMORY); 1445 $self->in_memory (cf::MAP_IN_MEMORY);
1286} 1446}
1287 1447
1288sub load_map_sync { 1448# find and load all maps in the 3x3 area around a map
1449sub load_diag {
1450 my ($map) = @_;
1451
1452 my @diag; # diagonal neighbours
1453
1454 for (0 .. 3) {
1455 my $neigh = $map->tile_path ($_)
1456 or next;
1457 $neigh = find $neigh, $map
1458 or next;
1459 $neigh->load;
1460
1461 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1462 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1463 }
1464
1465 for (@diag) {
1466 my $neigh = find @$_
1467 or next;
1468 $neigh->load;
1469 }
1470}
1471
1472sub find_sync {
1289 my ($path, $origin) = @_; 1473 my ($path, $origin) = @_;
1290 1474
1291 #warn "load_map_sync<$path, $origin>\n";#d# 1475 cf::sync_job { find $path, $origin }
1476}
1292 1477
1293 cf::sync_job { 1478sub do_load_sync {
1294 my $map = cf::map::find_map $path, $origin 1479 my ($map) = @_;
1480
1481 cf::sync_job { $map->load };
1482}
1483
1484our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async {
1486 while () {
1487 while (%MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1295 or return; 1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path
1493 or next;
1296 $map->load; 1494 $map->load;
1297 $map 1495 }
1496 Coro::schedule;
1298 } 1497 }
1498};
1499
1500sub find_async {
1501 my ($path, $origin) = @_;
1502
1503 $path = new cf::path $path, $origin && $origin->path;
1504 my $key = $path->as_string;
1505
1506 if (my $map = $cf::MAP{$key}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 }
1509
1510 $MAP_PREFETCH{$key} = $path;
1511 $MAP_PREFETCHER->ready;
1512
1513 ()
1299} 1514}
1300 1515
1301sub save { 1516sub save {
1302 my ($self) = @_; 1517 my ($self) = @_;
1303 1518
1519 my $lock = cf::lock_acquire "map_data:" . $self->path;
1520
1304 $self->{last_save} = $cf::RUNTIME; 1521 $self->{last_save} = $cf::RUNTIME;
1305 1522
1306 return unless $self->dirty; 1523 return unless $self->dirty;
1307 1524
1308 my $save = $self->{path}->save_path; utf8::encode $save; 1525 my $save = $self->{path}->save_path; utf8::encode $save;
1309 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1310 1527
1311 $self->{load_path} = $save; 1528 $self->{load_path} = $save;
1312 1529
1313 return if $self->{deny_save}; 1530 return if $self->{deny_save};
1531
1532 local $self->{last_access} = $self->last_access;#d#
1533
1534 cf::async {
1535 $_->contr->save for $self->players;
1536 };
1314 1537
1315 if ($uniq) { 1538 if ($uniq) {
1316 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1317 $self->save_objects ($uniq, cf::IO_UNIQUES); 1540 $self->save_objects ($uniq, cf::IO_UNIQUES);
1318 } else { 1541 } else {
1324 my ($self) = @_; 1547 my ($self) = @_;
1325 1548
1326 # save first because save cedes 1549 # save first because save cedes
1327 $self->save; 1550 $self->save;
1328 1551
1552 my $lock = cf::lock_acquire "map_data:" . $self->path;
1553
1329 return if $self->players; 1554 return if $self->players;
1330 return if $self->in_memory != cf::MAP_IN_MEMORY; 1555 return if $self->in_memory != cf::MAP_IN_MEMORY;
1331 return if $self->{deny_save}; 1556 return if $self->{deny_save};
1332 1557
1333 $self->clear; 1558 $self->clear;
1375} 1600}
1376 1601
1377sub reset { 1602sub reset {
1378 my ($self) = @_; 1603 my ($self) = @_;
1379 1604
1605 my $lock = cf::lock_acquire "map_data:" . $self->path;
1606
1380 return if $self->players; 1607 return if $self->players;
1381 return if $self->{path}{user_rel};#d# 1608 return if $self->{path}{user_rel};#d#
1382 1609
1383 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1384 1611
1403 1630
1404sub customise_for { 1631sub customise_for {
1405 my ($map, $ob) = @_; 1632 my ($map, $ob) = @_;
1406 1633
1407 if ($map->per_player) { 1634 if ($map->per_player) {
1408 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1409 } 1636 }
1410 1637
1411 $map 1638 $map
1412} 1639}
1413 1640
1414sub emergency_save { 1641=item cf::map::unique_maps
1415 local $cf::FREEZE = 1;
1416 1642
1417 warn "enter emergency map save\n"; 1643Returns an arrayref of cf::path's of all shared maps that have
1644instantiated unique items. May block.
1418 1645
1419 cf::sync_job { 1646=cut
1420 warn "begin emergency map save\n"; 1647
1421 $_->save for values %cf::MAP; 1648sub unique_maps() {
1649 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1650 or return;
1651
1652 my @paths;
1653
1654 for (@$files) {
1655 utf8::decode $_;
1656 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o;
1658
1659 push @paths, new cf::path $_;
1422 }; 1660 }
1423 1661
1424 warn "end emergency map save\n"; 1662 \@paths
1425} 1663}
1426 1664
1427package cf; 1665package cf;
1428 1666
1429=back 1667=back
1430 1668
1669=head3 cf::object
1670
1671=cut
1672
1673package cf::object;
1674
1675=over 4
1676
1677=item $ob->inv_recursive
1678
1679Returns the inventory of the object _and_ their inventories, recursively.
1680
1681=cut
1682
1683sub inv_recursive_;
1684sub inv_recursive_ {
1685 map { $_, inv_recursive_ $_->inv } @_
1686}
1687
1688sub inv_recursive {
1689 inv_recursive_ inv $_[0]
1690}
1691
1692package cf;
1693
1694=back
1431 1695
1432=head3 cf::object::player 1696=head3 cf::object::player
1433 1697
1434=over 4 1698=over 4
1435 1699
1510 my $link_pos = delete $self->{_link_pos}; 1774 my $link_pos = delete $self->{_link_pos};
1511 1775
1512 unless ($map) { 1776 unless ($map) {
1513 # restore original map position 1777 # restore original map position
1514 ($map, $x, $y) = @{ $link_pos || [] }; 1778 ($map, $x, $y) = @{ $link_pos || [] };
1515 $map = cf::map::find_map $map; 1779 $map = cf::map::find $map;
1516 1780
1517 unless ($map) { 1781 unless ($map) {
1518 ($map, $x, $y) = @$EMERGENCY_POSITION; 1782 ($map, $x, $y) = @$EMERGENCY_POSITION;
1519 $map = cf::map::find_map $map 1783 $map = cf::map::find $map
1520 or die "FATAL: cannot load emergency map\n"; 1784 or die "FATAL: cannot load emergency map\n";
1521 } 1785 }
1522 } 1786 }
1523 1787
1524 ($x, $y) = (-1, -1) 1788 ($x, $y) = (-1, -1)
1527 # use -1 or undef as default coordinates, not 0, 0 1791 # use -1 or undef as default coordinates, not 0, 0
1528 ($x, $y) = ($map->enter_x, $map->enter_y) 1792 ($x, $y) = ($map->enter_x, $map->enter_y)
1529 if $x <=0 && $y <= 0; 1793 if $x <=0 && $y <= 0;
1530 1794
1531 $map->load; 1795 $map->load;
1796 $map->load_diag;
1532 1797
1798 return unless $self->contr->active;
1533 $self->activate_recursive; 1799 $self->activate_recursive;
1534 $self->enter_map ($map, $x, $y); 1800 $self->enter_map ($map, $x, $y);
1535} 1801}
1536 1802
1537cf::player->attach ( 1803cf::player->attach (
1550 1816
1551 # try to abort aborted map switching on player login :) 1817 # try to abort aborted map switching on player login :)
1552 # should happen only on crashes 1818 # should happen only on crashes
1553 if ($pl->ob->{_link_pos}) { 1819 if ($pl->ob->{_link_pos}) {
1554 $pl->ob->enter_link; 1820 $pl->ob->enter_link;
1555 cf::async { 1821 (async {
1556 # we need this sleep as the login has a concurrent enter_exit running 1822 # we need this sleep as the login has a concurrent enter_exit running
1557 # and this sleep increases chances of the player not ending up in scorn 1823 # and this sleep increases chances of the player not ending up in scorn
1824 $pl->ob->reply (undef,
1825 "There was an internal problem at your last logout, "
1826 . "the server will try to bring you to your intended destination in a second.",
1827 cf::NDI_RED);
1558 Coro::Timer::sleep 1; 1828 Coro::Timer::sleep 1;
1559 $pl->ob->leave_link; 1829 $pl->ob->leave_link;
1560 }; 1830 })->prio (2);
1561 } 1831 }
1562 }, 1832 },
1563); 1833);
1564 1834
1565=item $player_object->goto_map ($path, $x, $y) 1835=item $player_object->goto ($path, $x, $y)
1566 1836
1567=cut 1837=cut
1568 1838
1569sub cf::object::player::goto_map { 1839sub cf::object::player::goto {
1570 my ($self, $path, $x, $y) = @_; 1840 my ($self, $path, $x, $y) = @_;
1571 1841
1842 $path = new cf::path $path;
1843
1572 $self->enter_link; 1844 $self->enter_link;
1573 1845
1574 (cf::async { 1846 (async {
1575 $path = new cf::path $path;
1576
1577 my $map = cf::map::find_map $path->as_string; 1847 my $map = cf::map::find $path->as_string;
1578 $map = $map->customise_for ($self) if $map; 1848 $map = $map->customise_for ($self) if $map;
1579 1849
1580# warn "entering ", $map->path, " at ($x, $y)\n" 1850# warn "entering ", $map->path, " at ($x, $y)\n"
1581# if $map; 1851# if $map;
1582 1852
1583 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1584 1854
1585 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1586 })->prio (1); 1856 })->prio (1);
1587} 1857}
1588 1858
1641 1911
1642 return unless $self->type == cf::PLAYER; 1912 return unless $self->type == cf::PLAYER;
1643 1913
1644 $self->enter_link; 1914 $self->enter_link;
1645 1915
1646 (cf::async { 1916 (async {
1917 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1918 unless (eval {
1648 prepare_random_map $exit 1919 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1920 if $exit->slaying eq "/!";
1650 1921
1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1653 1924
1654 1; 1925 1;
1655 }) { 1926 }) {
1656 $self->message ("Something went wrong deep within the crossfire server. " 1927 $self->message ("Something went wrong deep within the crossfire server. "
1657 . "I'll try to bring you back to the map you were before. " 1928 . "I'll try to bring you back to the map you were before. "
1658 . "Please report this to the dungeon master", 1929 . "Please report this to the dungeon master!",
1659 cf::NDI_UNIQUE | cf::NDI_RED); 1930 cf::NDI_UNIQUE | cf::NDI_RED);
1660 1931
1661 warn "ERROR in enter_exit: $@"; 1932 warn "ERROR in enter_exit: $@";
1662 $self->leave_link; 1933 $self->leave_link;
1663 } 1934 }
1731 } 2002 }
1732 } 2003 }
1733 }, 2004 },
1734); 2005);
1735 2006
1736=item $client->coro (\&cb) 2007=item $client->async (\&cb)
1737 2008
1738Create a new coroutine, running the specified callback. The coroutine will 2009Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 2010be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 2011or loss of connection).
1741 2012
1742=cut 2013=cut
1743 2014
1744sub cf::client::coro { 2015sub cf::client::async {
1745 my ($self, $cb) = @_; 2016 my ($self, $cb) = @_;
1746 2017
1747 my $coro = &cf::async ($cb); 2018 my $coro = &Coro::async ($cb);
1748 2019
1749 $coro->on_destroy (sub { 2020 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 2021 delete $self->{_coro}{$coro+0};
1751 }); 2022 });
1752 2023
1990 local $/; 2261 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2262 *CFG = YAML::Syck::Load <$fh>;
1992 2263
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2264 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2265
2266 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2267 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2268
1995 if (exists $CFG{mlockall}) { 2269 if (exists $CFG{mlockall}) {
1996 eval { 2270 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2272 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2273 };
2000 warn $@ if $@; 2274 warn $@ if $@;
2001 } 2275 }
2002} 2276}
2003 2277
2004sub main { 2278sub main {
2005 # we must not ever block the main coroutine 2279 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2280 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2282 async { Event::one_event };
2010 })->();
2011 }; 2283 };
2012 2284
2013 cfg_load; 2285 cfg_load;
2014 db_load; 2286 db_load;
2015 load_extensions; 2287 load_extensions;
2016 Event::loop; 2288 Event::loop;
2017} 2289}
2018 2290
2019############################################################################# 2291#############################################################################
2020# initialisation 2292# initialisation and cleanup
2293
2294# install some emergency cleanup handlers
2295BEGIN {
2296 for my $signal (qw(INT HUP TERM)) {
2297 Event->signal (
2298 data => WF_AUTOCANCEL,
2299 signal => $signal,
2300 cb => sub {
2301 cf::cleanup "SIG$signal";
2302 },
2303 );
2304 }
2305}
2306
2307sub emergency_save() {
2308 my $freeze_guard = cf::freeze_mainloop;
2309
2310 warn "enter emergency perl save\n";
2311
2312 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously.
2316 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next;
2320 $pl->save;
2321 }
2322 warn "end emergency player save\n";
2323
2324 warn "begin emergency map save\n";
2325 for my $path (keys %cf::MAP) {
2326 my $map = $cf::MAP{$path} or next;
2327 $map->valid or next;
2328 $map->save;
2329 }
2330 warn "end emergency map save\n";
2331 };
2332
2333 warn "leave emergency perl save\n";
2334}
2021 2335
2022sub reload() { 2336sub reload() {
2023 # can/must only be called in main 2337 # can/must only be called in main
2024 if ($Coro::current != $Coro::main) { 2338 if ($Coro::current != $Coro::main) {
2025 warn "can only reload from main coroutine\n"; 2339 warn "can only reload from main coroutine\n";
2026 return; 2340 return;
2027 } 2341 }
2028 2342
2029 warn "reloading..."; 2343 warn "reloading...";
2030 2344
2031 local $FREEZE = 1; 2345 my $guard = freeze_mainloop;
2032 cf::emergency_save; 2346 cf::emergency_save;
2033 2347
2034 eval { 2348 eval {
2035 # if anything goes wrong in here, we should simply crash as we already saved 2349 # if anything goes wrong in here, we should simply crash as we already saved
2036 2350
2098 cf::load_extensions; 2412 cf::load_extensions;
2099 2413
2100 # reattach attachments to objects 2414 # reattach attachments to objects
2101 warn "reattach"; 2415 warn "reattach";
2102 _global_reattach; 2416 _global_reattach;
2417 reattach $_ for values %MAP;
2103 }; 2418 };
2104 2419
2105 if ($@) { 2420 if ($@) {
2106 warn $@; 2421 warn $@;
2107 warn "error while reloading, exiting."; 2422 warn "error while reloading, exiting.";
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2440
2126 # dirty hack because... archetypes are not yet loaded 2441 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2442 Event->timer (
2128 after => 2, 2443 after => 10,
2129 cb => sub { 2444 cb => sub {
2130 $_[0]->w->cancel; 2445 $_[0]->w->cancel;
2131 2446
2132 # provide some exits "home" 2447 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2448 my $exit = cf::object::new "exit";
2172 reentrant => 0, 2487 reentrant => 0,
2173 prio => 0, 2488 prio => 0,
2174 at => $NEXT_TICK || $TICK, 2489 at => $NEXT_TICK || $TICK,
2175 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2176 cb => sub { 2491 cb => sub {
2177 unless ($FREEZE) {
2178 cf::server_tick; # one server iteration 2492 cf::server_tick; # one server iteration
2179 $RUNTIME += $TICK; 2493 $RUNTIME += $TICK;
2180 }
2181
2182 $NEXT_TICK += $TICK; 2494 $NEXT_TICK += $TICK;
2495
2496 $WAIT_FOR_TICK->broadcast;
2497 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2183 2498
2184 # if we are delayed by four ticks or more, skip them all 2499 # if we are delayed by four ticks or more, skip them all
2185 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2186 2501
2187 $TICK_WATCHER->at ($NEXT_TICK); 2502 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines