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.128 by root, Wed Jan 3 00:28:47 2007 UTC vs.
Revision 1.154 by root, Tue Jan 9 15:36:19 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
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 29# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 30$YAML::Syck::ImplicitUnicode = 1;
30 31
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 32$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 33
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 34sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
… …
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
57 58
58binmode STDOUT; 59binmode STDOUT;
59binmode STDERR; 60binmode STDERR;
60 61
61# read virtual server time, if available 62# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 72mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 73mkdir $RANDOM_MAPS;
73 74
74# a special map that is always available 75# a special map that is always available
75our $LINK_MAP; 76our $LINK_MAP;
76 77our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 78
79############################################################################# 79#############################################################################
80 80
81=head2 GLOBAL VARIABLES 81=head2 GLOBAL VARIABLES
82 82
… …
119 utf8::encode $msg; 119 utf8::encode $msg;
120 120
121 $msg .= "\n" 121 $msg .= "\n"
122 unless $msg =~ /\n$/; 122 unless $msg =~ /\n$/;
123 123
124 LOG llevError, "cfperl: $msg"; 124 LOG llevError, $msg;
125 }; 125 };
126} 126}
127 127
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
155 155
156=head2 UTILITY FUNCTIONS 156=head2 UTILITY FUNCTIONS
157 157
158=over 4 158=over 4
159 159
160=item dumpval $ref
161
160=cut 162=cut
163
164sub dumpval {
165 eval {
166 local $SIG{__DIE__};
167 my $d;
168 if (1) {
169 $d = new Data::Dumper([$_[0]], ["*var"]);
170 $d->Terse(1);
171 $d->Indent(2);
172 $d->Quotekeys(0);
173 $d->Useqq(1);
174 #$d->Bless(...);
175 $d->Seen($_[1]) if @_ > 1;
176 $d = $d->Dump();
177 }
178 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
179 $d
180 } || "[unable to dump $_[0]: '$@']";
181}
161 182
162use JSON::Syck (); # TODO# replace by JSON::PC once working 183use JSON::Syck (); # TODO# replace by JSON::PC once working
163 184
164=item $ref = cf::from_json $json 185=item $ref = cf::from_json $json
165 186
… …
181sub to_json($) { 202sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 203 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 204 JSON::Syck::Dump $_[0]
184} 205}
185 206
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 207=item cf::lock_wait $string
209 208
210Wait until the given lock is available. See cf::lock_acquire. 209Wait until the given lock is available. See cf::lock_acquire.
211 210
212=item my $lock = cf::lock_acquire $string 211=item my $lock = cf::lock_acquire $string
213 212
214Wait until the given lock is available and then acquires it and returns 213Wait 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, 214a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 215for example when the coroutine gets canceled), the lock is automatically
217returned. 216returned.
218 217
219Lock names should begin with a unique identifier (for example, find_map 218Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 219uses map_find and cf::map::load uses map_load).
221 220
222=cut 221=cut
223 222
224our %LOCK; 223our %LOCK;
225 224
… …
239 # wait, to be sure we are not locked 238 # wait, to be sure we are not locked
240 lock_wait $key; 239 lock_wait $key;
241 240
242 $LOCK{$key} = []; 241 $LOCK{$key} = [];
243 242
244 cf::guard { 243 Coro::guard {
245 # wake up all waiters, to be on the safe side 244 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 245 $_->ready for @{ delete $LOCK{$key} };
247 } 246 }
248} 247}
249 248
249sub freeze_mainloop {
250 return unless $TICK_WATCHER->is_active;
251
252 my $guard = Coro::guard { $TICK_WATCHER->start };
253 $TICK_WATCHER->stop;
254 $guard
255}
256
250=item cf::async { BLOCK } 257=item cf::async { BLOCK }
251 258
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 259Currently the same as Coro::async_pool, meaning you cannot use
253error instead of exiting the server in case of a problem. 260C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
261thing you are allowed to do is call C<prio> on it.
254 262
255=cut 263=cut
256 264
257sub async(&) { 265BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 266
266=item cf::sync_job { BLOCK } 267=item cf::sync_job { BLOCK }
267 268
268The design of crossfire+ requires that the main coro ($Coro::main) is 269The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 270always able to handle events or runnable, as crossfire+ is only partly
… …
283 # this is the main coro, too bad, we have to block 284 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 285 # till the operation succeeds, freezing the server :/
285 286
286 # TODO: use suspend/resume instead 287 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 288 # (but this is cancel-safe)
288 local $FREEZE = 1; 289 my $freeze_guard = freeze_mainloop;
289 290
290 my $busy = 1; 291 my $busy = 1;
291 my @res; 292 my @res;
292 293
293 (Coro::async { 294 (async {
294 @res = eval { $job->() }; 295 @res = eval { $job->() };
295 warn $@ if $@; 296 warn $@ if $@;
296 undef $busy; 297 undef $busy;
297 })->prio (Coro::PRIO_MAX); 298 })->prio (Coro::PRIO_MAX);
298 299
299 while ($busy) { 300 while ($busy) {
300 Coro::cede_notself; 301 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 302 }
303 303
304 wantarray ? @res : $res[0] 304 wantarray ? @res : $res[0]
305 } else { 305 } else {
306 # we are in another coroutine, how wonderful, everything just works 306 # we are in another coroutine, how wonderful, everything just works
307 307
308 $job->() 308 $job->()
309 } 309 }
310} 310}
311 311
312=item $coro = cf::coro { BLOCK } 312=item $coro = cf::async_ext { BLOCK }
313 313
314Creates and returns a new coro. This coro is automcatially being canceled 314Like async, but this coro is automcatially being canceled when the
315when the extension calling this is being unloaded. 315extension calling this is being unloaded.
316 316
317=cut 317=cut
318 318
319sub coro(&) { 319sub async_ext(&) {
320 my $cb = shift; 320 my $cb = shift;
321 321
322 my $coro = &cf::async ($cb); 322 my $coro = &Coro::async ($cb);
323 323
324 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
326 }); 326 });
327 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
… …
356=cut 356=cut
357 357
358############################################################################# 358#############################################################################
359 359
360package cf::path; 360package cf::path;
361
362# used to convert map paths into valid unix filenames by repalcing / by ∕
363our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
361 364
362sub new { 365sub new {
363 my ($class, $path, $base) = @_; 366 my ($class, $path, $base) = @_;
364 367
365 $path = $path->as_string if ref $path; 368 $path = $path->as_string if ref $path;
… …
429# } 432# }
430} 433}
431 434
432# escape the /'s in the path 435# escape the /'s in the path
433sub _escaped_path { 436sub _escaped_path {
434 # ∕ is U+2215
435 (my $path = $_[0]{path}) =~ s/\//∕/g; 437 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
436 $path 438 $path
437} 439}
438 440
439# the original (read-only) location 441# the original (read-only) location
440sub load_path { 442sub load_path {
… …
1094 1096
1095=head2 CORE EXTENSIONS 1097=head2 CORE EXTENSIONS
1096 1098
1097Functions and methods that extend core crossfire objects. 1099Functions and methods that extend core crossfire objects.
1098 1100
1101=cut
1102
1103package cf::player;
1104
1105use Coro::AIO;
1106
1099=head3 cf::player 1107=head3 cf::player
1100 1108
1101=over 4 1109=over 4
1102 1110
1103=item cf::player::exists $login 1111=item cf::player::find $login
1104 1112
1105Returns true when the given account exists. 1113Returns the given player object, loading it if necessary (might block).
1106 1114
1107=cut 1115=cut
1108 1116
1109sub cf::player::exists($) { 1117sub playerdir($) {
1110 cf::player::find $_[0] 1118 cf::localdir
1111 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1119 . "/"
1120 . cf::playerdir
1121 . "/"
1122 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1123}
1124
1125sub path($) {
1126 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1127
1128 (playerdir $login) . "/$login.pl"
1129}
1130
1131sub find_active($) {
1132 $cf::PLAYER{$_[0]}
1133 and $cf::PLAYER{$_[0]}->active
1134 and $cf::PLAYER{$_[0]}
1135}
1136
1137sub exists($) {
1138 my ($login) = @_;
1139
1140 $cf::PLAYER{$login}
1141 or cf::sync_job { !aio_stat $login }
1142}
1143
1144sub find($) {
1145 return $cf::PLAYER{$_[0]} || do {
1146 my $login = $_[0];
1147
1148 my $guard = cf::lock_acquire "user_find:$login";
1149
1150 $cf::PLAYER{$_[0]} || do {
1151 my $pl = load_pl path $login
1152 or return;
1153 $cf::PLAYER{$login} = $pl
1154 }
1155 }
1156}
1157
1158sub save($) {
1159 my ($pl) = @_;
1160
1161 return if $pl->{deny_save};
1162
1163 my $path = path $pl;
1164 my $guard = cf::lock_acquire "user_save:$path";
1165
1166 return if $pl->{deny_save};
1167
1168 aio_mkdir playerdir $pl, 0770;
1169 $pl->{last_save} = $cf::RUNTIME;
1170
1171 $pl->save_pl ($path);
1172 Coro::cede;
1173}
1174
1175sub new($) {
1176 my ($login) = @_;
1177
1178 my $self = create;
1179
1180 $self->ob->name ($login);
1181 $self->{deny_save} = 1;
1182
1183 $cf::PLAYER{$login} = $self;
1184
1185 $self
1186}
1187
1188=item $pl->quit_character
1189
1190Nukes the player without looking back. If logged in, the connection will
1191be destroyed. May block for a long time.
1192
1193=cut
1194
1195sub quit_character {
1196 my ($pl) = @_;
1197
1198 $pl->{deny_save} = 1;
1199 $pl->password ("*"); # this should lock out the player until we nuked the dir
1200
1201 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1202 $pl->deactivate;
1203 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1204 $pl->ns->destroy if $pl->ns;
1205
1206 my $path = playerdir $pl;
1207 my $temp = "$path~$cf::RUNTIME~deleting~";
1208 aio_rename $path, $temp;
1209 delete $cf::PLAYER{$pl->ob->name};
1210 $pl->destroy;
1211 IO::AIO::aio_rmtree $temp;
1212}
1213
1214=item cf::player::list_logins
1215
1216Returns am arrayref of all valid playernames in the system, can take a
1217while and may block, so not sync_job-capable, ever.
1218
1219=cut
1220
1221sub list_logins {
1222 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1223 or return [];
1224
1225 my @logins;
1226
1227 for my $login (@$dirs) {
1228 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229 aio_read $fh, 0, 512, my $buf, 0 or next;
1230 $buf !~ /^password -------------$/ or next; # official not-valid tag
1231
1232 utf8::decode $login;
1233 push @logins, $login;
1234 }
1235
1236 \@logins
1237}
1238
1239=item $player->maps
1240
1241Returns an arrayref of cf::path's of all maps that are private for this
1242player. May block.
1243
1244=cut
1245
1246sub maps($) {
1247 my ($pl) = @_;
1248
1249 my $files = aio_readdir playerdir $pl
1250 or return;
1251
1252 my @paths;
1253
1254 for (@$files) {
1255 utf8::decode $_;
1256 next if /\.(?:pl|pst)$/;
1257 next unless /^$PATH_SEP/;
1258
1259 s/$PATH_SEP/\//g;
1260 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1261 }
1262
1263 \@paths
1112} 1264}
1113 1265
1114=item $player->ext_reply ($msgid, $msgtype, %msg) 1266=item $player->ext_reply ($msgid, $msgtype, %msg)
1115 1267
1116Sends an ext reply to the player. 1268Sends an ext reply to the player.
1117 1269
1118=cut 1270=cut
1119 1271
1120sub cf::player::ext_reply($$$%) { 1272sub ext_reply($$$%) {
1121 my ($self, $id, %msg) = @_; 1273 my ($self, $id, %msg) = @_;
1122 1274
1123 $msg{msgid} = $id; 1275 $msg{msgid} = $id;
1124 1276
1125 $self->send ("ext " . to_json \%msg); 1277 $self->send ("ext " . cf::to_json \%msg);
1126} 1278}
1279
1280package cf;
1127 1281
1128=back 1282=back
1129 1283
1130 1284
1131=head3 cf::map 1285=head3 cf::map
… …
1137package cf::map; 1291package cf::map;
1138 1292
1139use Fcntl; 1293use Fcntl;
1140use Coro::AIO; 1294use Coro::AIO;
1141 1295
1142our $MAX_RESET = 7200; 1296our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1297our $DEFAULT_RESET = 3000;
1144 1298
1145sub generate_random_map { 1299sub generate_random_map {
1146 my ($path, $rmp) = @_; 1300 my ($path, $rmp) = @_;
1147 1301
1148 # mit "rum" bekleckern, nicht 1302 # mit "rum" bekleckern, nicht
… …
1178 or return; 1332 or return;
1179 1333
1180 my $map = cf::map::new 1334 my $map = cf::map::new
1181 or return; 1335 or return;
1182 1336
1337 # for better error messages only, will be overwritten
1338 $map->path ($path);
1339
1183 $map->load_header ($path) 1340 $map->load_header ($path)
1184 or return; 1341 or return;
1185 1342
1186 $map->{load_path} = $path; 1343 $map->{load_path} = $path;
1187 1344
1188 $map 1345 $map
1189} 1346}
1190 1347
1191sub find_map; 1348sub find;
1192sub find_map { 1349sub find {
1193 my ($path, $origin) = @_; 1350 my ($path, $origin) = @_;
1194 1351
1195 #warn "find_map<$path,$origin>\n";#d# 1352 #warn "find<$path,$origin>\n";#d#
1196 1353
1197 $path = new cf::path $path, $origin && $origin->path; 1354 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1355 my $key = $path->as_string;
1199 1356
1200 cf::lock_wait "map_find:$key"; 1357 cf::lock_wait "map_find:$key";
… …
1203 my $guard = cf::lock_acquire "map_find:$key"; 1360 my $guard = cf::lock_acquire "map_find:$key";
1204 1361
1205 # do it the slow way 1362 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1363 my $map = try_load_header $path->save_path;
1207 1364
1365 Coro::cede;
1366
1208 if ($map) { 1367 if ($map) {
1368 $map->last_access ((delete $map->{last_access})
1369 || $cf::RUNTIME); #d#
1209 # safety 1370 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1371 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1372 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1373 } else {
1213 if (my $rmp = $path->random_map_params) { 1374 if (my $rmp = $path->random_map_params) {
… …
1218 1379
1219 $map or return; 1380 $map or return;
1220 1381
1221 $map->{load_original} = 1; 1382 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1383 $map->{instantiate_time} = $cf::RUNTIME;
1384 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1385 $map->instantiate;
1224 1386
1225 # per-player maps become, after loading, normal maps 1387 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1388 $map->per_player (0) if $path->{user_rel};
1227 } 1389 }
1228 1390
1229 $map->path ($key); 1391 $map->path ($key);
1230 $map->{path} = $path; 1392 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1393 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1394
1395 Coro::cede;
1233 1396
1234 if ($map->should_reset) { 1397 if ($map->should_reset) {
1235 $map->reset; 1398 $map->reset;
1236 undef $guard; 1399 undef $guard;
1237 $map = find_map $path 1400 $map = find $path
1238 or return; 1401 or return;
1239 } 1402 }
1240 1403
1241 $cf::MAP{$key} = $map 1404 $cf::MAP{$key} = $map
1242 } 1405 }
… …
1264 if (aio_open $uniq, O_RDONLY, 0) { 1427 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1428 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1429 $self->load_objects ($uniq, 0);
1267 } 1430 }
1268 } 1431 }
1432
1433 Coro::cede;
1269 1434
1270 # now do the right thing for maps 1435 # now do the right thing for maps
1271 $self->link_multipart_objects; 1436 $self->link_multipart_objects;
1272 1437
1273 if ($self->{path}->is_style_map) { 1438 if ($self->{path}->is_style_map) {
… …
1281 $self->difficulty ($self->estimate_difficulty) 1446 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1447 unless $self->difficulty;
1283 $self->activate; 1448 $self->activate;
1284 } 1449 }
1285 1450
1451 Coro::cede;
1452
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1453 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1454}
1288 1455
1289sub load_map_sync { 1456sub find_sync {
1290 my ($path, $origin) = @_; 1457 my ($path, $origin) = @_;
1291 1458
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1459 cf::sync_job { cf::map::find $path, $origin }
1460}
1293 1461
1294 cf::sync_job { 1462sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1463 my ($map) = @_;
1296 or return; 1464
1297 $map->load; 1465 cf::sync_job { $map->load };
1298 $map
1299 }
1300} 1466}
1301 1467
1302sub save { 1468sub save {
1303 my ($self) = @_; 1469 my ($self) = @_;
1304 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1305 $self->{last_save} = $cf::RUNTIME; 1473 $self->{last_save} = $cf::RUNTIME;
1306 1474
1307 return unless $self->dirty; 1475 return unless $self->dirty;
1308 1476
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1477 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1478 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1479
1312 $self->{load_path} = $save; 1480 $self->{load_path} = $save;
1313 1481
1314 return if $self->{deny_save}; 1482 return if $self->{deny_save};
1483
1484 local $self->{last_access} = $self->last_access;#d#
1485
1486 cf::async {
1487 $_->contr->save for $self->players;
1488 };
1315 1489
1316 if ($uniq) { 1490 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1491 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1492 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1493 } else {
… …
1322} 1496}
1323 1497
1324sub swap_out { 1498sub swap_out {
1325 my ($self) = @_; 1499 my ($self) = @_;
1326 1500
1501 # save first because save cedes
1502 $self->save;
1503
1504 my $lock = cf::lock_acquire "map_data:" . $self->path;
1505
1327 return if $self->players; 1506 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1507 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1508 return if $self->{deny_save};
1330 1509
1331 $self->save;
1332 $self->clear; 1510 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1511 $self->in_memory (cf::MAP_SWAPPED);
1334} 1512}
1335 1513
1336sub reset_at { 1514sub reset_at {
… …
1374} 1552}
1375 1553
1376sub reset { 1554sub reset {
1377 my ($self) = @_; 1555 my ($self) = @_;
1378 1556
1557 my $lock = cf::lock_acquire "map_data:" . $self->path;
1558
1379 return if $self->players; 1559 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1560 return if $self->{path}{user_rel};#d#
1381 1561
1382 warn "resetting map ", $self->path;#d# 1562 warn "resetting map ", $self->path;#d#
1383 1563
… …
1402 1582
1403sub customise_for { 1583sub customise_for {
1404 my ($map, $ob) = @_; 1584 my ($map, $ob) = @_;
1405 1585
1406 if ($map->per_player) { 1586 if ($map->per_player) {
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1587 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1408 } 1588 }
1409 1589
1410 $map 1590 $map
1411} 1591}
1412 1592
1413sub emergency_save { 1593sub emergency_save {
1414 local $cf::FREEZE = 1; 1594 my $freeze_guard = cf::freeze_mainloop;
1415 1595
1416 warn "enter emergency map save\n"; 1596 warn "enter emergency perl save\n";
1417 1597
1418 cf::sync_job { 1598 cf::sync_job {
1599 warn "begin emergency player save\n";
1600 $_->save for values %cf::PLAYER;
1601 warn "end emergency player save\n";
1602
1419 warn "begin emergency map save\n"; 1603 warn "begin emergency map save\n";
1420 $_->save for values %cf::MAP; 1604 $_->save for values %cf::MAP;
1605 warn "end emergency map save\n";
1421 }; 1606 };
1422 1607
1423 warn "end emergency map save\n"; 1608 warn "leave emergency perl save\n";
1424} 1609}
1425 1610
1426package cf; 1611package cf;
1427 1612
1428=back 1613=back
… …
1509 my $link_pos = delete $self->{_link_pos}; 1694 my $link_pos = delete $self->{_link_pos};
1510 1695
1511 unless ($map) { 1696 unless ($map) {
1512 # restore original map position 1697 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1698 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1699 $map = cf::map::find $map;
1515 1700
1516 unless ($map) { 1701 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1702 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1703 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1704 or die "FATAL: cannot load emergency map\n";
1520 } 1705 }
1521 } 1706 }
1522 1707
1523 ($x, $y) = (-1, -1) 1708 ($x, $y) = (-1, -1)
… …
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1712 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1713 if $x <=0 && $y <= 0;
1529 1714
1530 $map->load; 1715 $map->load;
1531 1716
1717 return unless $self->contr->active;
1532 $self->activate_recursive; 1718 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1719 $self->enter_map ($map, $x, $y);
1534} 1720}
1535 1721
1536cf::player->attach ( 1722cf::player->attach (
… …
1549 1735
1550 # try to abort aborted map switching on player login :) 1736 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1737 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1738 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1739 $pl->ob->enter_link;
1554 cf::async { 1740 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1741 # 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 1742 # and this sleep increases chances of the player not ending up in scorn
1743 $pl->ob->reply (undef,
1744 "There was an internal problem at your last logout, "
1745 . "the server will try to bring you to your intended destination in a second.",
1746 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1747 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1748 $pl->ob->leave_link;
1559 }; 1749 })->prio (2);
1560 } 1750 }
1561 }, 1751 },
1562); 1752);
1563 1753
1564=item $player_object->goto_map ($path, $x, $y) 1754=item $player_object->goto ($path, $x, $y)
1565 1755
1566=cut 1756=cut
1567 1757
1568sub cf::object::player::goto_map { 1758sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1759 my ($self, $path, $x, $y) = @_;
1570 1760
1761 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763
1571 $self->enter_link; 1764 $self->enter_link;
1572 1765
1573 (cf::async { 1766 (async {
1574 $path = new cf::path $path;
1575
1576 my $map = cf::map::find_map $path->as_string; 1767 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1768 $map = $map->customise_for ($self) if $map;
1578 1769
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1770# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1771# if $map;
1581 1772
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1773 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1583 1774
1584 $self->leave_link ($map, $x, $y); 1775 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1776 })->prio (1);
1586} 1777}
1587 1778
… …
1640 1831
1641 return unless $self->type == cf::PLAYER; 1832 return unless $self->type == cf::PLAYER;
1642 1833
1643 $self->enter_link; 1834 $self->enter_link;
1644 1835
1645 (cf::async { 1836 (async {
1837 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1838 unless (eval {
1647 prepare_random_map $exit 1839 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1840 if $exit->slaying eq "/!";
1649 1841
1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1842 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1843 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1844
1653 1; 1845 1;
1654 }) { 1846 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1847 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1848 . "I'll try to bring you back to the map you were before. "
… …
1714 my ($ns, $msg) = @_; 1906 my ($ns, $msg) = @_;
1715 1907
1716 # this weird shuffling is so that direct followup queries 1908 # this weird shuffling is so that direct followup queries
1717 # get handled first 1909 # get handled first
1718 my $queue = delete $ns->{query_queue} 1910 my $queue = delete $ns->{query_queue}
1719 or return; # be conservative, not sure how that cna happen, but we saw a crash here 1911 or return; # be conservative, not sure how that can happen, but we saw a crash here
1720 1912
1721 (shift @$queue)->[1]->($msg); 1913 (shift @$queue)->[1]->($msg);
1722 1914
1723 push @{ $ns->{query_queue} }, @$queue; 1915 push @{ $ns->{query_queue} }, @$queue;
1724 1916
… …
1730 } 1922 }
1731 } 1923 }
1732 }, 1924 },
1733); 1925);
1734 1926
1735=item $client->coro (\&cb) 1927=item $client->async (\&cb)
1736 1928
1737Create a new coroutine, running the specified callback. The coroutine will 1929Create a new coroutine, running the specified callback. The coroutine will
1738be automatically cancelled when the client gets destroyed (e.g. on logout, 1930be automatically cancelled when the client gets destroyed (e.g. on logout,
1739or loss of connection). 1931or loss of connection).
1740 1932
1741=cut 1933=cut
1742 1934
1743sub cf::client::coro { 1935sub cf::client::async {
1744 my ($self, $cb) = @_; 1936 my ($self, $cb) = @_;
1745 1937
1746 my $coro = &cf::async ($cb); 1938 my $coro = &Coro::async ($cb);
1747 1939
1748 $coro->on_destroy (sub { 1940 $coro->on_destroy (sub {
1749 delete $self->{_coro}{$coro+0}; 1941 delete $self->{_coro}{$coro+0};
1750 }); 1942 });
1751 1943
… …
1986 open my $fh, "<:utf8", cf::confdir . "/config" 2178 open my $fh, "<:utf8", cf::confdir . "/config"
1987 or return; 2179 or return;
1988 2180
1989 local $/; 2181 local $/;
1990 *CFG = YAML::Syck::Load <$fh>; 2182 *CFG = YAML::Syck::Load <$fh>;
2183
2184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2185
2186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2188
2189 if (exists $CFG{mlockall}) {
2190 eval {
2191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2192 and die "WARNING: m(un)lockall failed: $!\n";
2193 };
2194 warn $@ if $@;
2195 }
1991} 2196}
1992 2197
1993sub main { 2198sub main {
1994 # we must not ever block the main coroutine 2199 # we must not ever block the main coroutine
1995 local $Coro::idle = sub { 2200 local $Coro::idle = sub {
1996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1997 (Coro::unblock_sub {
1998 Event::one_event; 2202 async { Event::one_event };
1999 })->();
2000 }; 2203 };
2001 2204
2002 cfg_load; 2205 cfg_load;
2003 db_load; 2206 db_load;
2004 load_extensions; 2207 load_extensions;
… …
2015 return; 2218 return;
2016 } 2219 }
2017 2220
2018 warn "reloading..."; 2221 warn "reloading...";
2019 2222
2020 local $FREEZE = 1; 2223 my $guard = freeze_mainloop;
2021 cf::emergency_save; 2224 cf::emergency_save;
2022 2225
2023 eval { 2226 eval {
2024 # if anything goes wrong in here, we should simply crash as we already saved 2227 # if anything goes wrong in here, we should simply crash as we already saved
2025 2228
… …
2087 cf::load_extensions; 2290 cf::load_extensions;
2088 2291
2089 # reattach attachments to objects 2292 # reattach attachments to objects
2090 warn "reattach"; 2293 warn "reattach";
2091 _global_reattach; 2294 _global_reattach;
2295 reattach $_ for values %MAP;
2092 }; 2296 };
2093 2297
2094 if ($@) { 2298 if ($@) {
2095 warn $@; 2299 warn $@;
2096 warn "error while reloading, exiting."; 2300 warn "error while reloading, exiting.";
… …
2112 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2316 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2113 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2317 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2114 2318
2115 # dirty hack because... archetypes are not yet loaded 2319 # dirty hack because... archetypes are not yet loaded
2116 Event->timer ( 2320 Event->timer (
2117 after => 2, 2321 after => 10,
2118 cb => sub { 2322 cb => sub {
2119 $_[0]->w->cancel; 2323 $_[0]->w->cancel;
2120 2324
2121 # provide some exits "home" 2325 # provide some exits "home"
2122 my $exit = cf::object::new "exit"; 2326 my $exit = cf::object::new "exit";
… …
2161 reentrant => 0, 2365 reentrant => 0,
2162 prio => 0, 2366 prio => 0,
2163 at => $NEXT_TICK || $TICK, 2367 at => $NEXT_TICK || $TICK,
2164 data => WF_AUTOCANCEL, 2368 data => WF_AUTOCANCEL,
2165 cb => sub { 2369 cb => sub {
2166 unless ($FREEZE) {
2167 cf::server_tick; # one server iteration 2370 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2371 $RUNTIME += $TICK;
2169 }
2170
2171 $NEXT_TICK += $TICK; 2372 $NEXT_TICK += $TICK;
2172 2373
2173 # if we are delayed by four ticks or more, skip them all 2374 # if we are delayed by four ticks or more, skip them all
2174 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2375 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2175 2376

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines