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.127 by root, Wed Jan 3 00:05:26 2007 UTC vs.
Revision 1.157 by root, Wed Jan 10 01:16:54 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
71mkdir cf::localdir . "/" . cf::uniquedir; 75mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 76mkdir $RANDOM_MAPS;
73 77
74# a special map that is always available 78# a special map that is always available
75our $LINK_MAP; 79our $LINK_MAP;
76 80our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 81
79############################################################################# 82#############################################################################
80 83
81=head2 GLOBAL VARIABLES 84=head2 GLOBAL VARIABLES
82 85
106 109
107=item %cf::CFG 110=item %cf::CFG
108 111
109Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 113from wherever your confdir points to.
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.
111 121
112=back 122=back
113 123
114=cut 124=cut
115 125
119 utf8::encode $msg; 129 utf8::encode $msg;
120 130
121 $msg .= "\n" 131 $msg .= "\n"
122 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
123 133
124 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
125 }; 135 };
126} 136}
127 137
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
155 165
156=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
157 167
158=over 4 168=over 4
159 169
170=item dumpval $ref
171
160=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}
161 192
162use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
163 194
164=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
165 196
181sub to_json($) { 212sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
184} 215}
185 216
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 217=item cf::lock_wait $string
209 218
210Wait until the given lock is available. See cf::lock_acquire. 219Wait until the given lock is available. See cf::lock_acquire.
211 220
212=item my $lock = cf::lock_acquire $string 221=item my $lock = cf::lock_acquire $string
213 222
214Wait 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
215a 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,
216for example when the coroutine gets canceled), the lock is automatically 225for example when the coroutine gets canceled), the lock is automatically
217returned. 226returned.
218 227
219Lock names should begin with a unique identifier (for example, find_map 228Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 229uses map_find and cf::map::load uses map_load).
221 230
222=cut 231=cut
223 232
224our %LOCK; 233our %LOCK;
225 234
239 # wait, to be sure we are not locked 248 # wait, to be sure we are not locked
240 lock_wait $key; 249 lock_wait $key;
241 250
242 $LOCK{$key} = []; 251 $LOCK{$key} = [];
243 252
244 cf::guard { 253 Coro::guard {
245 # wake up all waiters, to be on the safe side 254 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 255 $_->ready for @{ delete $LOCK{$key} };
247 } 256 }
248} 257}
249 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
250=item cf::async { BLOCK } 267=item cf::async { BLOCK }
251 268
252Like 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
253error 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.
254 272
255=cut 273=cut
256 274
257sub async(&) { 275BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 276
266=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
267 278
268The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
283 # this is the main coro, too bad, we have to block 294 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 295 # till the operation succeeds, freezing the server :/
285 296
286 # TODO: use suspend/resume instead 297 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 298 # (but this is cancel-safe)
288 local $FREEZE = 1; 299 my $freeze_guard = freeze_mainloop;
289 300
290 my $busy = 1; 301 my $busy = 1;
291 my @res; 302 my @res;
292 303
293 (Coro::async { 304 (async {
294 @res = eval { $job->() }; 305 @res = eval { $job->() };
295 warn $@ if $@; 306 warn $@ if $@;
296 undef $busy; 307 undef $busy;
297 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
298 309
299 while ($busy) { 310 while ($busy) {
300 Coro::cede_notself; 311 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 312 }
303 313
304 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
305 } else { 315 } else {
306 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
307 317
308 $job->() 318 $job->()
309 } 319 }
310} 320}
311 321
312=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
313 323
314Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
315when the extension calling this is being unloaded. 325extension calling this is being unloaded.
316 326
317=cut 327=cut
318 328
319sub coro(&) { 329sub async_ext(&) {
320 my $cb = shift; 330 my $cb = shift;
321 331
322 my $coro = &cf::async ($cb); 332 my $coro = &Coro::async ($cb);
323 333
324 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
326 }); 336 });
327 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
356=cut 366=cut
357 367
358############################################################################# 368#############################################################################
359 369
360package 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
361 374
362sub new { 375sub new {
363 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
364 377
365 $path = $path->as_string if ref $path; 378 $path = $path->as_string if ref $path;
429# } 442# }
430} 443}
431 444
432# escape the /'s in the path 445# escape the /'s in the path
433sub _escaped_path { 446sub _escaped_path {
434 # ∕ is U+2215
435 (my $path = $_[0]{path}) =~ s/\///g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
436 $path 448 $path
437} 449}
438 450
439# the original (read-only) location 451# the original (read-only) location
440sub load_path { 452sub load_path {
1067}; 1079};
1068 1080
1069cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1070 1082
1071############################################################################# 1083#############################################################################
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 1084
1095=head2 CORE EXTENSIONS 1085=head2 CORE EXTENSIONS
1096 1086
1097Functions and methods that extend core crossfire objects. 1087Functions and methods that extend core crossfire objects.
1098 1088
1089=cut
1090
1091package cf::player;
1092
1093use Coro::AIO;
1094
1099=head3 cf::player 1095=head3 cf::player
1100 1096
1101=over 4 1097=over 4
1102 1098
1103=item cf::player::exists $login 1099=item cf::player::find $login
1104 1100
1105Returns true when the given account exists. 1101Returns the given player object, loading it if necessary (might block).
1106 1102
1107=cut 1103=cut
1108 1104
1109sub cf::player::exists($) { 1105sub playerdir($) {
1110 cf::player::find $_[0] 1106 cf::localdir
1111 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
1112} 1252}
1113 1253
1114=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1115 1255
1116Sends an ext reply to the player. 1256Sends an ext reply to the player.
1117 1257
1118=cut 1258=cut
1119 1259
1120sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1121 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1122 1262
1123 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1124 1264
1125 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1126} 1266}
1267
1268package cf;
1127 1269
1128=back 1270=back
1129 1271
1130 1272
1131=head3 cf::map 1273=head3 cf::map
1137package cf::map; 1279package cf::map;
1138 1280
1139use Fcntl; 1281use Fcntl;
1140use Coro::AIO; 1282use Coro::AIO;
1141 1283
1142our $MAX_RESET = 7200; 1284our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1285our $DEFAULT_RESET = 3000;
1144 1286
1145sub generate_random_map { 1287sub generate_random_map {
1146 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1147 1289
1148 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1178 or return; 1320 or return;
1179 1321
1180 my $map = cf::map::new 1322 my $map = cf::map::new
1181 or return; 1323 or return;
1182 1324
1325 # for better error messages only, will be overwritten
1326 $map->path ($path);
1327
1183 $map->load_header ($path) 1328 $map->load_header ($path)
1184 or return; 1329 or return;
1185 1330
1186 $map->{load_path} = $path; 1331 $map->{load_path} = $path;
1187 1332
1188 $map 1333 $map
1189} 1334}
1190 1335
1191sub find_map; 1336sub find;
1192sub find_map { 1337sub find {
1193 my ($path, $origin) = @_; 1338 my ($path, $origin) = @_;
1194 1339
1195 #warn "find_map<$path,$origin>\n";#d# 1340 #warn "find<$path,$origin>\n";#d#
1196 1341
1197 $path = new cf::path $path, $origin && $origin->path; 1342 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1343 my $key = $path->as_string;
1199 1344
1200 cf::lock_wait "map_find:$key"; 1345 cf::lock_wait "map_find:$key";
1203 my $guard = cf::lock_acquire "map_find:$key"; 1348 my $guard = cf::lock_acquire "map_find:$key";
1204 1349
1205 # do it the slow way 1350 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1351 my $map = try_load_header $path->save_path;
1207 1352
1353 Coro::cede;
1354
1208 if ($map) { 1355 if ($map) {
1356 $map->last_access ((delete $map->{last_access})
1357 || $cf::RUNTIME); #d#
1209 # safety 1358 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1359 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1360 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1361 } else {
1213 if (my $rmp = $path->random_map_params) { 1362 if (my $rmp = $path->random_map_params) {
1218 1367
1219 $map or return; 1368 $map or return;
1220 1369
1221 $map->{load_original} = 1; 1370 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1371 $map->{instantiate_time} = $cf::RUNTIME;
1372 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1373 $map->instantiate;
1224 1374
1225 # per-player maps become, after loading, normal maps 1375 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1376 $map->per_player (0) if $path->{user_rel};
1227 } 1377 }
1228 1378
1229 $map->path ($key); 1379 $map->path ($key);
1230 $map->{path} = $path; 1380 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1382
1383 Coro::cede;
1233 1384
1234 if ($map->should_reset) { 1385 if ($map->should_reset) {
1235 $map->reset; 1386 $map->reset;
1236 undef $guard; 1387 undef $guard;
1237 $map = find_map $path 1388 $map = find $path
1238 or return; 1389 or return;
1239 } 1390 }
1240 1391
1241 $cf::MAP{$key} = $map 1392 $cf::MAP{$key} = $map
1242 } 1393 }
1264 if (aio_open $uniq, O_RDONLY, 0) { 1415 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1416 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1417 $self->load_objects ($uniq, 0);
1267 } 1418 }
1268 } 1419 }
1420
1421 Coro::cede;
1269 1422
1270 # now do the right thing for maps 1423 # now do the right thing for maps
1271 $self->link_multipart_objects; 1424 $self->link_multipart_objects;
1272 1425
1273 if ($self->{path}->is_style_map) { 1426 if ($self->{path}->is_style_map) {
1281 $self->difficulty ($self->estimate_difficulty) 1434 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1435 unless $self->difficulty;
1283 $self->activate; 1436 $self->activate;
1284 } 1437 }
1285 1438
1439 Coro::cede;
1440
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1441 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1442}
1288 1443
1289sub load_map_sync { 1444# find and load all maps in the 3x3 area around a map
1445sub load_diag {
1446 my ($map) = @_;
1447
1448 my @diag; # diagonal neighbours
1449
1450 for (0 .. 3) {
1451 my $neigh = $map->tile_path ($_)
1452 or next;
1453 $neigh = find $neigh, $map
1454 or next;
1455 $neigh->load;
1456
1457 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1458 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1459 }
1460
1461 for (@diag) {
1462 my $neigh = find @$_
1463 or next;
1464 $neigh->load;
1465 }
1466}
1467
1468sub find_sync {
1290 my ($path, $origin) = @_; 1469 my ($path, $origin) = @_;
1291 1470
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1471 cf::sync_job { find $path, $origin }
1472}
1293 1473
1294 cf::sync_job { 1474sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1475 my ($map) = @_;
1476
1477 cf::sync_job { $map->load };
1478}
1479
1480our %MAP_PREFETCH;
1481our $MAP_PREFETCHER = Coro::async {
1482 while () {
1483 while (%MAP_PREFETCH) {
1484 my $key = each %MAP_PREFETCH
1296 or return; 1485 or next;
1486 my $path = delete $MAP_PREFETCH{$key};
1487
1488 my $map = find $path
1489 or next;
1297 $map->load; 1490 $map->load;
1298 $map 1491 }
1492 Coro::schedule;
1299 } 1493 }
1494};
1495
1496sub find_async {
1497 my ($path, $origin) = @_;
1498
1499 $path = new cf::path $path, $origin && $origin->path;
1500 my $key = $path->as_string;
1501
1502 if (my $map = $cf::MAP{$key}) {
1503 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504 }
1505
1506 $MAP_PREFETCH{$key} = $path;
1507 $MAP_PREFETCHER->ready;
1508
1509 ()
1300} 1510}
1301 1511
1302sub save { 1512sub save {
1303 my ($self) = @_; 1513 my ($self) = @_;
1304 1514
1515 my $lock = cf::lock_acquire "map_data:" . $self->path;
1516
1305 $self->{last_save} = $cf::RUNTIME; 1517 $self->{last_save} = $cf::RUNTIME;
1306 1518
1307 return unless $self->dirty; 1519 return unless $self->dirty;
1308 1520
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1521 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1522 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1523
1312 $self->{load_path} = $save; 1524 $self->{load_path} = $save;
1313 1525
1314 return if $self->{deny_save}; 1526 return if $self->{deny_save};
1527
1528 local $self->{last_access} = $self->last_access;#d#
1529
1530 cf::async {
1531 $_->contr->save for $self->players;
1532 };
1315 1533
1316 if ($uniq) { 1534 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1536 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1537 } else {
1322} 1540}
1323 1541
1324sub swap_out { 1542sub swap_out {
1325 my ($self) = @_; 1543 my ($self) = @_;
1326 1544
1545 # save first because save cedes
1546 $self->save;
1547
1548 my $lock = cf::lock_acquire "map_data:" . $self->path;
1549
1327 return if $self->players; 1550 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1551 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1552 return if $self->{deny_save};
1330 1553
1331 $self->save;
1332 $self->clear; 1554 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1555 $self->in_memory (cf::MAP_SWAPPED);
1334} 1556}
1335 1557
1336sub reset_at { 1558sub reset_at {
1374} 1596}
1375 1597
1376sub reset { 1598sub reset {
1377 my ($self) = @_; 1599 my ($self) = @_;
1378 1600
1601 my $lock = cf::lock_acquire "map_data:" . $self->path;
1602
1379 return if $self->players; 1603 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1604 return if $self->{path}{user_rel};#d#
1381 1605
1382 warn "resetting map ", $self->path;#d# 1606 warn "resetting map ", $self->path;#d#
1383 1607
1402 1626
1403sub customise_for { 1627sub customise_for {
1404 my ($map, $ob) = @_; 1628 my ($map, $ob) = @_;
1405 1629
1406 if ($map->per_player) { 1630 if ($map->per_player) {
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1631 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1408 } 1632 }
1409 1633
1410 $map 1634 $map
1411} 1635}
1412 1636
1413sub emergency_save {
1414 local $cf::FREEZE = 1;
1415
1416 warn "enter emergency map save\n";
1417
1418 cf::sync_job {
1419 warn "begin emergency map save\n";
1420 $_->save for values %cf::MAP;
1421 };
1422
1423 warn "end emergency map save\n";
1424}
1425
1426package cf; 1637package cf;
1427 1638
1428=back 1639=back
1429 1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1646
1647=over 4
1648
1649=item $ob->inv_recursive
1650
1651Returns the inventory of the object _and_ their inventories, recursively.
1652
1653=cut
1654
1655sub inv_recursive_;
1656sub inv_recursive_ {
1657 map { $_, inv_recursive_ $_->inv } @_
1658}
1659
1660sub inv_recursive {
1661 inv_recursive_ inv $_[0]
1662}
1663
1664package cf;
1665
1666=back
1430 1667
1431=head3 cf::object::player 1668=head3 cf::object::player
1432 1669
1433=over 4 1670=over 4
1434 1671
1509 my $link_pos = delete $self->{_link_pos}; 1746 my $link_pos = delete $self->{_link_pos};
1510 1747
1511 unless ($map) { 1748 unless ($map) {
1512 # restore original map position 1749 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1750 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1751 $map = cf::map::find $map;
1515 1752
1516 unless ($map) { 1753 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1754 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1755 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1756 or die "FATAL: cannot load emergency map\n";
1520 } 1757 }
1521 } 1758 }
1522 1759
1523 ($x, $y) = (-1, -1) 1760 ($x, $y) = (-1, -1)
1526 # use -1 or undef as default coordinates, not 0, 0 1763 # use -1 or undef as default coordinates, not 0, 0
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1765 if $x <=0 && $y <= 0;
1529 1766
1530 $map->load; 1767 $map->load;
1768 $map->load_diag;
1531 1769
1770 return unless $self->contr->active;
1532 $self->activate_recursive; 1771 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1772 $self->enter_map ($map, $x, $y);
1534} 1773}
1535 1774
1536cf::player->attach ( 1775cf::player->attach (
1549 1788
1550 # try to abort aborted map switching on player login :) 1789 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1790 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1791 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1792 $pl->ob->enter_link;
1554 cf::async { 1793 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1794 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1795 # and this sleep increases chances of the player not ending up in scorn
1796 $pl->ob->reply (undef,
1797 "There was an internal problem at your last logout, "
1798 . "the server will try to bring you to your intended destination in a second.",
1799 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1800 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1801 $pl->ob->leave_link;
1559 }; 1802 })->prio (2);
1560 } 1803 }
1561 }, 1804 },
1562); 1805);
1563 1806
1564=item $player_object->goto_map ($path, $x, $y) 1807=item $player_object->goto ($path, $x, $y)
1565 1808
1566=cut 1809=cut
1567 1810
1568sub cf::object::player::goto_map { 1811sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1812 my ($self, $path, $x, $y) = @_;
1570 1813
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1571 $self->enter_link; 1817 $self->enter_link;
1572 1818
1573 (cf::async { 1819 (async {
1574 $path = new cf::path $path;
1575
1576 my $map = cf::map::find_map $path->as_string; 1820 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1821 $map = $map->customise_for ($self) if $map;
1578 1822
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1823# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1824# if $map;
1581 1825
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1826 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1583 1827
1584 $self->leave_link ($map, $x, $y); 1828 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1829 })->prio (1);
1586} 1830}
1587 1831
1640 1884
1641 return unless $self->type == cf::PLAYER; 1885 return unless $self->type == cf::PLAYER;
1642 1886
1643 $self->enter_link; 1887 $self->enter_link;
1644 1888
1645 (cf::async { 1889 (async {
1890 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1891 unless (eval {
1647 prepare_random_map $exit 1892 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1893 if $exit->slaying eq "/!";
1649 1894
1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1895 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1896 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1897
1653 1; 1898 1;
1654 }) { 1899 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1900 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1901 . "I'll try to bring you back to the map you were before. "
1713 on_reply => sub { 1958 on_reply => sub {
1714 my ($ns, $msg) = @_; 1959 my ($ns, $msg) = @_;
1715 1960
1716 # this weird shuffling is so that direct followup queries 1961 # this weird shuffling is so that direct followup queries
1717 # get handled first 1962 # get handled first
1718 my $queue = delete $ns->{query_queue}; 1963 my $queue = delete $ns->{query_queue}
1964 or return; # be conservative, not sure how that can happen, but we saw a crash here
1719 1965
1720 (shift @$queue)->[1]->($msg); 1966 (shift @$queue)->[1]->($msg);
1721 1967
1722 push @{ $ns->{query_queue} }, @$queue; 1968 push @{ $ns->{query_queue} }, @$queue;
1723 1969
1729 } 1975 }
1730 } 1976 }
1731 }, 1977 },
1732); 1978);
1733 1979
1734=item $client->coro (\&cb) 1980=item $client->async (\&cb)
1735 1981
1736Create a new coroutine, running the specified callback. The coroutine will 1982Create a new coroutine, running the specified callback. The coroutine will
1737be automatically cancelled when the client gets destroyed (e.g. on logout, 1983be automatically cancelled when the client gets destroyed (e.g. on logout,
1738or loss of connection). 1984or loss of connection).
1739 1985
1740=cut 1986=cut
1741 1987
1742sub cf::client::coro { 1988sub cf::client::async {
1743 my ($self, $cb) = @_; 1989 my ($self, $cb) = @_;
1744 1990
1745 my $coro = &cf::async ($cb); 1991 my $coro = &Coro::async ($cb);
1746 1992
1747 $coro->on_destroy (sub { 1993 $coro->on_destroy (sub {
1748 delete $self->{_coro}{$coro+0}; 1994 delete $self->{_coro}{$coro+0};
1749 }); 1995 });
1750 1996
1985 open my $fh, "<:utf8", cf::confdir . "/config" 2231 open my $fh, "<:utf8", cf::confdir . "/config"
1986 or return; 2232 or return;
1987 2233
1988 local $/; 2234 local $/;
1989 *CFG = YAML::Syck::Load <$fh>; 2235 *CFG = YAML::Syck::Load <$fh>;
2236
2237 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2238
2239 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2240 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2241
2242 if (exists $CFG{mlockall}) {
2243 eval {
2244 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2245 and die "WARNING: m(un)lockall failed: $!\n";
2246 };
2247 warn $@ if $@;
2248 }
1990} 2249}
1991 2250
1992sub main { 2251sub main {
1993 # we must not ever block the main coroutine 2252 # we must not ever block the main coroutine
1994 local $Coro::idle = sub { 2253 local $Coro::idle = sub {
1995 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2254 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1996 (Coro::unblock_sub {
1997 Event::one_event; 2255 async { Event::one_event };
1998 })->();
1999 }; 2256 };
2000 2257
2001 cfg_load; 2258 cfg_load;
2002 db_load; 2259 db_load;
2003 load_extensions; 2260 load_extensions;
2004 Event::loop; 2261 Event::loop;
2005} 2262}
2006 2263
2007############################################################################# 2264#############################################################################
2008# initialisation 2265# initialisation and cleanup
2266
2267# install some emergency cleanup handlers
2268BEGIN {
2269 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal (
2271 data => WF_AUTOCANCEL,
2272 signal => $signal,
2273 cb => sub {
2274 cf::cleanup "SIG$signal";
2275 },
2276 );
2277 }
2278}
2279
2280sub emergency_save() {
2281 my $freeze_guard = cf::freeze_mainloop;
2282
2283 warn "enter emergency perl save\n";
2284
2285 cf::sync_job {
2286 # use a peculiar iteration method to avoid tripping on perl
2287 # refcount bugs in for. also avoids problems with players
2288 # and maps saved/Destroyed asynchronously.
2289 warn "begin emergency player save\n";
2290 for my $login (keys %cf::PLAYER) {
2291 my $pl = $cf::PLAYER{$login} or next;
2292 $pl->valid or next;
2293 $pl->save;
2294 }
2295 warn "end emergency player save\n";
2296
2297 warn "begin emergency map save\n";
2298 for my $path (keys %cf::MAP) {
2299 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next;
2301 $map->save;
2302 }
2303 warn "end emergency map save\n";
2304 };
2305
2306 warn "leave emergency perl save\n";
2307}
2009 2308
2010sub reload() { 2309sub reload() {
2011 # can/must only be called in main 2310 # can/must only be called in main
2012 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2013 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine\n";
2014 return; 2313 return;
2015 } 2314 }
2016 2315
2017 warn "reloading..."; 2316 warn "reloading...";
2018 2317
2019 local $FREEZE = 1; 2318 my $guard = freeze_mainloop;
2020 cf::emergency_save; 2319 cf::emergency_save;
2021 2320
2022 eval { 2321 eval {
2023 # if anything goes wrong in here, we should simply crash as we already saved 2322 # if anything goes wrong in here, we should simply crash as we already saved
2024 2323
2086 cf::load_extensions; 2385 cf::load_extensions;
2087 2386
2088 # reattach attachments to objects 2387 # reattach attachments to objects
2089 warn "reattach"; 2388 warn "reattach";
2090 _global_reattach; 2389 _global_reattach;
2390 reattach $_ for values %MAP;
2091 }; 2391 };
2092 2392
2093 if ($@) { 2393 if ($@) {
2094 warn $@; 2394 warn $@;
2095 warn "error while reloading, exiting."; 2395 warn "error while reloading, exiting.";
2111 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2411 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2112 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2412 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2113 2413
2114 # dirty hack because... archetypes are not yet loaded 2414 # dirty hack because... archetypes are not yet loaded
2115 Event->timer ( 2415 Event->timer (
2116 after => 2, 2416 after => 10,
2117 cb => sub { 2417 cb => sub {
2118 $_[0]->w->cancel; 2418 $_[0]->w->cancel;
2119 2419
2120 # provide some exits "home" 2420 # provide some exits "home"
2121 my $exit = cf::object::new "exit"; 2421 my $exit = cf::object::new "exit";
2160 reentrant => 0, 2460 reentrant => 0,
2161 prio => 0, 2461 prio => 0,
2162 at => $NEXT_TICK || $TICK, 2462 at => $NEXT_TICK || $TICK,
2163 data => WF_AUTOCANCEL, 2463 data => WF_AUTOCANCEL,
2164 cb => sub { 2464 cb => sub {
2165 unless ($FREEZE) {
2166 cf::server_tick; # one server iteration 2465 cf::server_tick; # one server iteration
2167 $RUNTIME += $TICK; 2466 $RUNTIME += $TICK;
2168 }
2169
2170 $NEXT_TICK += $TICK; 2467 $NEXT_TICK += $TICK;
2468
2469 $WAIT_FOR_TICK->broadcast;
2470 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2171 2471
2172 # if we are delayed by four ticks or more, skip them all 2472 # if we are delayed by four ticks or more, skip them all
2173 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2174 2474
2175 $TICK_WATCHER->at ($NEXT_TICK); 2475 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines