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.152 by root, Mon Jan 8 22:32:10 2007 UTC

… …
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
119 utf8::encode $msg; 118 utf8::encode $msg;
120 119
121 $msg .= "\n" 120 $msg .= "\n"
122 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
123 122
124 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
125 }; 124 };
126} 125}
127 126
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
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 185=item cf::lock_wait $string
209 186
210Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
211 188
212=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
213 190
214Wait until the given lock is available and then acquires it and returns 191Wait 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, 192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
217returned. 194returned.
218 195
219Lock names should begin with a unique identifier (for example, find_map 196Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 197uses map_find and cf::map::load uses map_load).
221 198
222=cut 199=cut
223 200
224our %LOCK; 201our %LOCK;
225 202
… …
239 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
240 lock_wait $key; 217 lock_wait $key;
241 218
242 $LOCK{$key} = []; 219 $LOCK{$key} = [];
243 220
244 cf::guard { 221 Coro::guard {
245 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
247 } 224 }
248} 225}
249 226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
250=item cf::async { BLOCK } 235=item cf::async { BLOCK }
251 236
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 237Currently the same as Coro::async_pool, meaning you cannot use
253error instead of exiting the server in case of a problem. 238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
254 240
255=cut 241=cut
256 242
257sub async(&) { 243BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 244
266=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
267 246
268The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
283 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
285 264
286 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 266 # (but this is cancel-safe)
288 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
289 268
290 my $busy = 1; 269 my $busy = 1;
291 my @res; 270 my @res;
292 271
293 (Coro::async { 272 (async {
294 @res = eval { $job->() }; 273 @res = eval { $job->() };
295 warn $@ if $@; 274 warn $@ if $@;
296 undef $busy; 275 undef $busy;
297 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
298 277
299 while ($busy) { 278 while ($busy) {
300 Coro::cede_notself; 279 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 280 }
303 281
304 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
305 } else { 283 } else {
306 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
307 285
308 $job->() 286 $job->()
309 } 287 }
310} 288}
311 289
312=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
313 291
314Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
315when the extension calling this is being unloaded. 293extension calling this is being unloaded.
316 294
317=cut 295=cut
318 296
319sub coro(&) { 297sub async_ext(&) {
320 my $cb = shift; 298 my $cb = shift;
321 299
322 my $coro = &cf::async ($cb); 300 my $coro = &Coro::async ($cb);
323 301
324 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
326 }); 304 });
327 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1094 1072
1095=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1096 1074
1097Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1098 1076
1077=cut
1078
1079package cf::player;
1080
1099=head3 cf::player 1081=head3 cf::player
1100 1082
1101=over 4 1083=over 4
1102 1084
1103=item cf::player::exists $login 1085=item cf::player::find $login
1104 1086
1105Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1106 1088
1107=cut 1089=cut
1108 1090
1109sub cf::player::exists($) { 1091sub playerdir($) {
1110 cf::player::find $_[0] 1092 cf::localdir
1111 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$_[0]} || do {
1125 my $pl = load_pl path $login
1126 or return;
1127 $cf::PLAYER{$login} = $pl
1128 }
1129 }
1130}
1131
1132sub save($) {
1133 my ($pl) = @_;
1134
1135 return if $pl->{deny_save};
1136
1137 my $path = path $pl;
1138 my $guard = cf::lock_acquire "user_save:$path";
1139
1140 return if $pl->{deny_save};
1141
1142 Coro::AIO::aio_mkdir playerdir $pl, 0770;
1143 $pl->{last_save} = $cf::RUNTIME;
1144
1145 $pl->save_pl ($path);
1146 Coro::cede;
1147}
1148
1149sub new($) {
1150 my ($login) = @_;
1151
1152 my $self = create;
1153
1154 $self->ob->name ($login);
1155 $self->{deny_save} = 1;
1156
1157 $cf::PLAYER{$login} = $self;
1158
1159 $self
1160}
1161
1162sub quit_character {
1163 my ($pl) = @_;
1164
1165 $pl->{deny_save} = 1;
1166 $pl->password ("*"); # this should lock out the player until we nuked the dir
1167
1168 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1169 $pl->deactivate;
1170 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1171 $pl->ns->destroy if $pl->ns;
1172
1173 my $path = playerdir $pl;
1174 my $temp = "$path~$cf::RUNTIME~deleting~";
1175 Coro::AIO::aio_rename $path, $temp;
1176 delete $cf::PLAYER{$pl->ob->name};
1177 $pl->destroy;
1178 IO::AIO::aio_rmtree $temp;
1112} 1179}
1113 1180
1114=item $player->ext_reply ($msgid, $msgtype, %msg) 1181=item $player->ext_reply ($msgid, $msgtype, %msg)
1115 1182
1116Sends an ext reply to the player. 1183Sends an ext reply to the player.
1117 1184
1118=cut 1185=cut
1119 1186
1120sub cf::player::ext_reply($$$%) { 1187sub ext_reply($$$%) {
1121 my ($self, $id, %msg) = @_; 1188 my ($self, $id, %msg) = @_;
1122 1189
1123 $msg{msgid} = $id; 1190 $msg{msgid} = $id;
1124 1191
1125 $self->send ("ext " . to_json \%msg); 1192 $self->send ("ext " . cf::to_json \%msg);
1126} 1193}
1194
1195package cf;
1127 1196
1128=back 1197=back
1129 1198
1130 1199
1131=head3 cf::map 1200=head3 cf::map
… …
1137package cf::map; 1206package cf::map;
1138 1207
1139use Fcntl; 1208use Fcntl;
1140use Coro::AIO; 1209use Coro::AIO;
1141 1210
1142our $MAX_RESET = 7200; 1211our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1212our $DEFAULT_RESET = 3000;
1144 1213
1145sub generate_random_map { 1214sub generate_random_map {
1146 my ($path, $rmp) = @_; 1215 my ($path, $rmp) = @_;
1147 1216
1148 # mit "rum" bekleckern, nicht 1217 # mit "rum" bekleckern, nicht
… …
1178 or return; 1247 or return;
1179 1248
1180 my $map = cf::map::new 1249 my $map = cf::map::new
1181 or return; 1250 or return;
1182 1251
1252 # for better error messages only, will be overwritten
1253 $map->path ($path);
1254
1183 $map->load_header ($path) 1255 $map->load_header ($path)
1184 or return; 1256 or return;
1185 1257
1186 $map->{load_path} = $path; 1258 $map->{load_path} = $path;
1187 1259
1188 $map 1260 $map
1189} 1261}
1190 1262
1191sub find_map; 1263sub find;
1192sub find_map { 1264sub find {
1193 my ($path, $origin) = @_; 1265 my ($path, $origin) = @_;
1194 1266
1195 #warn "find_map<$path,$origin>\n";#d# 1267 #warn "find<$path,$origin>\n";#d#
1196 1268
1197 $path = new cf::path $path, $origin && $origin->path; 1269 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1270 my $key = $path->as_string;
1199 1271
1200 cf::lock_wait "map_find:$key"; 1272 cf::lock_wait "map_find:$key";
… …
1203 my $guard = cf::lock_acquire "map_find:$key"; 1275 my $guard = cf::lock_acquire "map_find:$key";
1204 1276
1205 # do it the slow way 1277 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1278 my $map = try_load_header $path->save_path;
1207 1279
1280 Coro::cede;
1281
1208 if ($map) { 1282 if ($map) {
1283 $map->last_access ((delete $map->{last_access})
1284 || $cf::RUNTIME); #d#
1209 # safety 1285 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1286 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1287 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1288 } else {
1213 if (my $rmp = $path->random_map_params) { 1289 if (my $rmp = $path->random_map_params) {
… …
1218 1294
1219 $map or return; 1295 $map or return;
1220 1296
1221 $map->{load_original} = 1; 1297 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1298 $map->{instantiate_time} = $cf::RUNTIME;
1299 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1300 $map->instantiate;
1224 1301
1225 # per-player maps become, after loading, normal maps 1302 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1303 $map->per_player (0) if $path->{user_rel};
1227 } 1304 }
1228 1305
1229 $map->path ($key); 1306 $map->path ($key);
1230 $map->{path} = $path; 1307 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1308 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1309
1310 Coro::cede;
1233 1311
1234 if ($map->should_reset) { 1312 if ($map->should_reset) {
1235 $map->reset; 1313 $map->reset;
1236 undef $guard; 1314 undef $guard;
1237 $map = find_map $path 1315 $map = find $path
1238 or return; 1316 or return;
1239 } 1317 }
1240 1318
1241 $cf::MAP{$key} = $map 1319 $cf::MAP{$key} = $map
1242 } 1320 }
… …
1264 if (aio_open $uniq, O_RDONLY, 0) { 1342 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1343 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1344 $self->load_objects ($uniq, 0);
1267 } 1345 }
1268 } 1346 }
1347
1348 Coro::cede;
1269 1349
1270 # now do the right thing for maps 1350 # now do the right thing for maps
1271 $self->link_multipart_objects; 1351 $self->link_multipart_objects;
1272 1352
1273 if ($self->{path}->is_style_map) { 1353 if ($self->{path}->is_style_map) {
… …
1281 $self->difficulty ($self->estimate_difficulty) 1361 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1362 unless $self->difficulty;
1283 $self->activate; 1363 $self->activate;
1284 } 1364 }
1285 1365
1366 Coro::cede;
1367
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1368 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1369}
1288 1370
1289sub load_map_sync { 1371sub find_sync {
1290 my ($path, $origin) = @_; 1372 my ($path, $origin) = @_;
1291 1373
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1374 cf::sync_job { cf::map::find $path, $origin }
1375}
1293 1376
1294 cf::sync_job { 1377sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1378 my ($map) = @_;
1296 or return; 1379
1297 $map->load; 1380 cf::sync_job { $map->load };
1298 $map
1299 }
1300} 1381}
1301 1382
1302sub save { 1383sub save {
1303 my ($self) = @_; 1384 my ($self) = @_;
1304 1385
1386 my $lock = cf::lock_acquire "map_data:" . $self->path;
1387
1305 $self->{last_save} = $cf::RUNTIME; 1388 $self->{last_save} = $cf::RUNTIME;
1306 1389
1307 return unless $self->dirty; 1390 return unless $self->dirty;
1308 1391
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1392 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1393 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1394
1312 $self->{load_path} = $save; 1395 $self->{load_path} = $save;
1313 1396
1314 return if $self->{deny_save}; 1397 return if $self->{deny_save};
1398
1399 local $self->{last_access} = $self->last_access;#d#
1400
1401 cf::async {
1402 $_->contr->save for $self->players;
1403 };
1315 1404
1316 if ($uniq) { 1405 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1406 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1407 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1408 } else {
… …
1322} 1411}
1323 1412
1324sub swap_out { 1413sub swap_out {
1325 my ($self) = @_; 1414 my ($self) = @_;
1326 1415
1416 # save first because save cedes
1417 $self->save;
1418
1419 my $lock = cf::lock_acquire "map_data:" . $self->path;
1420
1327 return if $self->players; 1421 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1422 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1423 return if $self->{deny_save};
1330 1424
1331 $self->save;
1332 $self->clear; 1425 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1426 $self->in_memory (cf::MAP_SWAPPED);
1334} 1427}
1335 1428
1336sub reset_at { 1429sub reset_at {
… …
1374} 1467}
1375 1468
1376sub reset { 1469sub reset {
1377 my ($self) = @_; 1470 my ($self) = @_;
1378 1471
1472 my $lock = cf::lock_acquire "map_data:" . $self->path;
1473
1379 return if $self->players; 1474 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1475 return if $self->{path}{user_rel};#d#
1381 1476
1382 warn "resetting map ", $self->path;#d# 1477 warn "resetting map ", $self->path;#d#
1383 1478
… …
1402 1497
1403sub customise_for { 1498sub customise_for {
1404 my ($map, $ob) = @_; 1499 my ($map, $ob) = @_;
1405 1500
1406 if ($map->per_player) { 1501 if ($map->per_player) {
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1502 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1408 } 1503 }
1409 1504
1410 $map 1505 $map
1411} 1506}
1412 1507
1413sub emergency_save { 1508sub emergency_save {
1414 local $cf::FREEZE = 1; 1509 my $freeze_guard = cf::freeze_mainloop;
1415 1510
1416 warn "enter emergency map save\n"; 1511 warn "enter emergency perl save\n";
1417 1512
1418 cf::sync_job { 1513 cf::sync_job {
1514 warn "begin emergency player save\n";
1515 $_->save for values %cf::PLAYER;
1516 warn "end emergency player save\n";
1517
1419 warn "begin emergency map save\n"; 1518 warn "begin emergency map save\n";
1420 $_->save for values %cf::MAP; 1519 $_->save for values %cf::MAP;
1520 warn "end emergency map save\n";
1421 }; 1521 };
1422 1522
1423 warn "end emergency map save\n"; 1523 warn "leave emergency perl save\n";
1424} 1524}
1425 1525
1426package cf; 1526package cf;
1427 1527
1428=back 1528=back
… …
1509 my $link_pos = delete $self->{_link_pos}; 1609 my $link_pos = delete $self->{_link_pos};
1510 1610
1511 unless ($map) { 1611 unless ($map) {
1512 # restore original map position 1612 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1613 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1614 $map = cf::map::find $map;
1515 1615
1516 unless ($map) { 1616 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1617 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1618 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1619 or die "FATAL: cannot load emergency map\n";
1520 } 1620 }
1521 } 1621 }
1522 1622
1523 ($x, $y) = (-1, -1) 1623 ($x, $y) = (-1, -1)
… …
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1627 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1628 if $x <=0 && $y <= 0;
1529 1629
1530 $map->load; 1630 $map->load;
1531 1631
1632 return unless $self->contr->active;
1532 $self->activate_recursive; 1633 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1634 $self->enter_map ($map, $x, $y);
1534} 1635}
1535 1636
1536cf::player->attach ( 1637cf::player->attach (
… …
1549 1650
1550 # try to abort aborted map switching on player login :) 1651 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1652 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1653 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1654 $pl->ob->enter_link;
1554 cf::async { 1655 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1656 # 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 1657 # and this sleep increases chances of the player not ending up in scorn
1658 $pl->ob->reply (undef,
1659 "There was an internal problem at your last logout, "
1660 . "the server will try to bring you to your intended destination in a second.",
1661 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1662 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1663 $pl->ob->leave_link;
1559 }; 1664 })->prio (2);
1560 } 1665 }
1561 }, 1666 },
1562); 1667);
1563 1668
1564=item $player_object->goto_map ($path, $x, $y) 1669=item $player_object->goto ($path, $x, $y)
1565 1670
1566=cut 1671=cut
1567 1672
1568sub cf::object::player::goto_map { 1673sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1674 my ($self, $path, $x, $y) = @_;
1570 1675
1571 $self->enter_link; 1676 $self->enter_link;
1572 1677
1573 (cf::async { 1678 (async {
1574 $path = new cf::path $path; 1679 $path = new cf::path $path;
1575 1680
1576 my $map = cf::map::find_map $path->as_string; 1681 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1682 $map = $map->customise_for ($self) if $map;
1578 1683
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1684# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1685# if $map;
1581 1686
1687 $map or Carp::cluck ("oy");#d#
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1688 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1583 1689
1584 $self->leave_link ($map, $x, $y); 1690 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1691 })->prio (1);
1586} 1692}
1587 1693
… …
1640 1746
1641 return unless $self->type == cf::PLAYER; 1747 return unless $self->type == cf::PLAYER;
1642 1748
1643 $self->enter_link; 1749 $self->enter_link;
1644 1750
1645 (cf::async { 1751 (async {
1752 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1753 unless (eval {
1647 prepare_random_map $exit 1754 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1755 if $exit->slaying eq "/!";
1649 1756
1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1757 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1758 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1759
1653 1; 1760 1;
1654 }) { 1761 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1762 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1763 . "I'll try to bring you back to the map you were before. "
… …
1714 my ($ns, $msg) = @_; 1821 my ($ns, $msg) = @_;
1715 1822
1716 # this weird shuffling is so that direct followup queries 1823 # this weird shuffling is so that direct followup queries
1717 # get handled first 1824 # get handled first
1718 my $queue = delete $ns->{query_queue} 1825 my $queue = delete $ns->{query_queue}
1719 or return; # be conservative, not sure how that cna happen, but we saw a crash here 1826 or return; # be conservative, not sure how that can happen, but we saw a crash here
1720 1827
1721 (shift @$queue)->[1]->($msg); 1828 (shift @$queue)->[1]->($msg);
1722 1829
1723 push @{ $ns->{query_queue} }, @$queue; 1830 push @{ $ns->{query_queue} }, @$queue;
1724 1831
… …
1730 } 1837 }
1731 } 1838 }
1732 }, 1839 },
1733); 1840);
1734 1841
1735=item $client->coro (\&cb) 1842=item $client->async (\&cb)
1736 1843
1737Create a new coroutine, running the specified callback. The coroutine will 1844Create a new coroutine, running the specified callback. The coroutine will
1738be automatically cancelled when the client gets destroyed (e.g. on logout, 1845be automatically cancelled when the client gets destroyed (e.g. on logout,
1739or loss of connection). 1846or loss of connection).
1740 1847
1741=cut 1848=cut
1742 1849
1743sub cf::client::coro { 1850sub cf::client::async {
1744 my ($self, $cb) = @_; 1851 my ($self, $cb) = @_;
1745 1852
1746 my $coro = &cf::async ($cb); 1853 my $coro = &Coro::async ($cb);
1747 1854
1748 $coro->on_destroy (sub { 1855 $coro->on_destroy (sub {
1749 delete $self->{_coro}{$coro+0}; 1856 delete $self->{_coro}{$coro+0};
1750 }); 1857 });
1751 1858
… …
1986 open my $fh, "<:utf8", cf::confdir . "/config" 2093 open my $fh, "<:utf8", cf::confdir . "/config"
1987 or return; 2094 or return;
1988 2095
1989 local $/; 2096 local $/;
1990 *CFG = YAML::Syck::Load <$fh>; 2097 *CFG = YAML::Syck::Load <$fh>;
2098
2099 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2100
2101 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2102 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2103
2104 if (exists $CFG{mlockall}) {
2105 eval {
2106 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2107 and die "WARNING: m(un)lockall failed: $!\n";
2108 };
2109 warn $@ if $@;
2110 }
1991} 2111}
1992 2112
1993sub main { 2113sub main {
1994 # we must not ever block the main coroutine 2114 # we must not ever block the main coroutine
1995 local $Coro::idle = sub { 2115 local $Coro::idle = sub {
1996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2116 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1997 (Coro::unblock_sub {
1998 Event::one_event; 2117 async { Event::one_event };
1999 })->();
2000 }; 2118 };
2001 2119
2002 cfg_load; 2120 cfg_load;
2003 db_load; 2121 db_load;
2004 load_extensions; 2122 load_extensions;
… …
2015 return; 2133 return;
2016 } 2134 }
2017 2135
2018 warn "reloading..."; 2136 warn "reloading...";
2019 2137
2020 local $FREEZE = 1; 2138 my $guard = freeze_mainloop;
2021 cf::emergency_save; 2139 cf::emergency_save;
2022 2140
2023 eval { 2141 eval {
2024 # if anything goes wrong in here, we should simply crash as we already saved 2142 # if anything goes wrong in here, we should simply crash as we already saved
2025 2143
… …
2087 cf::load_extensions; 2205 cf::load_extensions;
2088 2206
2089 # reattach attachments to objects 2207 # reattach attachments to objects
2090 warn "reattach"; 2208 warn "reattach";
2091 _global_reattach; 2209 _global_reattach;
2210 reattach $_ for values %MAP;
2092 }; 2211 };
2093 2212
2094 if ($@) { 2213 if ($@) {
2095 warn $@; 2214 warn $@;
2096 warn "error while reloading, exiting."; 2215 warn "error while reloading, exiting.";
… …
2112 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2231 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2113 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2232 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2114 2233
2115 # dirty hack because... archetypes are not yet loaded 2234 # dirty hack because... archetypes are not yet loaded
2116 Event->timer ( 2235 Event->timer (
2117 after => 2, 2236 after => 10,
2118 cb => sub { 2237 cb => sub {
2119 $_[0]->w->cancel; 2238 $_[0]->w->cancel;
2120 2239
2121 # provide some exits "home" 2240 # provide some exits "home"
2122 my $exit = cf::object::new "exit"; 2241 my $exit = cf::object::new "exit";
… …
2161 reentrant => 0, 2280 reentrant => 0,
2162 prio => 0, 2281 prio => 0,
2163 at => $NEXT_TICK || $TICK, 2282 at => $NEXT_TICK || $TICK,
2164 data => WF_AUTOCANCEL, 2283 data => WF_AUTOCANCEL,
2165 cb => sub { 2284 cb => sub {
2166 unless ($FREEZE) {
2167 cf::server_tick; # one server iteration 2285 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2286 $RUNTIME += $TICK;
2169 }
2170
2171 $NEXT_TICK += $TICK; 2287 $NEXT_TICK += $TICK;
2172 2288
2173 # if we are delayed by four ticks or more, skip them all 2289 # if we are delayed by four ticks or more, skip them all
2174 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2290 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2175 2291

Diff Legend

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