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.155 by root, Tue Jan 9 21:32:42 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
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
360 374
361sub new { 375sub new {
362 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
363 377
364 $path = $path->as_string if ref $path; 378 $path = $path->as_string if ref $path;
428# } 442# }
429} 443}
430 444
431# escape the /'s in the path 445# escape the /'s in the path
432sub _escaped_path { 446sub _escaped_path {
433 # ∕ is U+2215
434 (my $path = $_[0]{path}) =~ s/\///g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
435 $path 448 $path
436} 449}
437 450
438# the original (read-only) location 451# the original (read-only) location
439sub load_path { 452sub load_path {
1066}; 1079};
1067 1080
1068cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1069 1082
1070############################################################################# 1083#############################################################################
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 1084
1094=head2 CORE EXTENSIONS 1085=head2 CORE EXTENSIONS
1095 1086
1096Functions and methods that extend core crossfire objects. 1087Functions and methods that extend core crossfire objects.
1097 1088
1089=cut
1090
1091package cf::player;
1092
1093use Coro::AIO;
1094
1098=head3 cf::player 1095=head3 cf::player
1099 1096
1100=over 4 1097=over 4
1101 1098
1102=item cf::player::exists $login 1099=item cf::player::find $login
1103 1100
1104Returns true when the given account exists. 1101Returns the given player object, loading it if necessary (might block).
1105 1102
1106=cut 1103=cut
1107 1104
1108sub cf::player::exists($) { 1105sub playerdir($) {
1109 cf::player::find $_[0] 1106 cf::localdir
1110 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1107 . "/"
1108 . cf::playerdir
1109 . "/"
1110 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1111}
1112
1113sub path($) {
1114 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1115
1116 (playerdir $login) . "/$login.pl"
1117}
1118
1119sub find_active($) {
1120 $cf::PLAYER{$_[0]}
1121 and $cf::PLAYER{$_[0]}->active
1122 and $cf::PLAYER{$_[0]}
1123}
1124
1125sub exists($) {
1126 my ($login) = @_;
1127
1128 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login }
1130}
1131
1132sub find($) {
1133 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0];
1135
1136 my $guard = cf::lock_acquire "user_find:$login";
1137
1138 $cf::PLAYER{$_[0]} || do {
1139 my $pl = load_pl path $login
1140 or return;
1141 $cf::PLAYER{$login} = $pl
1142 }
1143 }
1144}
1145
1146sub save($) {
1147 my ($pl) = @_;
1148
1149 return if $pl->{deny_save};
1150
1151 my $path = path $pl;
1152 my $guard = cf::lock_acquire "user_save:$path";
1153
1154 return if $pl->{deny_save};
1155
1156 aio_mkdir playerdir $pl, 0770;
1157 $pl->{last_save} = $cf::RUNTIME;
1158
1159 $pl->save_pl ($path);
1160 Coro::cede;
1161}
1162
1163sub new($) {
1164 my ($login) = @_;
1165
1166 my $self = create;
1167
1168 $self->ob->name ($login);
1169 $self->{deny_save} = 1;
1170
1171 $cf::PLAYER{$login} = $self;
1172
1173 $self
1174}
1175
1176=item $pl->quit_character
1177
1178Nukes the player without looking back. If logged in, the connection will
1179be destroyed. May block for a long time.
1180
1181=cut
1182
1183sub quit_character {
1184 my ($pl) = @_;
1185
1186 $pl->{deny_save} = 1;
1187 $pl->password ("*"); # this should lock out the player until we nuked the dir
1188
1189 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1190 $pl->deactivate;
1191 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1192 $pl->ns->destroy if $pl->ns;
1193
1194 my $path = playerdir $pl;
1195 my $temp = "$path~$cf::RUNTIME~deleting~";
1196 aio_rename $path, $temp;
1197 delete $cf::PLAYER{$pl->ob->name};
1198 $pl->destroy;
1199 IO::AIO::aio_rmtree $temp;
1200}
1201
1202=item cf::player::list_logins
1203
1204Returns am arrayref of all valid playernames in the system, can take a
1205while and may block, so not sync_job-capable, ever.
1206
1207=cut
1208
1209sub list_logins {
1210 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1211 or return [];
1212
1213 my @logins;
1214
1215 for my $login (@$dirs) {
1216 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1217 aio_read $fh, 0, 512, my $buf, 0 or next;
1218 $buf !~ /^password -------------$/m or next; # official not-valid tag
1219
1220 utf8::decode $login;
1221 push @logins, $login;
1222 }
1223
1224 \@logins
1225}
1226
1227=item $player->maps
1228
1229Returns an arrayref of cf::path's of all maps that are private for this
1230player. May block.
1231
1232=cut
1233
1234sub maps($) {
1235 my ($pl) = @_;
1236
1237 my $files = aio_readdir playerdir $pl
1238 or return;
1239
1240 my @paths;
1241
1242 for (@$files) {
1243 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/;
1246
1247 s/$PATH_SEP/\//g;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 }
1250
1251 \@paths
1111} 1252}
1112 1253
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1114 1255
1115Sends an ext reply to the player. 1256Sends an ext reply to the player.
1116 1257
1117=cut 1258=cut
1118 1259
1119sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1120 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1121 1262
1122 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1123 1264
1124 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1125} 1266}
1267
1268package cf;
1126 1269
1127=back 1270=back
1128 1271
1129 1272
1130=head3 cf::map 1273=head3 cf::map
1136package cf::map; 1279package cf::map;
1137 1280
1138use Fcntl; 1281use Fcntl;
1139use Coro::AIO; 1282use Coro::AIO;
1140 1283
1141our $MAX_RESET = 7200; 1284our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1285our $DEFAULT_RESET = 3000;
1143 1286
1144sub generate_random_map { 1287sub generate_random_map {
1145 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1146 1289
1147 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1177 or return; 1320 or return;
1178 1321
1179 my $map = cf::map::new 1322 my $map = cf::map::new
1180 or return; 1323 or return;
1181 1324
1325 # for better error messages only, will be overwritten
1326 $map->path ($path);
1327
1182 $map->load_header ($path) 1328 $map->load_header ($path)
1183 or return; 1329 or return;
1184 1330
1185 $map->{load_path} = $path; 1331 $map->{load_path} = $path;
1186 1332
1187 $map 1333 $map
1188} 1334}
1189 1335
1190sub find_map; 1336sub find;
1191sub find_map { 1337sub find {
1192 my ($path, $origin) = @_; 1338 my ($path, $origin) = @_;
1193 1339
1194 #warn "find_map<$path,$origin>\n";#d# 1340 #warn "find<$path,$origin>\n";#d#
1195 1341
1196 $path = new cf::path $path, $origin && $origin->path; 1342 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1343 my $key = $path->as_string;
1198 1344
1199 cf::lock_wait "map_find:$key"; 1345 cf::lock_wait "map_find:$key";
1202 my $guard = cf::lock_acquire "map_find:$key"; 1348 my $guard = cf::lock_acquire "map_find:$key";
1203 1349
1204 # do it the slow way 1350 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1351 my $map = try_load_header $path->save_path;
1206 1352
1353 Coro::cede;
1354
1207 if ($map) { 1355 if ($map) {
1356 $map->last_access ((delete $map->{last_access})
1357 || $cf::RUNTIME); #d#
1208 # safety 1358 # safety
1209 $map->{instantiate_time} = $cf::RUNTIME 1359 $map->{instantiate_time} = $cf::RUNTIME
1210 if $map->{instantiate_time} > $cf::RUNTIME; 1360 if $map->{instantiate_time} > $cf::RUNTIME;
1211 } else { 1361 } else {
1212 if (my $rmp = $path->random_map_params) { 1362 if (my $rmp = $path->random_map_params) {
1217 1367
1218 $map or return; 1368 $map or return;
1219 1369
1220 $map->{load_original} = 1; 1370 $map->{load_original} = 1;
1221 $map->{instantiate_time} = $cf::RUNTIME; 1371 $map->{instantiate_time} = $cf::RUNTIME;
1372 $map->last_access ($cf::RUNTIME);
1222 $map->instantiate; 1373 $map->instantiate;
1223 1374
1224 # per-player maps become, after loading, normal maps 1375 # per-player maps become, after loading, normal maps
1225 $map->per_player (0) if $path->{user_rel}; 1376 $map->per_player (0) if $path->{user_rel};
1226 } 1377 }
1227 1378
1228 $map->path ($key); 1379 $map->path ($key);
1229 $map->{path} = $path; 1380 $map->{path} = $path;
1230 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME); 1382
1383 Coro::cede;
1232 1384
1233 if ($map->should_reset) { 1385 if ($map->should_reset) {
1234 $map->reset; 1386 $map->reset;
1235 undef $guard; 1387 undef $guard;
1236 $map = find_map $path 1388 $map = find $path
1237 or return; 1389 or return;
1238 } 1390 }
1239 1391
1240 $cf::MAP{$key} = $map 1392 $cf::MAP{$key} = $map
1241 } 1393 }
1263 if (aio_open $uniq, O_RDONLY, 0) { 1415 if (aio_open $uniq, O_RDONLY, 0) {
1264 $self->clear_unique_items; 1416 $self->clear_unique_items;
1265 $self->load_objects ($uniq, 0); 1417 $self->load_objects ($uniq, 0);
1266 } 1418 }
1267 } 1419 }
1420
1421 Coro::cede;
1268 1422
1269 # now do the right thing for maps 1423 # now do the right thing for maps
1270 $self->link_multipart_objects; 1424 $self->link_multipart_objects;
1271 1425
1272 if ($self->{path}->is_style_map) { 1426 if ($self->{path}->is_style_map) {
1280 $self->difficulty ($self->estimate_difficulty) 1434 $self->difficulty ($self->estimate_difficulty)
1281 unless $self->difficulty; 1435 unless $self->difficulty;
1282 $self->activate; 1436 $self->activate;
1283 } 1437 }
1284 1438
1439 Coro::cede;
1440
1285 $self->in_memory (cf::MAP_IN_MEMORY); 1441 $self->in_memory (cf::MAP_IN_MEMORY);
1286} 1442}
1287 1443
1288sub load_map_sync { 1444sub find_sync {
1289 my ($path, $origin) = @_; 1445 my ($path, $origin) = @_;
1290 1446
1291 #warn "load_map_sync<$path, $origin>\n";#d# 1447 cf::sync_job { cf::map::find $path, $origin }
1448}
1292 1449
1293 cf::sync_job { 1450sub do_load_sync {
1294 my $map = cf::map::find_map $path, $origin 1451 my ($map) = @_;
1295 or return; 1452
1296 $map->load; 1453 cf::sync_job { $map->load };
1297 $map
1298 }
1299} 1454}
1300 1455
1301sub save { 1456sub save {
1302 my ($self) = @_; 1457 my ($self) = @_;
1303 1458
1459 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460
1304 $self->{last_save} = $cf::RUNTIME; 1461 $self->{last_save} = $cf::RUNTIME;
1305 1462
1306 return unless $self->dirty; 1463 return unless $self->dirty;
1307 1464
1308 my $save = $self->{path}->save_path; utf8::encode $save; 1465 my $save = $self->{path}->save_path; utf8::encode $save;
1309 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1466 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1310 1467
1311 $self->{load_path} = $save; 1468 $self->{load_path} = $save;
1312 1469
1313 return if $self->{deny_save}; 1470 return if $self->{deny_save};
1471
1472 local $self->{last_access} = $self->last_access;#d#
1473
1474 cf::async {
1475 $_->contr->save for $self->players;
1476 };
1314 1477
1315 if ($uniq) { 1478 if ($uniq) {
1316 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1317 $self->save_objects ($uniq, cf::IO_UNIQUES); 1480 $self->save_objects ($uniq, cf::IO_UNIQUES);
1318 } else { 1481 } else {
1324 my ($self) = @_; 1487 my ($self) = @_;
1325 1488
1326 # save first because save cedes 1489 # save first because save cedes
1327 $self->save; 1490 $self->save;
1328 1491
1492 my $lock = cf::lock_acquire "map_data:" . $self->path;
1493
1329 return if $self->players; 1494 return if $self->players;
1330 return if $self->in_memory != cf::MAP_IN_MEMORY; 1495 return if $self->in_memory != cf::MAP_IN_MEMORY;
1331 return if $self->{deny_save}; 1496 return if $self->{deny_save};
1332 1497
1333 $self->clear; 1498 $self->clear;
1375} 1540}
1376 1541
1377sub reset { 1542sub reset {
1378 my ($self) = @_; 1543 my ($self) = @_;
1379 1544
1545 my $lock = cf::lock_acquire "map_data:" . $self->path;
1546
1380 return if $self->players; 1547 return if $self->players;
1381 return if $self->{path}{user_rel};#d# 1548 return if $self->{path}{user_rel};#d#
1382 1549
1383 warn "resetting map ", $self->path;#d# 1550 warn "resetting map ", $self->path;#d#
1384 1551
1403 1570
1404sub customise_for { 1571sub customise_for {
1405 my ($map, $ob) = @_; 1572 my ($map, $ob) = @_;
1406 1573
1407 if ($map->per_player) { 1574 if ($map->per_player) {
1408 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1575 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1409 } 1576 }
1410 1577
1411 $map 1578 $map
1412} 1579}
1413 1580
1414sub emergency_save {
1415 local $cf::FREEZE = 1;
1416
1417 warn "enter emergency map save\n";
1418
1419 cf::sync_job {
1420 warn "begin emergency map save\n";
1421 $_->save for values %cf::MAP;
1422 };
1423
1424 warn "end emergency map save\n";
1425}
1426
1427package cf; 1581package cf;
1428 1582
1429=back 1583=back
1430 1584
1585=head3 cf::object
1586
1587=cut
1588
1589package cf::object;
1590
1591=over 4
1592
1593=item $ob->inv_recursive
1594
1595Returns the inventory of the object _and_ their inventories, recursively.
1596
1597=cut
1598
1599sub inv_recursive_;
1600sub inv_recursive_ {
1601 map { $_, inv_recursive_ $_->inv } @_
1602}
1603
1604sub inv_recursive {
1605 inv_recursive_ inv $_[0]
1606}
1607
1608package cf;
1609
1610=back
1431 1611
1432=head3 cf::object::player 1612=head3 cf::object::player
1433 1613
1434=over 4 1614=over 4
1435 1615
1510 my $link_pos = delete $self->{_link_pos}; 1690 my $link_pos = delete $self->{_link_pos};
1511 1691
1512 unless ($map) { 1692 unless ($map) {
1513 # restore original map position 1693 # restore original map position
1514 ($map, $x, $y) = @{ $link_pos || [] }; 1694 ($map, $x, $y) = @{ $link_pos || [] };
1515 $map = cf::map::find_map $map; 1695 $map = cf::map::find $map;
1516 1696
1517 unless ($map) { 1697 unless ($map) {
1518 ($map, $x, $y) = @$EMERGENCY_POSITION; 1698 ($map, $x, $y) = @$EMERGENCY_POSITION;
1519 $map = cf::map::find_map $map 1699 $map = cf::map::find $map
1520 or die "FATAL: cannot load emergency map\n"; 1700 or die "FATAL: cannot load emergency map\n";
1521 } 1701 }
1522 } 1702 }
1523 1703
1524 ($x, $y) = (-1, -1) 1704 ($x, $y) = (-1, -1)
1528 ($x, $y) = ($map->enter_x, $map->enter_y) 1708 ($x, $y) = ($map->enter_x, $map->enter_y)
1529 if $x <=0 && $y <= 0; 1709 if $x <=0 && $y <= 0;
1530 1710
1531 $map->load; 1711 $map->load;
1532 1712
1713 return unless $self->contr->active;
1533 $self->activate_recursive; 1714 $self->activate_recursive;
1534 $self->enter_map ($map, $x, $y); 1715 $self->enter_map ($map, $x, $y);
1535} 1716}
1536 1717
1537cf::player->attach ( 1718cf::player->attach (
1550 1731
1551 # try to abort aborted map switching on player login :) 1732 # try to abort aborted map switching on player login :)
1552 # should happen only on crashes 1733 # should happen only on crashes
1553 if ($pl->ob->{_link_pos}) { 1734 if ($pl->ob->{_link_pos}) {
1554 $pl->ob->enter_link; 1735 $pl->ob->enter_link;
1555 cf::async { 1736 (async {
1556 # we need this sleep as the login has a concurrent enter_exit running 1737 # 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 1738 # and this sleep increases chances of the player not ending up in scorn
1739 $pl->ob->reply (undef,
1740 "There was an internal problem at your last logout, "
1741 . "the server will try to bring you to your intended destination in a second.",
1742 cf::NDI_RED);
1558 Coro::Timer::sleep 1; 1743 Coro::Timer::sleep 1;
1559 $pl->ob->leave_link; 1744 $pl->ob->leave_link;
1560 }; 1745 })->prio (2);
1561 } 1746 }
1562 }, 1747 },
1563); 1748);
1564 1749
1565=item $player_object->goto_map ($path, $x, $y) 1750=item $player_object->goto ($path, $x, $y)
1566 1751
1567=cut 1752=cut
1568 1753
1569sub cf::object::player::goto_map { 1754sub cf::object::player::goto {
1570 my ($self, $path, $x, $y) = @_; 1755 my ($self, $path, $x, $y) = @_;
1571 1756
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1572 $self->enter_link; 1760 $self->enter_link;
1573 1761
1574 (cf::async { 1762 (async {
1575 $path = new cf::path $path;
1576
1577 my $map = cf::map::find_map $path->as_string; 1763 my $map = cf::map::find $path->as_string;
1578 $map = $map->customise_for ($self) if $map; 1764 $map = $map->customise_for ($self) if $map;
1579 1765
1580# warn "entering ", $map->path, " at ($x, $y)\n" 1766# warn "entering ", $map->path, " at ($x, $y)\n"
1581# if $map; 1767# if $map;
1582 1768
1583 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1769 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1584 1770
1585 $self->leave_link ($map, $x, $y); 1771 $self->leave_link ($map, $x, $y);
1586 })->prio (1); 1772 })->prio (1);
1587} 1773}
1588 1774
1641 1827
1642 return unless $self->type == cf::PLAYER; 1828 return unless $self->type == cf::PLAYER;
1643 1829
1644 $self->enter_link; 1830 $self->enter_link;
1645 1831
1646 (cf::async { 1832 (async {
1833 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1834 unless (eval {
1648 prepare_random_map $exit 1835 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1836 if $exit->slaying eq "/!";
1650 1837
1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1838 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1839 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1653 1840
1654 1; 1841 1;
1655 }) { 1842 }) {
1656 $self->message ("Something went wrong deep within the crossfire server. " 1843 $self->message ("Something went wrong deep within the crossfire server. "
1657 . "I'll try to bring you back to the map you were before. " 1844 . "I'll try to bring you back to the map you were before. "
1731 } 1918 }
1732 } 1919 }
1733 }, 1920 },
1734); 1921);
1735 1922
1736=item $client->coro (\&cb) 1923=item $client->async (\&cb)
1737 1924
1738Create a new coroutine, running the specified callback. The coroutine will 1925Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1926be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1927or loss of connection).
1741 1928
1742=cut 1929=cut
1743 1930
1744sub cf::client::coro { 1931sub cf::client::async {
1745 my ($self, $cb) = @_; 1932 my ($self, $cb) = @_;
1746 1933
1747 my $coro = &cf::async ($cb); 1934 my $coro = &Coro::async ($cb);
1748 1935
1749 $coro->on_destroy (sub { 1936 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1937 delete $self->{_coro}{$coro+0};
1751 }); 1938 });
1752 1939
1990 local $/; 2177 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2178 *CFG = YAML::Syck::Load <$fh>;
1992 2179
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2180 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2181
2182 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2183 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2184
1995 if (exists $CFG{mlockall}) { 2185 if (exists $CFG{mlockall}) {
1996 eval { 2186 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2187 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2188 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2189 };
2000 warn $@ if $@; 2190 warn $@ if $@;
2001 } 2191 }
2002} 2192}
2003 2193
2004sub main { 2194sub main {
2005 # we must not ever block the main coroutine 2195 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2196 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2198 async { Event::one_event };
2010 })->();
2011 }; 2199 };
2012 2200
2013 cfg_load; 2201 cfg_load;
2014 db_load; 2202 db_load;
2015 load_extensions; 2203 load_extensions;
2016 Event::loop; 2204 Event::loop;
2017} 2205}
2018 2206
2019############################################################################# 2207#############################################################################
2020# initialisation 2208# initialisation and cleanup
2209
2210# install some emergency cleanup handlers
2211BEGIN {
2212 for my $signal (qw(INT HUP TERM)) {
2213 Event->signal (
2214 data => WF_AUTOCANCEL,
2215 signal => $signal,
2216 cb => sub {
2217 cf::cleanup "SIG$signal";
2218 },
2219 );
2220 }
2221}
2222
2223sub emergency_save {
2224 my $freeze_guard = cf::freeze_mainloop;
2225
2226 warn "enter emergency perl save\n";
2227
2228 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously.
2232 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next;
2236 $pl->save;
2237 }
2238 warn "end emergency player save\n";
2239
2240 warn "begin emergency map save\n";
2241 for my $path (keys %cf::MAP) {
2242 my $map = $cf::MAP{$path} or next;
2243 $map->valid or next;
2244 $map->save;
2245 }
2246 warn "end emergency map save\n";
2247 };
2248
2249 warn "leave emergency perl save\n";
2250}
2021 2251
2022sub reload() { 2252sub reload() {
2023 # can/must only be called in main 2253 # can/must only be called in main
2024 if ($Coro::current != $Coro::main) { 2254 if ($Coro::current != $Coro::main) {
2025 warn "can only reload from main coroutine\n"; 2255 warn "can only reload from main coroutine\n";
2026 return; 2256 return;
2027 } 2257 }
2028 2258
2029 warn "reloading..."; 2259 warn "reloading...";
2030 2260
2031 local $FREEZE = 1; 2261 my $guard = freeze_mainloop;
2032 cf::emergency_save; 2262 cf::emergency_save;
2033 2263
2034 eval { 2264 eval {
2035 # if anything goes wrong in here, we should simply crash as we already saved 2265 # if anything goes wrong in here, we should simply crash as we already saved
2036 2266
2098 cf::load_extensions; 2328 cf::load_extensions;
2099 2329
2100 # reattach attachments to objects 2330 # reattach attachments to objects
2101 warn "reattach"; 2331 warn "reattach";
2102 _global_reattach; 2332 _global_reattach;
2333 reattach $_ for values %MAP;
2103 }; 2334 };
2104 2335
2105 if ($@) { 2336 if ($@) {
2106 warn $@; 2337 warn $@;
2107 warn "error while reloading, exiting."; 2338 warn "error while reloading, exiting.";
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2354 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2355 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2356
2126 # dirty hack because... archetypes are not yet loaded 2357 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2358 Event->timer (
2128 after => 2, 2359 after => 10,
2129 cb => sub { 2360 cb => sub {
2130 $_[0]->w->cancel; 2361 $_[0]->w->cancel;
2131 2362
2132 # provide some exits "home" 2363 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2364 my $exit = cf::object::new "exit";
2172 reentrant => 0, 2403 reentrant => 0,
2173 prio => 0, 2404 prio => 0,
2174 at => $NEXT_TICK || $TICK, 2405 at => $NEXT_TICK || $TICK,
2175 data => WF_AUTOCANCEL, 2406 data => WF_AUTOCANCEL,
2176 cb => sub { 2407 cb => sub {
2177 unless ($FREEZE) {
2178 cf::server_tick; # one server iteration 2408 cf::server_tick; # one server iteration
2179 $RUNTIME += $TICK; 2409 $RUNTIME += $TICK;
2180 }
2181
2182 $NEXT_TICK += $TICK; 2410 $NEXT_TICK += $TICK;
2411
2412 $WAIT_FOR_TICK->broadcast;
2413 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2183 2414
2184 # if we are delayed by four ticks or more, skip them all 2415 # if we are delayed by four ticks or more, skip them all
2185 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2416 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2186 2417
2187 $TICK_WATCHER->at ($NEXT_TICK); 2418 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines